From 1e29bfd7d84d16efd23eb4d6a22bf8fdc03a3001 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 18 Jul 2018 19:54:36 -0400 Subject: [PATCH] Update all remaining consumers of the FreeBSD compat headers. --- build/jam/packages/HaikuDevel | 6 +- .../kernel/drivers/network/3com/Jamfile | 2 +- src/bin/network/Jamfile | 1 - src/bin/network/ifconfig/Jamfile | 2 +- src/bin/network/ifconfig/ifconfig.cpp | 4 +- src/bin/network/setwep/Jamfile | 13 - src/bin/network/setwep/setwep.c | 294 ------------------ src/kits/network/libnetapi/Jamfile | 4 +- src/kits/network/netresolv/Jamfile | 2 +- src/libs/compat/Jamfile | 2 - src/servers/net/Jamfile | 4 +- 11 files changed, 12 insertions(+), 322 deletions(-) delete mode 100644 src/bin/network/setwep/Jamfile delete mode 100644 src/bin/network/setwep/setwep.c diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel index 1e0636862e..16d71c6089 100644 --- a/build/jam/packages/HaikuDevel +++ b/build/jam/packages/HaikuDevel @@ -61,10 +61,10 @@ AddHeaderDirectoryToPackage posix ; # private headers AddHeaderDirectoryToPackage private ; CopyDirectoryToPackage develop headers private libs compat - : [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] - : : -x *.c -x *.cpp -x *.awk -x Jamfile -x miidevs ; + : [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network ] + : : -x *.c -x *.cpp -x *.awk -x Jamfile -x miidevs -x usbdevs ; CopyDirectoryToPackage develop headers private libs compat - : [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] + : [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : : -x *.c -x Jamfile ; # create be -> os symlink for now diff --git a/src/add-ons/kernel/drivers/network/3com/Jamfile b/src/add-ons/kernel/drivers/network/3com/Jamfile index 695ce1238a..833641c24e 100644 --- a/src/add-ons/kernel/drivers/network/3com/Jamfile +++ b/src/add-ons/kernel/drivers/network/3com/Jamfile @@ -26,4 +26,4 @@ ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) ukphy$(SUFOBJ) xlphy$(SUFOBJ) ] : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs compat freebsd_network ] ; Includes [ FGristFiles bmtphy.c ukphy.c xlphy.c ] - : miidevs.h ; + : miidevs.h ; diff --git a/src/bin/network/Jamfile b/src/bin/network/Jamfile index 06e6a79b9d..854037362b 100644 --- a/src/bin/network/Jamfile +++ b/src/bin/network/Jamfile @@ -15,7 +15,6 @@ SubInclude HAIKU_TOP src bin network ppp_up ; SubInclude HAIKU_TOP src bin network ping ; SubInclude HAIKU_TOP src bin network ping6 ; SubInclude HAIKU_TOP src bin network route ; -SubInclude HAIKU_TOP src bin network setwep ; SubInclude HAIKU_TOP src bin network telnet ; SubInclude HAIKU_TOP src bin network telnetd ; SubInclude HAIKU_TOP src bin network traceroute ; diff --git a/src/bin/network/ifconfig/Jamfile b/src/bin/network/ifconfig/Jamfile index 679d2906a6..cec413ba4e 100644 --- a/src/bin/network/ifconfig/Jamfile +++ b/src/bin/network/ifconfig/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin network ifconfig ; UsePrivateHeaders net ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ; SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ; diff --git a/src/bin/network/ifconfig/ifconfig.cpp b/src/bin/network/ifconfig/ifconfig.cpp index 9c14bff3a8..8bf9375a1a 100644 --- a/src/bin/network/ifconfig/ifconfig.cpp +++ b/src/bin/network/ifconfig/ifconfig.cpp @@ -27,8 +27,8 @@ #include extern "C" { -# include -# include +# include +# include # include } diff --git a/src/bin/network/setwep/Jamfile b/src/bin/network/setwep/Jamfile deleted file mode 100644 index 287e8ee092..0000000000 --- a/src/bin/network/setwep/Jamfile +++ /dev/null @@ -1,13 +0,0 @@ -SubDir HAIKU_TOP src bin network setwep ; - -UsePrivateHeaders net ; -UsePrivateHeaders kernel ; -UsePrivateSystemHeaders ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] - : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ; - -BinCommand setwep : - setwep.c - : $(TARGET_NETWORK_LIBS) -; diff --git a/src/bin/network/setwep/setwep.c b/src/bin/network/setwep/setwep.c deleted file mode 100644 index 728b9c2d5d..0000000000 --- a/src/bin/network/setwep/setwep.c +++ /dev/null @@ -1,294 +0,0 @@ -/* - * - * Copyright 2010 Haiku Inc. All rights reserved. - * Distributed under the terms of the MIT License. - * - * Many parts - * - * Copyright 2001 The Aerospace Corporation. - * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * Distributed under the terms of the 2-clause BSD license. - * - * Authors: - * Alex Botero-Lowry, alex.boterolowry@gmail.com - */ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include - - -extern const char* __progname; - - -static const char* -get_string(const char* val, const char* sep, u_int8_t* buf, int* lenp) -{ - int len; - int hexstr; - u_int8_t* p; - - len = *lenp; - p = buf; - hexstr = (val[0] == '0' && tolower((u_char) val[1]) == 'x'); - if (hexstr) - val += 2; - for (;;) { - if (*val == '\0') - break; - if (sep != NULL && strchr(sep, *val) != NULL) { - val++; - break; - } - if (hexstr) { - if (!isxdigit((u_char) val[0])) { - printf("%s: bad hexadecimal digits", __func__); - return NULL; - } - if (!isxdigit((u_char) val[1])) { - printf("%s: odd count hexadecimal digits", __func__); - return NULL; - } - } - if (p >= buf + len) { - if (hexstr) - printf("%s: hexadecimal digits too long", __func__); - else - printf("%s: string too long", __func__); - return NULL; - } - if (hexstr) { -#define tohex(x) (isdigit(x) ? (x) - '0' : tolower(x) - 'a' + 10) - *p++ = (tohex((u_char) val[0]) << 4) - | tohex((u_char) val[1]); -#undef tohex - val += 2; - } else - *p++ = *val++; - } - len = p - buf; - /* The string "-" is treated as the empty string. */ - if (!hexstr && len == 1 && buf[0] == '-') { - len = 0; - memset(buf, 0, *lenp); - } else if (len < *lenp) - memset(p, 0, *lenp - len); - - *lenp = len; - return val; -} - - -static void -set80211(int s, const char* dev, int type, int val, int len, void* data) -{ - struct ieee80211req ireq; - - (void)memset(&ireq, 0, sizeof(ireq)); - (void)strncpy(ireq.i_name, dev, sizeof(ireq.i_name)); - ireq.i_type = type; - ireq.i_val = val; - ireq.i_len = len; - ireq.i_data = data; - if (ioctl(s, SIOCS80211, &ireq, sizeof(struct ieee80211req)) < 0) { - fprintf(stderr, "%s: error in handling SIOCS80211 (type %d): %s\n", - __progname, type, strerror(errno)); - } -} - - -static void -set80211ssid(const char* dev, const char* val, int s) -{ - int ssid; - int len; - u_int8_t data[IEEE80211_NWID_LEN]; - - ssid = 0; - len = strlen(val); - if (len > 2 && isdigit((int)val[0]) && val[1] == ':') { - ssid = atoi(val) - 1; - val += 2; - } - bzero(data, sizeof(data)); - len = sizeof(data); - if (get_string(val, NULL, data, &len) == NULL) - exit(1); - - set80211(s, dev, IEEE80211_IOC_SSID, ssid, len, data); -} - - -static void -set80211nwkey(const char* dev, const char* val, int s) -{ - int txkey; - int i; - int len; - u_int8_t data[IEEE80211_KEYBUF_SIZE]; - - set80211(s, dev, IEEE80211_IOC_WEP, IEEE80211_WEP_ON, 0, NULL); - - if (isdigit((int)val[0]) && val[1] == ':') { - txkey = val[0] - '0' - 1; - val += 2; - - for (i = 0; i < 4; i++) { - bzero(data, sizeof(data)); - len = sizeof(data); - val = get_string(val, ",", data, &len); - if (val == NULL) - exit(1); - - set80211(s, dev, IEEE80211_IOC_WEPKEY, i, len, data); - } - } else { - bzero(data, sizeof(data)); - len = sizeof(data); - get_string(val, NULL, data, &len); - txkey = 0; - - set80211(s, dev, IEEE80211_IOC_WEPKEY, 0, len, data); - - bzero(data, sizeof(data)); - for (i = 1; i < 4; i++) - set80211(s, dev, IEEE80211_IOC_WEPKEY, i, 0, data); - } - - set80211(s, dev, IEEE80211_IOC_WEPTXKEY, txkey, 0, NULL); -} - - -static int -get80211val(int s, const char* dev, int type, int* val) -{ - struct ieee80211req ireq; - - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, dev, sizeof(ireq.i_name)); - ireq.i_type = type; - if (ioctl(s, SIOCG80211, &ireq) < 0) - return -1; - *val = ireq.i_val; - return 0; -} - - -static int -getid(int s, const char* dev, int ix, void* data, size_t len, int* plen, - int mesh) -{ - struct ieee80211req ireq; - - (void)memset(&ireq, 0, sizeof(ireq)); - (void)strncpy(ireq.i_name, dev, sizeof(ireq.i_name)); - ireq.i_type = (!mesh) ? IEEE80211_IOC_SSID : IEEE80211_IOC_MESH_ID; - ireq.i_val = ix; - ireq.i_data = data; - ireq.i_len = len; - if (ioctl(s, SIOCG80211, &ireq) < 0) - return -1; - *plen = ireq.i_len; - return 0; -} - - -static void -print_string(const u_int8_t* buf, int len) -{ - int i; - int hasspc; - - i = 0; - hasspc = 0; - for (; i < len; i++) { - if (!isprint(buf[i]) && buf[i] != '\0') - break; - if (isspace(buf[i])) - hasspc++; - } - if (i == len) { - if (hasspc || len == 0 || buf[0] == '\0') - printf("\"%.*s\"", len, buf); - else - printf("%.*s", len, buf); - } else { - printf("0x"); - for (i = 0; i < len; i++) - printf("%02x", buf[i]); - } -} - - -static void -show_status(const char* dev, int s) -{ - int len; - int i; - int num; - uint8_t data[32]; - - if (getid(s, dev, -1, data, sizeof(data), &len, 0) < 0) { - fprintf(stderr, "error: not a wifi device\n"); - exit(1); - } - - if (get80211val(s, dev, IEEE80211_IOC_NUMSSIDS, &num) < 0) - num = 0; - printf("ssid "); - if (num > 1) { - for (i = 0; i < num; i++) { - if (getid(s, dev, i, data, sizeof(data), &len, 0) >= 0 - && len > 0) { - printf(" %d:", i + 1); - print_string(data, len); - } - } - } else - print_string(data, len); - - printf("\n"); -} - - -static void -usage() -{ - fprintf(stderr, "usage: setwep device_path [ssid] [key]\n"); - exit(1); -} - - -int -main(int argc, char** argv) -{ - int s = socket(AF_INET, SOCK_DGRAM, 0); - - if (argc < 2) - usage(); - - if (argc == 2) - show_status(argv[1], s); - - if (argc > 3) - set80211ssid(argv[1], argv[2], s); - - if (argc == 4) - set80211nwkey(argv[1], argv[3], s); - - return 0; -} diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index 999d82538a..c4c6bf2560 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -3,9 +3,9 @@ SubDir HAIKU_TOP src kits network libnetapi ; UsePrivateHeaders app net shared storage support ; UsePrivateHeaders locale shared ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ] : true ; diff --git a/src/kits/network/netresolv/Jamfile b/src/kits/network/netresolv/Jamfile index a373555dd7..96fcdad0ca 100644 --- a/src/kits/network/netresolv/Jamfile +++ b/src/kits/network/netresolv/Jamfile @@ -6,7 +6,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { local architecture = $(TARGET_PACKAGING_ARCH) ; UseHeaders [ FDirName $(SUBDIR) include ] : true ; - UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] + UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; SubDirSysHdrs $(SUBDIR) ; diff --git a/src/libs/compat/Jamfile b/src/libs/compat/Jamfile index 335d905250..a821959b24 100644 --- a/src/libs/compat/Jamfile +++ b/src/libs/compat/Jamfile @@ -1,6 +1,4 @@ SubDir HAIKU_TOP src libs compat ; -SubInclude HAIKU_TOP src libs compat freebsd_network ; -SubInclude HAIKU_TOP src libs compat freebsd_wlan ; SubInclude HAIKU_TOP src libs compat freebsd11_network ; SubInclude HAIKU_TOP src libs compat freebsd11_wlan ; diff --git a/src/servers/net/Jamfile b/src/servers/net/Jamfile index 3d269099f7..382d74350d 100644 --- a/src/servers/net/Jamfile +++ b/src/servers/net/Jamfile @@ -2,9 +2,9 @@ SubDir HAIKU_TOP src servers net ; UsePrivateHeaders app net shared storage ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_network compat ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ] : true ;