From c6f3a288ff838857d54c29c50bed96fbb12de965 Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Mon, 5 Aug 2019 01:38:21 +0200 Subject: [PATCH] Rename interface_up to interface_updown. As suggested by Christof Schulze. --- babeld.c | 6 +++--- interface.c | 10 +++++----- interface.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/babeld.c b/babeld.c index 0f508faf..a879516c 100644 --- a/babeld.c +++ b/babeld.c @@ -805,7 +805,7 @@ main(int argc, char **argv) usleep(roughly(10000)); gettime(&now); - /* We need to flush so interface_up won't try to reinstall. */ + /* We need to flush so interface_updown won't try to reinstall. */ flush_all_routes(); FOR_ALL_INTERFACES(ifp) { @@ -828,7 +828,7 @@ main(int argc, char **argv) flushbuf(&ifp->buf, ifp); usleep(roughly(10000)); gettime(&now); - interface_up(ifp, 0); + interface_updown(ifp, 0); } release_tables(); kernel_setup_socket(0); @@ -885,7 +885,7 @@ main(int argc, char **argv) FOR_ALL_INTERFACES(ifp) { if(!if_up(ifp)) continue; - interface_up(ifp, 0); + interface_updown(ifp, 0); } kernel_setup_socket(0); kernel_setup(0); diff --git a/interface.c b/interface.c index c5d26a22..4dd5499f 100644 --- a/interface.c +++ b/interface.c @@ -109,7 +109,7 @@ flush_interface(char *ifname) if(ifp == NULL) return 0; - interface_up(ifp, 0); + interface_updown(ifp, 0); if(prev) prev->next = ifp->next; else @@ -271,7 +271,7 @@ check_link_local_addresses(struct interface *ifp) } int -interface_up(struct interface *ifp, int up) +interface_updown(struct interface *ifp, int up) { int mtu, rc, type; struct ipv6_mreq mreq; @@ -519,7 +519,7 @@ interface_up(struct interface *ifp, int up) fail: assert(up); - interface_up(ifp, 0); + interface_updown(ifp, 0); local_notify_interface(ifp, LOCAL_CHANGE); return -1; } @@ -550,7 +550,7 @@ check_interfaces(void) ifindex = if_nametoindex(ifp->name); if(ifindex != ifp->ifindex) { debugf("Noticed ifindex change for %s.\n", ifp->name); - interface_up(ifp, 0); + interface_updown(ifp, 0); ifp->ifindex = ifindex; ifindex_changed = 1; } @@ -561,7 +561,7 @@ check_interfaces(void) rc = 0; if((rc > 0) != if_up(ifp)) { debugf("Noticed status change for %s.\n", ifp->name); - interface_up(ifp, rc > 0); + interface_updown(ifp, rc > 0); } if(if_up(ifp)) { diff --git a/interface.h b/interface.h index 69352f1d..d0c2776f 100644 --- a/interface.h +++ b/interface.h @@ -151,6 +151,6 @@ int flush_interface(char *ifname); unsigned jitter(struct buffered *buf, int urgent); unsigned update_jitter(struct interface *ifp, int urgent); void set_timeout(struct timeval *timeout, int msecs); -int interface_up(struct interface *ifp, int up); +int interface_updown(struct interface *ifp, int up); int interface_ll_address(struct interface *ifp, const unsigned char *address); void check_interfaces(void);