diff --git a/net/dcwifi/macremapper/Makefile b/kernel/macremapper/Makefile similarity index 92% rename from net/dcwifi/macremapper/Makefile rename to kernel/macremapper/Makefile index 85e39f356..fc242eee8 100644 --- a/net/dcwifi/macremapper/Makefile +++ b/kernel/macremapper/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=macremapper -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f054201dd805ce005b89606a507b58a5717d383a4339c69dfdc02f0202935437 +PKG_HASH:=f9580427803123d13d50f3422623a37212034a5d72a485f9c04904f19509e4bb PKG_MAINTAINER:=Carey Sonsino PKG_LICENSE:=GPL-2.0-only diff --git a/net/dcwifi/macremapper/patches/01_fix_nf_hooks.patch b/kernel/macremapper/patches/01_fix_nf_hooks.patch similarity index 90% rename from net/dcwifi/macremapper/patches/01_fix_nf_hooks.patch rename to kernel/macremapper/patches/01_fix_nf_hooks.patch index 570d7811d..29cb421f8 100644 --- a/net/dcwifi/macremapper/patches/01_fix_nf_hooks.patch +++ b/kernel/macremapper/patches/01_fix_nf_hooks.patch @@ -1,6 +1,6 @@ --- a/kernelmod/main.c +++ b/kernelmod/main.c -@@ -91,8 +91,11 @@ modinit( void ) { +@@ -98,8 +98,11 @@ modinit( void ) { rv = mrm_rcdb_init(); if (rv != 0) return rv; @@ -13,7 +13,7 @@ mrm_init_ctlfile(); /* XXX not checking for failure! */ printk(KERN_INFO "MRM The MAC Address Re-Mapper is now in the kernel\n"); -@@ -103,7 +106,11 @@ modinit( void ) { +@@ -110,7 +113,11 @@ modinit( void ) { static void __exit modexit( void ) { mrm_destroy_ctlfile(); diff --git a/net/dcwifi/libdcwproto/Makefile b/libs/libdcwproto/Makefile similarity index 93% rename from net/dcwifi/libdcwproto/Makefile rename to libs/libdcwproto/Makefile index 2216e1f8e..37905b854 100644 --- a/net/dcwifi/libdcwproto/Makefile +++ b/libs/libdcwproto/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdcwproto -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5bda395c648aa12eb90515c29024029738fde1a8f73a2cbc553be1c6962c2629 +PKG_HASH:=b3d12f2533eafbb293bbf27608ff39520508d955a084f33894c594f39d2f7c8e PKG_MAINTAINER:=Carey Sonsino PKG_LICENSE:=Apache-2.0 diff --git a/net/dcwifi/libdcwsocket/Makefile b/libs/libdcwsocket/Makefile similarity index 93% rename from net/dcwifi/libdcwsocket/Makefile rename to libs/libdcwsocket/Makefile index ff21bce7a..73a4c3a62 100644 --- a/net/dcwifi/libdcwsocket/Makefile +++ b/libs/libdcwsocket/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdcwsocket -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=c7f6c69a5246fe1f184c21585f0805ceaca09c3c087ae439ded7ed4d25c7a3fa +PKG_HASH:=71383c4d8c5f58c1299a3717d7de9a8b5dabfd51a2dcf9993248f2709908d23a PKG_MAINTAINER:=Carey Sonsino PKG_LICENSE:=Apache-2.0 diff --git a/net/dcwifi/libdcwsocket/patches/02_fix_storage_size_error.patch b/libs/libdcwsocket/patches/02_fix_storage_size_error.patch similarity index 100% rename from net/dcwifi/libdcwsocket/patches/02_fix_storage_size_error.patch rename to libs/libdcwsocket/patches/02_fix_storage_size_error.patch diff --git a/net/dcwifi/dcstad/Makefile b/net/dcstad/Makefile similarity index 92% rename from net/dcwifi/dcstad/Makefile rename to net/dcstad/Makefile index 150eb62a5..3112b0c1c 100644 --- a/net/dcwifi/dcstad/Makefile +++ b/net/dcstad/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dcstad -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3b146ea22bc5480d8264c5ea269831d25993673aa90a9e82dc2dc601a111da55 +PKG_HASH:=3bed8a5051c92cd41ba3477d2db211df8f10fd6e49946f0b74cf643464c1c201 PKG_MAINTAINER:=Carey Sonsino PKG_LICENSE:=Apache-2.0 diff --git a/net/dcwifi/dcwapd/Makefile b/net/dcwapd/Makefile similarity index 95% rename from net/dcwifi/dcwapd/Makefile rename to net/dcwapd/Makefile index 9e35d31f3..0fe336298 100644 --- a/net/dcwifi/dcwapd/Makefile +++ b/net/dcwapd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dcwapd -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=750a08abccd88d9aeda942307f76ce5711181c06f9f3e8fded5cb5ce42bac323 +PKG_HASH:=58e52bf4e7526b2f26319740549dbcc6f6ab505f587815ee8731e40f7fecb625 PKG_MAINTAINER:=Carey Sonsino PKG_LICENSE:=Apache-2.0 diff --git a/net/dcwifi/dcwapd/files/dcwapd.inc b/net/dcwapd/files/dcwapd.inc similarity index 100% rename from net/dcwifi/dcwapd/files/dcwapd.inc rename to net/dcwapd/files/dcwapd.inc diff --git a/net/dcwifi/dcwapd/files/dcwapd.init.d b/net/dcwapd/files/dcwapd.init.d similarity index 100% rename from net/dcwifi/dcwapd/files/dcwapd.init.d rename to net/dcwapd/files/dcwapd.init.d diff --git a/net/dcwifi/dcwapd/files/dcwapd.uci b/net/dcwapd/files/dcwapd.uci similarity index 100% rename from net/dcwifi/dcwapd/files/dcwapd.uci rename to net/dcwapd/files/dcwapd.uci diff --git a/net/dcwifi/dcwapd/files/start_dcwapd.sh b/net/dcwapd/files/start_dcwapd.sh similarity index 100% rename from net/dcwifi/dcwapd/files/start_dcwapd.sh rename to net/dcwapd/files/start_dcwapd.sh diff --git a/net/dcwifi/dcwapd/files/stop_dcwapd.sh b/net/dcwapd/files/stop_dcwapd.sh similarity index 100% rename from net/dcwifi/dcwapd/files/stop_dcwapd.sh rename to net/dcwapd/files/stop_dcwapd.sh diff --git a/net/dcwifi/dcwapd/patches/01_add_uci_config_provider.patch b/net/dcwapd/patches/01_add_uci_config_provider.patch similarity index 100% rename from net/dcwifi/dcwapd/patches/01_add_uci_config_provider.patch rename to net/dcwapd/patches/01_add_uci_config_provider.patch diff --git a/net/dcwifi/dcwapd/patches/02_use_uci_config_provider.patch b/net/dcwapd/patches/02_use_uci_config_provider.patch similarity index 100% rename from net/dcwifi/dcwapd/patches/02_use_uci_config_provider.patch rename to net/dcwapd/patches/02_use_uci_config_provider.patch diff --git a/net/dcwifi/dcwapd/patches/03_add_uci_config_provider_to_Makefile.patch b/net/dcwapd/patches/03_add_uci_config_provider_to_Makefile.patch similarity index 100% rename from net/dcwifi/dcwapd/patches/03_add_uci_config_provider_to_Makefile.patch rename to net/dcwapd/patches/03_add_uci_config_provider_to_Makefile.patch diff --git a/net/dcwifi/README.md b/net/dcwifi/README.md deleted file mode 100644 index 6513933e3..000000000 --- a/net/dcwifi/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Description - -This directory contains package files for including Dual Channel Wi-Fi (dcwifi) components in an OpenWrt build. - -# dcwifi Packages - -The dcwifi packages can be found in the menuconfig in the following locations: - - * dcstad: `Network -> Routing and Redirection` - * dcwapd: `Network -> Routing and Redirection` - * libdcwproto: `Libraries -> Networking` - * libdcwsocket: `Libraries -> Networking` - * macremapper: `Kernel modules -> Network Support` (listed as `kmod-macremapper`) - * mrmctl: `Utilities` diff --git a/net/dcwifi/dcstad/patches/01_replace_bzero.patch b/net/dcwifi/dcstad/patches/01_replace_bzero.patch deleted file mode 100644 index db924f77a..000000000 --- a/net/dcwifi/dcstad/patches/01_replace_bzero.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/main.c -+++ b/src/main.c -@@ -190,7 +190,7 @@ main( int argc, char *argv[] ) { - rv = 1; /* failure unless proven otherwise */ - - /* first initialize and parse the command line */ -- bzero(&cfg, sizeof(cfg)); -+ memset(&cfg, 0, sizeof(cfg)); - parse_cmdline(&cfg, argc, argv); - - dcwloginfof("%s\n", "DCW Station Daemon Starting Up..."); diff --git a/net/dcwifi/dcwapd/patches/04_uclibc++_fixes.patch b/net/dcwifi/dcwapd/patches/04_uclibc++_fixes.patch deleted file mode 100644 index a8721c49d..000000000 --- a/net/dcwifi/dcwapd/patches/04_uclibc++_fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/dcw/controller.cxx -+++ b/dcw/controller.cxx -@@ -195,7 +195,7 @@ void Controller::OnStationUnjoin(const MacAddress& primaryMacAddr, const Message - //remove any channel bondings matching the provided data channel mac addresses - for (unsigned i = 0; i < m.data_macaddr_count; i++) { - const ::dcw::MacAddress dcaddr(m.data_macaddrs[i]); -- const ::dcw::TrafficPolicy::DataChannelMap::iterator dcmEntry = state.policy.dataChannels.find(dcaddr); -+ ::dcw::TrafficPolicy::DataChannelMap::iterator dcmEntry = state.policy.dataChannels.find(dcaddr); - if (dcmEntry == state.policy.dataChannels.end()) continue; - if (dcmEntry->second == NULL) { - dcwlogwarnf("Data channel MAC address %s on client %s is not currently bonded\n", dcaddr.ToString().c_str(), primaryMacAddr.ToString().c_str()); -@@ -238,7 +238,7 @@ void Controller::OnStationAck(const MacAddress& primaryMacAddr, const Message& m - dcwlogdbgf("Got a station ACK from %s\n", primaryMacAddr.ToString().c_str()); - - // first make sure this client has actually sent a join first... -- const ClientStateMap::iterator client = _clients.find(primaryMacAddr); -+ ClientStateMap::iterator client = _clients.find(primaryMacAddr); - if (client == _clients.end()) { - dcwlogerrf("Got a client ACK without a station join from %s\n", primaryMacAddr.ToString().c_str()); - Message reply(DCWMSG_AP_REJECT_STA); ---- a/dcwposix/processsignalmanager.cxx -+++ b/dcwposix/processsignalmanager.cxx -@@ -40,7 +40,7 @@ ProcessSignalManager::~ProcessSignalManager() { - } - - void ProcessSignalManager::RegisterEventHandler(const int signum, ::dcwposix::ProcessSignalManager::EventHandler& eventHandler) { -- const SignalMap::iterator i = _sigmap.find(signum); -+ SignalMap::iterator i = _sigmap.find(signum); - if (i == _sigmap.end()) { - //be sure to preseve the old signal when inserting a new "unseen" signal - _sigmap[signum].insert(&eventHandler); -@@ -53,7 +53,7 @@ void ProcessSignalManager::RegisterEventHandler(const int signum, ::dcwposix::Pr - } - - void ProcessSignalManager::UnRegisterEventHandler(const int signum, ::dcwposix::ProcessSignalManager::EventHandler& eventHandler) { -- const SignalMap::iterator i = _sigmap.find(signum); -+ SignalMap::iterator i = _sigmap.find(signum); - - if (i == _sigmap.end()) { - dcwlogwarnf("Attempting to unregister handler %p non-registered process signal #%d\n", &eventHandler, signum); \ No newline at end of file diff --git a/net/dcwifi/dcwapd/patches/05_replace_bzero.patch b/net/dcwifi/dcwapd/patches/05_replace_bzero.patch deleted file mode 100644 index ffd9ee05c..000000000 --- a/net/dcwifi/dcwapd/patches/05_replace_bzero.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/dcwlinux/macremapper_driver.cxx -+++ b/dcwlinux/macremapper_driver.cxx -@@ -174,7 +174,7 @@ void MacRemapperDriver::ApplyClientTrafficPolicy(const dcw::MacAddress& primaryA - } - - //populate our remap ioctl() -- bzero(&re, sizeof(re)); -+ memset(&re, 0, sizeof(re)); - strncpy(re.filter_name, policy.trafficFilterProfile->GetName(), sizeof(re.filter_name)); - memcpy(re.match_macaddr, primaryAddr.Value, sizeof(re.match_macaddr)); - diff --git a/net/dcwifi/libdcwproto/patches/01_replace_bzero.patch b/net/dcwifi/libdcwproto/patches/01_replace_bzero.patch deleted file mode 100644 index bfcbf7501..000000000 --- a/net/dcwifi/libdcwproto/patches/01_replace_bzero.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/dcwproto.c -+++ b/src/dcwproto.c -@@ -20,12 +20,8 @@ - - - --#ifdef WIN32 --#define bzero(ptr, size) memset(ptr, 0, size) --#else - #include - #include --#endif - #include - - #include -@@ -95,7 +91,7 @@ dcwmsg_marshal_sta_ack(struct dcwmsg_sta_ack * const output, const unsigned char - - /* copy in the data ssid string bytes */ - if (buf_len < copy_size) return 0; -- bzero(output->bonded_data_channels[i].ssid, sizeof(output->bonded_data_channels[i].ssid)); -+ memset(output->bonded_data_channels[i].ssid, 0, sizeof(output->bonded_data_channels[i].ssid)); - memcpy(output->bonded_data_channels[i].ssid, buf, copy_size); - buf_len -= copy_size; - buf += copy_size; -@@ -134,7 +130,7 @@ dcwmsg_marshal_ap_accept_sta(struct dcwmsg_ap_accept_sta * const output, const u - - /* copy in the data ssid string bytes */ - if (buf_len < copy_size) return 0; -- bzero(output->data_ssids[i], sizeof(output->data_ssids[i])); -+ memset(output->data_ssids[i], 0, sizeof(output->data_ssids[i])); - memcpy(output->data_ssids[i], buf, copy_size); - buf_len -= copy_size; - buf += copy_size; diff --git a/net/dcwifi/libdcwsocket/patches/01_replace_bzero.patch b/net/dcwifi/libdcwsocket/patches/01_replace_bzero.patch deleted file mode 100644 index 9b799e19a..000000000 --- a/net/dcwifi/libdcwsocket/patches/01_replace_bzero.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/src/dcwsocket.c.linux -+++ b/src/dcwsocket.c.linux -@@ -100,10 +100,10 @@ dcwsock_open(const char * const ifname) { - } - - /* sanitize our data structs... defensive */ -- bzero(rv, sizeof(*rv)); -- bzero(&ifr, sizeof(ifr)); -- bzero(&sall, sizeof(sall)); -- bzero(&sfp, sizeof(sfp)); -+ memset(rv, 0, sizeof(*rv)); -+ memset(&ifr, 0, sizeof(ifr)); -+ memset(&sall, 0, sizeof(sall)); -+ memset(&sfp, 0, sizeof(sfp)); - - /* open a raw socket... "ETH_P_ALL" says take EVERYTHING - (this means that it is IMPERATIVE to apply a filter) -diff --git a/src/dcwsocket.c.osx b/src/dcwsocket.c.osx -index abead10..75cda2f 100644 ---- a/src/dcwsocket.c.osx -+++ b/src/dcwsocket.c.osx -@@ -90,10 +90,10 @@ dcwsock_open(const char * const ifname) { - } - - /* sanitize our data structs... defensive */ -- bzero(rv, sizeof(*rv)); -- bzero(&dmx_desc, sizeof(dmx_desc)); -- bzero(&proto_desc, sizeof(proto_desc)); -- bzero(&snd, sizeof(snd)); -+ memset(rv, 0, sizeof(*rv)); -+ memset(&dmx_desc, 0, sizeof(dmx_desc)); -+ memset(&proto_desc, 0, sizeof(proto_desc)); -+ memset(&snd, 0, sizeof(snd)); - - /* open a "NDRV" socket... */ - rv->fd = socket(PF_NDRV, SOCK_RAW, 0); -@@ -201,7 +201,7 @@ dcwsock_send( dcw_socket_t s, const void * const buf, const unsigned buf_size, c - fill out a link-level sockaddr cause we can only - use sendto() with PF_NDRV... - */ -- bzero(&sdl, sizeof(sdl)); -+ memset(&sdl, 0, sizeof(sdl)); - sdl.sdl_len = sizeof(sdl); - sdl.sdl_index = 0; - sdl.sdl_type = IFT_ETHER; diff --git a/net/dcwifi/mrmctl/patches/01_replace_bzero.patch b/net/dcwifi/mrmctl/patches/01_replace_bzero.patch deleted file mode 100644 index 0f67ab4f1..000000000 --- a/net/dcwifi/mrmctl/patches/01_replace_bzero.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/userland/mrmctl/mrmctl.c -+++ b/userland/mrmctl/mrmctl.c -@@ -139,7 +139,7 @@ remap(int argc, char **argv) { - if (argc < 5) return 1; /* defensive */ - - /* initialize variables and put things into human-readable variable names */ -- bzero(&re, sizeof(re)); -+ memset(&re, 0, sizeof(re)); - filter_name = argv[2]; - match_macaddr = argv[3]; - -diff --git a/userland/mrmfilterparser/mrm_filter_conf_parser.c b/userland/mrmfilterparser/mrm_filter_conf_parser.c -index 926fa76..f5c54c1 100644 ---- a/userland/mrmfilterparser/mrm_filter_conf_parser.c -+++ b/userland/mrmfilterparser/mrm_filter_conf_parser.c -@@ -319,7 +319,7 @@ filter_file_loadf(struct mrm_filter_config * const output, FILE * const f) { - return -1; - - output->rules_active = 0; -- bzero(output->rules, sizeof(output->rules)); /* defensive */ -+ memset(output->rules, 0, sizeof(output->rules)); /* defensive */ - - for (linenum = 1; fgets(buf, sizeof(buf), f) != NULL; linenum++) { - diff --git a/net/dcwifi/mrmctl/Makefile b/net/mrmctl/Makefile similarity index 87% rename from net/dcwifi/mrmctl/Makefile rename to net/mrmctl/Makefile index 4c587abc2..a595cecbe 100644 --- a/net/dcwifi/mrmctl/Makefile +++ b/net/mrmctl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mrmctl -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.1.0 PKG_RELEASE:=1 PKG_SOURCE:=macremapper-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ewsi/macremapper/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f054201dd805ce005b89606a507b58a5717d383a4339c69dfdc02f0202935437 +PKG_HASH:=f9580427803123d13d50f3422623a37212034a5d72a485f9c04904f19509e4bb PKG_BUILD_DIR:=$(BUILD_DIR)/macremapper-$(PKG_VERSION) PKG_MAINTAINER:=Carey Sonsino @@ -26,9 +26,10 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk define Package/mrmctl - SECTION:=utils - CATEGORY:=Utilities - TITLE:=mrmctl utility (macremapper kernel module) + SECTION:=net + CATEGORY:=Network + SUBMENU:=Routing and Redirection + TITLE:=Dual-Channel WiFi macremapper utility URL:=https://www.edgewaterwireless.com DEPENDS:= +kmod-macremapper endef