--- kroute.c | 2 -- lde.c | 5 ----- ldp.h | 6 ------ ldpe.h | 4 ---- neighbor.c | 27 --------------------------- 5 files changed, 44 deletions(-)
diff --git a/kroute.c b/kroute.c index a962ea1..dddd033 100644 --- a/kroute.c +++ b/kroute.c @@ -113,8 +113,6 @@ RB_HEAD(kif_tree, kif_node) kit; RB_PROTOTYPE(kif_tree, kif_node, entry, kif_compare) RB_GENERATE(kif_tree, kif_node, entry, kif_compare) -int flag_implicit_null = 0; - int kif_init(void) { diff --git a/lde.c b/lde.c index c7cd190..639a290 100644 --- a/lde.c +++ b/lde.c @@ -198,10 +198,8 @@ lde_dispatch_imsg(int fd, short event, void *bula) struct imsg imsg; struct lde_nbr *nbr; struct map map; - struct timespec tp; struct in_addr addr; ssize_t n; - time_t now; int shut = 0, verbose; if (event & EV_READ) { @@ -217,9 +215,6 @@ lde_dispatch_imsg(int fd, short event, void *bula) shut = 1; } - clock_gettime(CLOCK_MONOTONIC, &tp); - now = tp.tv_sec; - for (;;) { if ((n = imsg_get(ibuf, &imsg)) == -1) fatal("lde_dispatch_imsg: imsg_read error"); diff --git a/ldp.h b/ldp.h index 2ed1f05..75fdbc9 100644 --- a/ldp.h +++ b/ldp.h @@ -195,12 +195,6 @@ struct address_list_tlv { #define ADDR_IPV4 0x1 #define ADDR_IPV6 0x2 -/* This struct is badly aligned so use two 32 bit fields */ -struct fec_elm { - u_int32_t hdr; - u_int32_t addr; -}; - #define FEC_ELM_MIN_LEN 4 #define FEC_WILDCARD 0x01 #define FEC_PREFIX 0x02 diff --git a/ldpe.h b/ldpe.h index e380d65..9168360 100644 --- a/ldpe.h +++ b/ldpe.h @@ -198,10 +198,6 @@ int nbr_establish_connection(struct nbr *); void nbr_mapping_add(struct nbr *, struct mapping_head *, struct map *); -struct mapping_entry *nbr_mapping_find(struct nbr *, struct mapping_head *, - struct map *); -void nbr_mapping_del(struct nbr *, struct mapping_head *, - struct map *); void mapping_list_clr(struct mapping_head *); struct ctl_nbr *nbr_to_ctl(struct nbr *); diff --git a/neighbor.c b/neighbor.c index 2a9efb4..b2a1624 100644 --- a/neighbor.c +++ b/neighbor.c @@ -553,33 +553,6 @@ nbr_mapping_add(struct nbr *nbr, struct mapping_head *mh, struct map *map) TAILQ_INSERT_TAIL(mh, me, entry); } -struct mapping_entry * -nbr_mapping_find(struct nbr *nbr, struct mapping_head *mh, struct map *map) -{ - struct mapping_entry *me = NULL; - - TAILQ_FOREACH(me, mh, entry) { - if (me->map.prefix.s_addr == map->prefix.s_addr && - me->map.prefixlen == map->prefixlen) - return (me); - } - - return (NULL); -} - -void -nbr_mapping_del(struct nbr *nbr, struct mapping_head *mh, struct map *map) -{ - struct mapping_entry *me; - - me = nbr_mapping_find(nbr, mh, map); - if (me == NULL) - return; - - TAILQ_REMOVE(mh, me, entry); - free(me); -} - void mapping_list_clr(struct mapping_head *mh) { -- 1.9.1