From 6b7ee92271526858b41b09b34ce9e81cc588ac5a Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Fri, 2 Sep 2016 16:46:29 +0000 Subject: [PATCH] Minor tweaks --- eigrpd.h | 1 - eigrpe.c | 4 +--- eigrpe.h | 2 +- log.c | 4 ++-- query.c | 2 +- rde.c | 5 +---- rde.h | 2 +- reply.c | 2 +- tlv.c | 6 ++++-- update.c | 2 +- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/eigrpd.h b/eigrpd.h index 8bee05e..42463f0 100644 --- a/eigrpd.h +++ b/eigrpd.h @@ -65,7 +65,6 @@ struct imsgev { struct imsgbuf ibuf; void (*handler)(int, short, void *); struct event ev; - void *data; short events; }; diff --git a/eigrpe.c b/eigrpe.c index c1534f8..360c4c2 100644 --- a/eigrpe.c +++ b/eigrpe.c @@ -64,7 +64,7 @@ eigrpe_sig_handler(int sig, short event, void *bula) } /* eigrp engine */ -pid_t +void eigrpe(int debug, int verbose, char *sockname) { struct passwd *pw; @@ -173,8 +173,6 @@ eigrpe(int debug, int verbose, char *sockname) event_dispatch(); eigrpe_shutdown(); - /* NOTREACHED */ - return (0); } static __dead void diff --git a/eigrpe.h b/eigrpe.h index 43539cb..00cc2e3 100644 --- a/eigrpe.h +++ b/eigrpe.h @@ -74,7 +74,7 @@ RB_PROTOTYPE(nbr_pid_head, nbr, pid_tree, nbr_pid_compare) extern struct eigrpd_conf *econf; /* eigrpe.c */ -pid_t eigrpe(int, int, char *); +void eigrpe(int, int, char *); int eigrpe_imsg_compose_parent(int, pid_t, void *, uint16_t); int eigrpe_imsg_compose_rde(int, uint32_t, pid_t, void *, uint16_t); diff --git a/log.c b/log.c index 8a2d032..17129e7 100644 --- a/log.c +++ b/log.c @@ -311,9 +311,9 @@ if_type_name(enum iface_type type) return ("POINTOPOINT"); case IF_TYPE_BROADCAST: return ("BROADCAST"); + default: + return ("UNKNOWN"); } - /* NOTREACHED */ - return ("UNKNOWN"); } const char * diff --git a/query.c b/query.c index c1d939b..a8a778a 100644 --- a/query.c +++ b/query.c @@ -43,7 +43,6 @@ send_query(struct eigrp_iface *ei, struct nbr *nbr, if (rinfo_list == NULL || TAILQ_EMPTY(rinfo_list)) return; - /* don't exceed the interface's mtu */ do { if ((buf = ibuf_dynamic(PKG_DEF_SIZE, IP_MAXPACKET - sizeof(struct ip))) == NULL) @@ -72,6 +71,7 @@ send_query(struct eigrp_iface *ei, struct nbr *nbr, while ((re = TAILQ_FIRST(rinfo_list)) != NULL) { route_len = len_route_tlv(&re->rinfo); + /* don't exceed the MTU to avoid IP fragmentation */ if (size + route_len > ei->iface->mtu) { rtp_send(ei, nbr, buf); break; diff --git a/rde.c b/rde.c index 96124dd..3d8f8cc 100644 --- a/rde.c +++ b/rde.c @@ -69,7 +69,7 @@ rde_sig_handler(int sig, short event, void *arg) } /* route decision engine */ -pid_t +void rde(int debug, int verbose) { struct event ev_sigint, ev_sigterm; @@ -126,9 +126,6 @@ rde(int debug, int verbose) event_dispatch(); rde_shutdown(); - /* NOTREACHED */ - - return (0); } static __dead void diff --git a/rde.h b/rde.h index 59fb2e9..cea6fde 100644 --- a/rde.h +++ b/rde.h @@ -126,7 +126,7 @@ extern struct eigrpd_conf *rdeconf; extern struct rde_nbr_head rde_nbrs; /* rde.c */ -pid_t rde(int, int); +void rde(int, int); int rde_imsg_compose_parent(int, pid_t, void *, uint16_t); int rde_imsg_compose_eigrpe(int, uint32_t, pid_t, void *, uint16_t); diff --git a/reply.c b/reply.c index c239bed..30a5f13 100644 --- a/reply.c +++ b/reply.c @@ -42,7 +42,6 @@ send_reply(struct nbr *nbr, struct rinfo_head *rinfo_list, int siareply) if (rinfo_list == NULL || TAILQ_EMPTY(rinfo_list)) return; - /* don't exceed the interface's mtu */ do { if ((buf = ibuf_dynamic(PKG_DEF_SIZE, IP_MAXPACKET - sizeof(struct ip))) == NULL) @@ -71,6 +70,7 @@ send_reply(struct nbr *nbr, struct rinfo_head *rinfo_list, int siareply) while ((re = TAILQ_FIRST(rinfo_list)) != NULL) { route_len = len_route_tlv(&re->rinfo); + /* don't exceed the MTU to avoid IP fragmentation */ if (size + route_len > nbr->ei->iface->mtu) { rtp_send_ucast(nbr, buf); break; diff --git a/tlv.c b/tlv.c index 2e834b1..a070b12 100644 --- a/tlv.c +++ b/tlv.c @@ -299,13 +299,15 @@ tlv_decode_seq(int af, struct tlv *tlv, char *buf, switch (af) { case AF_INET: if (alen != INADDRSZ) { - log_debug("%s: invalid address length", __func__); + log_debug("%s: invalid address length", + __func__); return (-1); } break; case AF_INET6: if (alen != IN6ADDRSZ) { - log_debug("%s: invalid address length", __func__); + log_debug("%s: invalid address length", + __func__); return (-1); } break; diff --git a/update.c b/update.c index 6e72554..c124944 100644 --- a/update.c +++ b/update.c @@ -39,7 +39,6 @@ send_update(struct eigrp_iface *ei, struct nbr *nbr, uint32_t flags, int size; int route_len; - /* don't exceed the interface's mtu */ do { if ((buf = ibuf_dynamic(PKG_DEF_SIZE, IP_MAXPACKET - sizeof(struct ip))) == NULL) @@ -67,6 +66,7 @@ send_update(struct eigrp_iface *ei, struct nbr *nbr, uint32_t flags, while ((re = TAILQ_FIRST(rinfo_list)) != NULL) { route_len = len_route_tlv(&re->rinfo); + /* don't exceed the MTU to avoid IP fragmentation */ if (size + route_len > ei->iface->mtu) { rtp_send(ei, nbr, buf); break;