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