summaryrefslogtreecommitdiff
path: root/sbin/dhclient
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-07-17 16:13:14 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-07-17 16:13:14 +0000
commit7d718717bdfa878328e2926d40e6c8cff90d29ab (patch)
tree665333cd5985f83c73f6449439acb6cfc2a87c25 /sbin/dhclient
parent1205bb80fcf369ace79696bbd6d2d21b320a2dda (diff)
Nuke findproto() and get_ifa(). They are unused now that
RTM_DELADDR and RTM_NEWADDR are no longer of interest. Pointed out by jca@
Diffstat (limited to 'sbin/dhclient')
-rw-r--r--sbin/dhclient/dhclient.c53
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)
{