diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2018-12-27 17:19:57 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2018-12-27 17:19:57 +0000 |
| commit | a813b3fbddfe5fd6dfae56f506426dbc23d26de0 (patch) | |
| tree | bdfbda2cfad5e8d351db75b554fd61dfcd77d33d /sbin/dhclient | |
| parent | d39b414029ee131943f7751850320c3a46dd61f8 (diff) | |
Rename routehandler() to routefd_handler() to make the code slightly
more intuitive.
Diffstat (limited to 'sbin/dhclient')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 8 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dispatch.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index ea5b2fc5e45..14e917df0fa 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.595 2018/12/27 17:02:03 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.596 2018/12/27 17:19:56 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -307,7 +307,7 @@ get_hw_address(struct interface_info *ifi) } void -routehandler(struct interface_info *ifi, int routefd) +routefd_handler(struct interface_info *ifi, int routefd) { struct ether_addr hw; struct rt_msghdr *rtm; @@ -2590,7 +2590,7 @@ take_charge(struct interface_info *ifi, int routefd) fatal("routefd: ERR|HUP|NVAL"); if (nfds == 0 || (fds[0].revents & POLLIN) == 0) continue; - routehandler(ifi, routefd); + routefd_handler(ifi, routefd); } } @@ -2904,6 +2904,6 @@ propose_release(struct interface_info *ifi) fatal("routefd: ERR|HUP|NVAL"); if (nfds == 0 || (fds[0].revents & POLLIN) == 0) continue; - routehandler(ifi, routefd); + routefd_handler(ifi, routefd); } } diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index b86d2510903..0933b0333b7 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.259 2018/12/27 17:02:03 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.260 2018/12/27 17:19:56 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -222,7 +222,7 @@ void dhcpnak(struct interface_info *, const char *); void bootreply(struct interface_info *, struct option_data *, const char *); void free_client_lease(struct client_lease *); -void routehandler(struct interface_info *, int); +void routefd_handler(struct interface_info *, int); /* packet.c */ void assemble_eh_header(struct ether_addr, struct ether_header *); diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c index 6d56a8c952d..b0a16406c08 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.154 2018/12/27 17:02:03 krw Exp $ */ +/* $OpenBSD: dispatch.c,v 1.155 2018/12/27 17:19:56 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -173,7 +173,7 @@ dispatch(struct interface_info *ifi, int routefd) } while (quit == 0 && ifi->rbuf_offset < ifi->rbuf_len); } if ((fds[1].revents & POLLIN) != 0) - routehandler(ifi, routefd); + routefd_handler(ifi, routefd); if ((fds[2].revents & POLLOUT) != 0) flush_unpriv_ibuf(); if ((fds[2].revents & POLLIN) != 0) |