diff options
author | Cy Schubert <cy@FreeBSD.org> | 2020-08-05 15:33:32 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2020-08-05 15:33:32 +0000 |
commit | a5849fa4abcd508792b00400320b39c1499150b0 (patch) | |
tree | 4f0407c3b495be882636aa1b932a04bec312b5b3 /contrib/ipfilter | |
parent | 119656bc26959f207d464174393d67e198d239be (diff) | |
download | src-a5849fa4abcd508792b00400320b39c1499150b0.tar.gz src-a5849fa4abcd508792b00400320b39c1499150b0.zip |
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=363916
Diffstat (limited to 'contrib/ipfilter')
-rw-r--r-- | contrib/ipfilter/iplang/iplang_y.y | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y index f223b1eb8b32..b4570d390530 100644 --- a/contrib/ipfilter/iplang/iplang_y.y +++ b/contrib/ipfilter/iplang/iplang_y.y @@ -30,11 +30,9 @@ #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#ifndef linux # include <netinet/ip_var.h> # include <net/route.h> # include <netinet/if_ether.h> -#endif #include <netdb.h> #include <arpa/nameser.h> #include <arpa/inet.h> @@ -589,28 +587,6 @@ struct statetoopt tosecopts[] = { { 0, 0 } }; -#ifdef bsdi -struct ether_addr * -ether_aton(s) - char *s; -{ - static struct ether_addr n; - u_int i[6]; - - if (sscanf(s, " %x:%x:%x:%x:%x:%x ", &i[0], &i[1], - &i[2], &i[3], &i[4], &i[5]) == 6) { - n.ether_addr_octet[0] = (u_char)i[0]; - n.ether_addr_octet[1] = (u_char)i[1]; - n.ether_addr_octet[2] = (u_char)i[2]; - n.ether_addr_octet[3] = (u_char)i[3]; - n.ether_addr_octet[4] = (u_char)i[4]; - n.ether_addr_octet[5] = (u_char)i[5]; - return &n; - } - return NULL; -} -#endif - struct in_addr getipv4addr(arg) char *arg; @@ -645,7 +621,6 @@ struct ether_addr *buf; { struct ether_addr *e; -#if !defined(hpux) && !defined(linux) e = ether_aton(arg); if (!e) fprintf(stderr, "Invalid ethernet address: %s\n", arg); @@ -657,9 +632,6 @@ struct ether_addr *buf; sizeof(e->ether_addr_octet)); # endif return e; -#else - return NULL; -#endif } @@ -1584,9 +1556,7 @@ int arg; void set_icmpmtu(arg) int arg; { -#if BSD >= 199306 icmp->icmp_nextmtu = htons(arg); -#endif } |