summaryrefslogtreecommitdiff
path: root/usr.sbin/ldpd/ldpd.h
diff options
context:
space:
mode:
authorRenato Westphal <renato@cvs.openbsd.org>2015-04-04 15:15:45 +0000
committerRenato Westphal <renato@cvs.openbsd.org>2015-04-04 15:15:45 +0000
commit199b8d04391a85ada25d77f1e65de032def39c85 (patch)
treefd4c5ff7473d5c1936c3b60e883b501c8c5acb00 /usr.sbin/ldpd/ldpd.h
parent06d3ec3581eb4cb29ccd0923aae49c1f1268ea59 (diff)
Show the full LIB in the "ldpctl show lib" command.
The LIB is a table where the router keeps all known MPLS labels. So, we should loop over all the received label mappings from all neighbors to show the full LIB. The lde_nbr_is_nexthop() function was introduced to verify if a lib entry is supposed to be installed in the fib (according to the fib entry's nexthop and the addresses advertised by the lib entry's nexthop). This is better than keeping track of lib<->fib entries with pointers and back pointers because it keeps the lib/fib structures independent of each other, which in turn makes the code less prone to bugs. OK claudio@
Diffstat (limited to 'usr.sbin/ldpd/ldpd.h')
-rw-r--r--usr.sbin/ldpd/ldpd.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/ldpd/ldpd.h b/usr.sbin/ldpd/ldpd.h
index 64dd9637b2d..1988adab7b4 100644
--- a/usr.sbin/ldpd/ldpd.h
+++ b/usr.sbin/ldpd/ldpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldpd.h,v 1.44 2015/03/21 18:32:01 renato Exp $ */
+/* $OpenBSD: ldpd.h,v 1.45 2015/04/04 15:15:44 renato Exp $ */
/*
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -321,14 +321,11 @@ struct ctl_nbr {
struct ctl_rt {
struct in_addr prefix;
+ u_int8_t prefixlen;
struct in_addr nexthop;
- struct in_addr adv_rtr;
- time_t uptime;
u_int32_t local_label;
u_int32_t remote_label;
u_int8_t flags;
- u_int8_t prefixlen;
- u_int8_t connected;
u_int8_t in_use;
};