summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2016-05-19 15:01:47 +0000
committerRoy Marples <roy@marples.name>2016-05-19 15:01:47 +0000
commit053b3dedb7998cbf7630ce7db28221af4af326f1 (patch)
treecf7a0055b5586930d337303018b61baccfcb439d
parentcc1815985352e93d2827a554b79cb795ee235eb7 (diff)
downloaddhcpcd-053b3dedb7998cbf7630ce7db28221af4af326f1.tar.xz
managelink -> hanlelink
-rw-r--r--dhcpcd.c8
-rw-r--r--if-bsd.c2
-rw-r--r--if-linux.c2
-rw-r--r--if-sun.c2
-rw-r--r--if.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index bccc2496..31204d95 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -986,13 +986,13 @@ dhcpcd_activateinterface(struct interface *ifp, unsigned long long options)
}
static void
-handle_link(void *arg)
+dhcpcd_handlelink(void *arg)
{
struct dhcpcd_ctx *ctx;
ctx = arg;
- if (if_managelink(ctx) == -1) {
- logger(ctx, LOG_ERR, "if_managelink: %m");
+ if (if_handlelink(ctx) == -1) {
+ logger(ctx, LOG_ERR, "if_handlelink: %m");
eloop_event_delete(ctx->eloop, ctx->link_fd);
close(ctx->link_fd);
ctx->link_fd = -1;
@@ -1828,7 +1828,7 @@ printpidfile:
/* Start handling kernel messages for interfaces, addreses and
* routes. */
- eloop_event_add(ctx.eloop, ctx.link_fd, handle_link, &ctx);
+ eloop_event_add(ctx.eloop, ctx.link_fd, dhcpcd_handlelink, &ctx);
/* Start any dev listening plugin which may want to
* change the interface name provided by the kernel */
diff --git a/if-bsd.c b/if-bsd.c
index 1682f27e..3973453e 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -1227,7 +1227,7 @@ if_getlifetime6(struct ipv6_addr *ia)
#endif
int
-if_managelink(struct dhcpcd_ctx *ctx)
+if_handlelink(struct dhcpcd_ctx *ctx)
{
/* route and ifwatchd like a msg buf size of 2048 */
char msg[2048], *p, *e, *cp;
diff --git a/if-linux.c b/if-linux.c
index 4085b9f0..4bb800bc 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -885,7 +885,7 @@ link_netlink(struct dhcpcd_ctx *ctx, struct interface *ifp,
}
int
-if_managelink(struct dhcpcd_ctx *ctx)
+if_handlelink(struct dhcpcd_ctx *ctx)
{
return get_netlink(ctx, NULL,
diff --git a/if-sun.c b/if-sun.c
index 35c92dd0..33ce9ab7 100644
--- a/if-sun.c
+++ b/if-sun.c
@@ -136,7 +136,7 @@ if_vimaster(__unused const struct dhcpcd_ctx *ctx, __unused const char *ifname)
}
int
-if_managelink(struct dhcpcd_ctx *ctx)
+if_handlelink(struct dhcpcd_ctx *ctx)
{
UNUSED(ctx);
diff --git a/if.h b/if.h
index 0aaa47bd..078cc8ad 100644
--- a/if.h
+++ b/if.h
@@ -111,7 +111,7 @@ int if_opensockets(struct dhcpcd_ctx *);
int if_opensockets_os(struct dhcpcd_ctx *);
void if_closesockets(struct dhcpcd_ctx *);
void if_closesockets_os(struct dhcpcd_ctx *);
-int if_managelink(struct dhcpcd_ctx *);
+int if_handlelink(struct dhcpcd_ctx *);
/* dhcpcd uses the same routing flags as BSD.
* If the platform doesn't use these flags,