Merge: Add aarch64 support to nexutil (#530)

* Add aarch64 support to nexutil * Revert changes on types.h, nexutil shouldn't depend on this * Make nexutil no longer depending on types.h * Update interface type when an existing interface is put in monitor mode * Reuse MAC addr for the newly created mon vif - Closes #534
seemoo-lab · Nov 14, 2023 · a80131b · a80131b
1 parent b198f5e
commit a80131b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/patches/driver/brcmfmac_5.15.y-nexmon/cfg80211.c b/patches/driver/brcmfmac_5.15.y-nexmon/cfg80211.c
@@ -1052,6 +1052,11 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
 			  "Adhoc" : "Infra");
 	}
 	ndev->ieee80211_ptr->iftype = type;
+#ifdef NEXMON_MON_IF
+	if(type == NL80211_IFTYPE_MONITOR) {
+		ndev->type = ARPHRD_IEEE80211_RADIOTAP;
+	}
+#endif
 
 	brcmf_cfg80211_update_proto_addr_mode(&vif->wdev);
 

diff --git a/patches/driver/brcmfmac_5.15.y-nexmon/core.c b/patches/driver/brcmfmac_5.15.y-nexmon/core.c
@@ -855,6 +855,7 @@ int brcmf_net_mon_attach(struct brcmf_if *ifp)
 
 	ndev = ifp->ndev;
 	ndev->netdev_ops = &brcmf_netdev_ops_mon;
+	memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
 
 	err = cfg80211_register_netdevice(ndev);
 	if (err)

diff --git a/utilities/libnexio/Makefile b/utilities/libnexio/Makefile
@@ -3,7 +3,7 @@ USE_VENDOR_CMD := 0
 
 all: libs/armeabi/libnexio.a
 
-ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l))
+ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l aarch64))
 libs/armeabi/libnexio.a: Android.mk
 	$(NDK_ROOT)/ndk-build NDK_APPLICATION_MK=`pwd`/Application.mk NDK_APP_OUT=. TARGET_PLATFORM=android-21
 else

diff --git a/utilities/nexutil/Makefile b/utilities/nexutil/Makefile
@@ -1,13 +1,13 @@
 GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
 USE_VENDOR_CMD := 0
 
-ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l))
+ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l aarch64))
 all: libs/armeabi/nexutil
 else
 all: nexutil
 endif
 
-ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l))
+ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l aarch64))
 libs/armeabi/nexutil: Android.mk nexutil.c ../libargp/local/armeabi/libargp.a ../libnexio/local/armeabi/libnexio.a FORCE
 	touch nexutil.c
 	$(NDK_ROOT)/ndk-build NDK_APPLICATION_MK=`pwd`/Application.mk NDK_APP_OUT=. TARGET_PLATFORM=android-21 GIT_VERSION=$(GIT_VERSION)
@@ -29,7 +29,7 @@ endif
 ../libnexio/libnexio.a: FORCE
 	cd ../libnexio && make
 
-ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l))
+ifneq ($(shell uname -m),$(filter $(shell uname -m), armv6l armv7l aarch64))
 install: libs/armeabi/nexutil
 	adb push $< /sdcard/
 	adb shell 'su -c "mount -o rw,remount /system"'

diff --git a/utilities/nexutil/nexutil.c b/utilities/nexutil/nexutil.c
@@ -48,7 +48,6 @@
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 #ifdef BUILD_ON_RPI
-#include <types.h> //not sure why it was removed, but it is needed for typedefs like `uint`
 #include <linux/if.h>
 #else
 #include <net/if.h>
@@ -61,6 +60,8 @@
 
 #include <nexioctls.h>
 
+typedef uint32_t uint;
+
 #include <typedefs.h>
 #include <bcmwifi_channels.h>
 #include <b64.h>

diff --git a/utilities/nexutil/typedefs.h b/utilities/nexutil/typedefs.h
@@ -65,7 +65,7 @@
 
 #endif	/* ! __cplusplus */
 
-#if defined(__x86_64__)
+#if defined(__LP64__)
 #define TYPEDEF_UINTPTR
 typedef unsigned long long int uintptr;
 #endif