diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-09-12 21:58:39 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-09-12 21:58:39 +0200 |
| commit | e991eff5b5773e8a85c3f4c4f92c09fe30cf680b (patch) | |
| tree | ab98bf44cfc7611ad7cc699396674554f150db43 /ldpd | |
| parent | zebra: fix includes (diff) | |
| parent | Merge pull request #3005 from patrasar/indentation_warnings (diff) | |
| download | frr-e991eff5b5773e8a85c3f4c4f92c09fe30cf680b.tar.xz frr-e991eff5b5773e8a85c3f4c4f92c09fe30cf680b.zip | |
Merge remote-tracking branch 'frr/master' into warnings
Conflicts:
zebra/if_ioctl_solaris.c
zebra/rtread_getmsg.c
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'ldpd')
| -rw-r--r-- | ldpd/.gitignore | 15 | ||||
| -rw-r--r-- | ldpd/lde.c | 4 | ||||
| -rw-r--r-- | ldpd/pfkey.c | 4 | ||||
| -rw-r--r-- | ldpd/subdir.am | 2 |
4 files changed, 7 insertions, 18 deletions
diff --git a/ldpd/.gitignore b/ldpd/.gitignore index a2f4b5169..ec8a5c408 100644 --- a/ldpd/.gitignore +++ b/ldpd/.gitignore @@ -1,17 +1,2 @@ -!Makefile -Makefile.in -*.o ldpd ldpd.conf -tags -TAGS -.deps -.nfs* -*.lo -*.la -*.a -*.libs -.arch-inventory -.arch-ids -*~ -*.loT diff --git a/ldpd/lde.c b/ldpd/lde.c index 03b62b482..810439888 100644 --- a/ldpd/lde.c +++ b/ldpd/lde.c @@ -1620,10 +1620,8 @@ lde_address_list_free(struct lde_nbr *ln) { struct lde_addr *lde_addr; - while ((lde_addr = TAILQ_FIRST(&ln->addr_list)) != NULL) { - TAILQ_REMOVE(&ln->addr_list, lde_addr, entry); + while ((lde_addr = TAILQ_POP_FIRST(&ln->addr_list, entry)) != NULL) free(lde_addr); - } } static void zclient_sync_init(unsigned short instance) diff --git a/ldpd/pfkey.c b/ldpd/pfkey.c index 906737217..a719d0cbb 100644 --- a/ldpd/pfkey.c +++ b/ldpd/pfkey.c @@ -17,6 +17,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef __OpenBSD__ #include <sys/types.h> #include <sys/socket.h> diff --git a/ldpd/subdir.am b/ldpd/subdir.am index 2d87be0cd..24e738d62 100644 --- a/ldpd/subdir.am +++ b/ldpd/subdir.am @@ -6,6 +6,8 @@ if LDPD noinst_LIBRARIES += ldpd/libldp.a sbin_PROGRAMS += ldpd/ldpd dist_examples_DATA += ldpd/ldpd.conf.sample +vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c +man8 += $(MANBUILD)/ldpd.8 endif ldpd_libldp_a_SOURCES = \ |