diff --git a/bridge/fdb.c b/bridge/fdb.c index bd7e4f92..5ea50abb 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -163,6 +163,8 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) fprintf(fp, "offload "); fprintf(fp, "%s\n", state_n2a(r->ndm_state)); + fflush(fp); + return 0; } diff --git a/bridge/mdb.c b/bridge/mdb.c index b14bd019..24c49035 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -135,6 +135,8 @@ int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) } } + fflush(fp); + return 0; } diff --git a/ip/iproute.c b/ip/iproute.c index ce90895b..8e4022b2 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -1674,7 +1674,7 @@ static int iproute_get(int argc, char **argv) req.r.rtm_flags |= RTM_F_LOOKUP_TABLE; if (rtnl_talk(&rth, &req.n, &req.n, sizeof(req)) < 0) - exit(2); + return -2; if (connected && !from_ok) { struct rtmsg *r = NLMSG_DATA(&req.n); diff --git a/ip/iprule.c b/ip/iprule.c index 714278a2..2fa9ade9 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -36,7 +36,6 @@ static void usage(void) fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n"); fprintf(stderr, " [ iif STRING ] [ oif STRING ] [ pref NUMBER ]\n"); fprintf(stderr, "ACTION := [ table TABLE_ID ]\n"); - fprintf(stderr, " [ prohibit | reject | unreachable ]\n"); fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n"); fprintf(stderr, " [ goto NUMBER ]\n"); fprintf(stderr, " SUPPRESSOR\n"); diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8 index dd925be6..6245d8cf 100644 --- a/man/man8/ip-rule.8 +++ b/man/man8/ip-rule.8 @@ -41,7 +41,7 @@ ip-rule \- routing policy database management .IR TABLE_ID " ] [ " .B nat .IR ADDRESS " ] [ " -.BR prohibit " | " reject " | " unreachable " ] [ " realms +.B realms .RI "[" SRCREALM "/]" DSTREALM " ]" .I SUPPRESSOR diff --git a/misc/ss.c b/misc/ss.c index eca4aa35..a9ae85ec 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -3770,8 +3770,8 @@ int main(int argc, char *argv[]) exit(1); break; case 'h': - case '?': help(); + case '?': default: usage(); }