1From f6f1396807607f5649d20631db517cfca3a1f5c4 Mon Sep 17 00:00:00 2001 2From: Joseph Benden <joe@benden.us> 3Date: Tue, 7 Jul 2020 11:44:40 -0700 4Subject: [PATCH] Fix duplicated symbols. 5 6Signed-off-by: Joseph Benden <joe@benden.us> 7[Retrieved from: 8https://github.com/aircrack-ng/aircrack-ng/commit/f6f1396807607f5649d20631db517cfca3a1f5c4] 9Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 10--- 11 src/airodump-ng/airodump-ng.c | 2 -- 12 src/airventriloquist-ng/airventriloquist-ng.c | 6 +++--- 13 src/tkiptun-ng/tkiptun-ng.c | 4 ++-- 14 3 files changed, 5 insertions(+), 7 deletions(-) 15 16diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c 17index 3ae6994dd..e72bc88e2 100644 18--- a/src/airodump-ng/airodump-ng.c 19+++ b/src/airodump-ng/airodump-ng.c 20@@ -92,8 +92,6 @@ 21 #include "radiotap/radiotap_iter.h" 22 23 struct devices dev; 24-uint8_t h80211[4096] __attribute__((aligned(16))); 25-uint8_t tmpbuf[4096] __attribute__((aligned(16))); 26 27 static const unsigned char llcnull[] = {0, 0, 0, 0}; 28 29diff --git a/src/airventriloquist-ng/airventriloquist-ng.c b/src/airventriloquist-ng/airventriloquist-ng.c 30index ac6b7647e..267d95540 100644 31--- a/src/airventriloquist-ng/airventriloquist-ng.c 32+++ b/src/airventriloquist-ng/airventriloquist-ng.c 33@@ -173,7 +173,7 @@ static struct local_options 34 } lopt; 35 36 struct devices dev; 37-struct wif *_wi_in, *_wi_out; 38+extern struct wif *_wi_in, *_wi_out; 39 40 struct ARP_req 41 { 42@@ -195,8 +195,8 @@ struct APt 43 }; 44 45 unsigned long nb_pkt_sent; 46-u_int8_t h80211[4096]; 47-static u_int8_t tmpbuf[4096]; 48+extern u_int8_t h80211[4096]; 49+extern u_int8_t tmpbuf[4096]; 50 51 static int tcp_test(const char * ip_str, const short port) 52 { 53diff --git a/src/tkiptun-ng/tkiptun-ng.c b/src/tkiptun-ng/tkiptun-ng.c 54index dc67f5d58..43db0bc23 100644 55--- a/src/tkiptun-ng/tkiptun-ng.c 56+++ b/src/tkiptun-ng/tkiptun-ng.c 57@@ -267,7 +267,7 @@ static struct local_options 58 59 // unused, but needed for link 60 struct devices dev; 61-struct wif *_wi_in, *_wi_out; 62+extern struct wif *_wi_in, *_wi_out; 63 64 struct ARP_req 65 { 66@@ -289,7 +289,7 @@ struct APt 67 }; 68 69 unsigned long nb_pkt_sent; 70-unsigned char h80211[4096]; 71+extern unsigned char h80211[4096]; 72 static unsigned char srcbuf[4096]; 73 static char strbuf[512]; 74 static int alarmed; 75