diff options
| author |   claudio <claudio@openbsd.org> | 2013-06-01 18:47:07 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2013-06-01 18:47:07 +0000 |
| commit | 122f143e662158b8a01a3aa96eeb70a1b4fda3a9 (patch) | |
| tree | 481c9731c737631150569909372bfa21b1d76f2e /usr.sbin/ldpd/hello.c | |
| parent | Document my divert(4) changes done in April 2013, where reinjected (diff) | |
| download | wireguard-openbsd-122f143e662158b8a01a3aa96eeb70a1b4fda3a9.tar.xz wireguard-openbsd-122f143e662158b8a01a3aa96eeb70a1b4fda3a9.zip | |
Drop support for per-interface labelspaces.
Support for per-interface labelspaces is only necessary for legacy ATM/FR
interfaces running in cell-mode. We shouldn't worry about this.
For platform-wide label spaces the label space id is always 0.
Diff by Renato Westphal
Diffstat (limited to 'usr.sbin/ldpd/hello.c')
| -rw-r--r-- | usr.sbin/ldpd/hello.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ldpd/hello.c b/usr.sbin/ldpd/hello.c index 1262bb7b060..d7e24d9919b 100644 --- a/usr.sbin/ldpd/hello.c +++ b/usr.sbin/ldpd/hello.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hello.c,v 1.16 2013/06/01 18:35:02 claudio Exp $ */ +/* $OpenBSD: hello.c,v 1.17 2013/06/01 18:47:07 claudio Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -61,7 +61,7 @@ send_hello(struct iface *iface) sizeof(struct hello_prms_tlv) + sizeof(struct hello_prms_opt4_tlv); - gen_ldp_hdr(buf, iface, size); + gen_ldp_hdr(buf, size); size -= LDP_HDR_SIZE; @@ -120,7 +120,7 @@ recv_hello(struct iface *iface, struct in_addr src, char *buf, u_int16_t len) return; } - nbr = nbr_find_ldpid(ldp.lsr_id, ldp.lspace_id); + nbr = nbr_find_ldpid(ldp.lsr_id); if (!nbr) { struct in_addr a; @@ -129,7 +129,7 @@ recv_hello(struct iface *iface, struct in_addr src, char *buf, u_int16_t len) else a = address; - nbr = nbr_new(ldp.lsr_id, ldp.lspace_id, iface, a); + nbr = nbr_new(ldp.lsr_id, iface, a); /* set neighbor parameters */ nbr->hello_type = flags; |