diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /tcpip/rip98r.c | |
parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'tcpip/rip98r.c')
-rw-r--r-- | tcpip/rip98r.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/tcpip/rip98r.c b/tcpip/rip98r.c index f8d8090..b1f283c 100644 --- a/tcpip/rip98r.c +++ b/tcpip/rip98r.c @@ -42,7 +42,7 @@ static int cmp_route(struct route_struct *route, struct in_addr addr, int bits, if (route->action == DEL_ROUTE || route->action == NEW_ROUTE) return UNMATCH_ROUTE; - + if (old_addr != new_addr) return UNMATCH_ROUTE; @@ -118,7 +118,7 @@ void receive_routes(int s) for (p = message + RIP98_HEADER; p < message + mess_len; p += RIP98_ENTRY) { memcpy((char *)&addr, (char *)p, sizeof(addr)); bits = p[4]; - metric = p[5]; + metric = p[5]; network = inet_netof(addr); @@ -140,7 +140,7 @@ void receive_routes(int s) syslog(LOG_DEBUG, " route to %s/%d metric %d\n", inet_ntoa(addr), bits, metric); metric++; - + if (metric > RIP98_INFINITY) metric = RIP98_INFINITY; @@ -151,37 +151,37 @@ void receive_routes(int s) switch (cmp_route(route, addr, bits, metric)) { - case NO_ROUTE: - matched = TRUE; - break; - - case REPLACE_ROUTE: - route->action = DEL_ROUTE; - - case ADDITIONAL_ROUTE: - if (!found) { - if ((new = malloc(sizeof(struct route_struct))) == NULL) { - if (logging) - syslog(LOG_ERR, "out of memory\n"); - return; - } - - new->addr = addr; - new->bits = bits; - new->metric = metric; - new->action = NEW_ROUTE; - - new->next = first_route; - first_route = new; - - found = TRUE; + case NO_ROUTE: + matched = TRUE; + break; + + case REPLACE_ROUTE: + route->action = DEL_ROUTE; + + case ADDITIONAL_ROUTE: + if (!found) { + if ((new = malloc(sizeof(struct route_struct))) == NULL) { + if (logging) + syslog(LOG_ERR, "out of memory\n"); + return; } - matched = TRUE; - break; + new->addr = addr; + new->bits = bits; + new->metric = metric; + new->action = NEW_ROUTE; + + new->next = first_route; + first_route = new; - default: - break; + found = TRUE; + } + + matched = TRUE; + break; + + default: + break; } } @@ -196,12 +196,12 @@ void receive_routes(int s) new->bits = bits; new->metric = metric; new->action = NEW_ROUTE; - + new->next = first_route; first_route = new; } } - + for (route = first_route; route != NULL; route = route->next) { if (route->action == DEL_ROUTE) { memset((char *)&rt, 0, sizeof(rt)); @@ -233,7 +233,7 @@ void receive_routes(int s) rt.rt_flags |= RTF_HOST; } else { netmask = bits2mask(route->bits); - + trg.sin_family = AF_INET; memcpy((char *)&trg.sin_addr, (char *)&netmask, sizeof(struct in_addr)); trg.sin_port = 0; |