proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 19:13:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldpd: Move if_update to ldp_if_update

Browse Source 
The if_update function should be owned
by lib/if.h.  Move the function out of the
way so we can rename lib/if.h if_update_vrf -> if_update

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-03-15 10:49:21 -04:00
parent 17d990c1d3
commit 61cd110086
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ldpd/interface.c
View File

@ -206,7 +206,7 @@ if_addr_add(struct kaddr *ka)
if (if_addr_lookup(&iface->addr_list, ka) == NULL) { if (if_addr_lookup(&iface->addr_list, ka) == NULL) {
if_addr = if_addr_new(ka); if_addr = if_addr_new(ka);
LIST_INSERT_HEAD(&iface->addr_list, if_addr, entry); LIST_INSERT_HEAD(&iface->addr_list, if_addr, entry);
if_update(iface, if_addr->af); ldp_if_update(iface, if_addr->af);
} }
} }
} }
@ -227,7 +227,7 @@ if_addr_del(struct kaddr *ka)
if_addr = if_addr_lookup(&iface->addr_list, ka); if_addr = if_addr_lookup(&iface->addr_list, ka);
if (if_addr) { if (if_addr) {
LIST_REMOVE(if_addr, entry); LIST_REMOVE(if_addr, entry);
if_update(iface, if_addr->af); ldp_if_update(iface, if_addr->af);
free(if_addr); free(if_addr);
} }
} }
@ -368,7 +368,7 @@ if_update_af(struct iface_af *ia, int link_ok)
} }
void void
if_update(struct iface *iface, int af) ldp_if_update(struct iface *iface, int af)
{ {
int link_ok; int link_ok;
@ -386,7 +386,7 @@ if_update_all(int af)
struct iface *iface; struct iface *iface;
RB_FOREACH(iface, iface_head, &leconf->iface_tree) RB_FOREACH(iface, iface_head, &leconf->iface_tree)
if_update(iface, af); ldp_if_update(iface, af);
} }
uint16_t uint16_t

2
ldpd/ldpd.c
View File

@ -1360,7 +1360,7 @@ merge_iface_af(struct iface_af *ia, struct iface_af *xi)
if (ia->enabled != xi->enabled) { if (ia->enabled != xi->enabled) {
ia->enabled = xi->enabled; ia->enabled = xi->enabled;
if (ldpd_process == PROC_LDP_ENGINE) if (ldpd_process == PROC_LDP_ENGINE)
if_update(ia->iface, ia->af); ldp_if_update(ia->iface, ia->af);
} }
ia->hello_holdtime = xi->hello_holdtime; ia->hello_holdtime = xi->hello_holdtime;
ia->hello_interval = xi->hello_interval; ia->hello_interval = xi->hello_interval;

2
ldpd/ldpe.c
View File

@ -294,7 +294,7 @@ ldpe_dispatch_main(struct thread *thread)
iface = if_lookup_name(leconf, kif->ifname); iface = if_lookup_name(leconf, kif->ifname);
if (iface) { if (iface) {
if_update_info(iface, kif); if_update_info(iface, kif);
if_update(iface, AF_UNSPEC); ldp_if_update(iface, AF_UNSPEC);
break; break;
} }

2
ldpd/ldpe.h
View File

@ -220,7 +220,7 @@ void if_update_info(struct iface *, struct kif *);
struct iface_af *iface_af_get(struct iface *, int); struct iface_af *iface_af_get(struct iface *, int);
void if_addr_add(struct kaddr *); void if_addr_add(struct kaddr *);
void if_addr_del(struct kaddr *); void if_addr_del(struct kaddr *);
void if_update(struct iface *, int); void ldp_if_update(struct iface *, int);
void if_update_all(int); void if_update_all(int);
uint16_t if_get_hello_holdtime(struct iface_af *); uint16_t if_get_hello_holdtime(struct iface_af *);
uint16_t if_get_hello_interval(struct iface_af *); uint16_t if_get_hello_interval(struct iface_af *);