diff options
| author |   krw <krw@openbsd.org> | 2017-07-17 16:13:13 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2017-07-17 16:13:13 +0000 |
| commit | ea009e3cf7a377c3d235e92e30d8e81de63fe429 (patch) | |
| tree | 8864e5edbe61c4e159363052810263ed3594375e | |
| parent | Reduce amount of CAS attempts in a busy-wait loop by a factor of 100 (diff) | |
| download | wireguard-openbsd-ea009e3cf7a377c3d235e92e30d8e81de63fe429.tar.xz wireguard-openbsd-ea009e3cf7a377c3d235e92e30d8e81de63fe429.zip | |
Nuke findproto() and get_ifa(). They are unused now that
RTM_DELADDR and RTM_NEWADDR are no longer of interest.
Pointed out by jca@
| -rw-r--r-- | sbin/dhclient/dhclient.c | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index f118060618d..37f7236928a 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.470 2017/07/17 15:05:03 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.471 2017/07/17 16:13:13 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -126,8 +126,6 @@ struct proposal { }; void sighdlr(int); -int findproto(char *, int); -struct sockaddr *get_ifa(char *, int); void usage(void); int res_hnok(const char *dn); int res_hnok_list(const char *dn); @@ -186,55 +184,6 @@ sighdlr(int sig) quit = sig; } -int -findproto(char *cp, int n) -{ - struct sockaddr *sa; - unsigned int i; - - if (n == 0) - return -1; - for (i = 1; i; i <<= 1) { - if ((i & n) != 0) { - sa = (struct sockaddr *)cp; - switch (i) { - case RTA_IFA: - case RTA_DST: - case RTA_GATEWAY: - case RTA_NETMASK: - if (sa->sa_family == AF_INET) - return AF_INET; - if (sa->sa_family == AF_INET6) - return AF_INET6; - break; - case RTA_IFP: - break; - } - ADVANCE(cp, sa); - } - } - return -1; -} - -struct sockaddr * -get_ifa(char *cp, int n) -{ - struct sockaddr *sa; - unsigned int i; - - if (n == 0) - return NULL; - for (i = 1; i; i <<= 1) - if ((i & n) != 0) { - sa = (struct sockaddr *)cp; - if (i == RTA_IFA) - return sa; - ADVANCE(cp, sa); - } - - return NULL; -} - void routehandler(struct interface_info *ifi, int routefd) { |