1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
From 37bc38a1749f61f3e54dbebca7b33df844b6de82 Mon Sep 17 00:00:00 2001
From: Andras Gemes <andrasgemes@outlook.com>
Date: Fri, 20 Jan 2023 14:53:59 +0100
Subject: [PATCH 2/9] airodump-ng: add PCRE2 support
---
src/airodump-ng/airodump-ng.c | 75 +++++++++++++++++++++++++++++++----
1 file changed, 67 insertions(+), 8 deletions(-)
--- a/src/airodump-ng/airodump-ng.c
+++ b/src/airodump-ng/airodump-ng.c
@@ -68,7 +68,10 @@
#include <sys/wait.h>
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
+#elif defined HAVE_PCRE
#include <pcre.h>
#endif
@@ -150,7 +153,10 @@ static struct local_options
unsigned char prev_bssid[6];
char ** f_essid;
int f_essid_count;
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+ pcre2_code * f_essid_regex;
+ pcre2_match_data * f_essid_match_data;
+#elif defined HAVE_PCRE
pcre * f_essid_regex;
#endif
char * dump_prefix;
@@ -784,7 +790,7 @@ static const char usage[] =
" --netmask <netmask> : Filter APs by mask\n"
" --bssid <bssid> : Filter APs by BSSID\n"
" --essid <essid> : Filter APs by ESSID\n"
-#ifdef HAVE_PCRE
+#if defined HAVE_PCRE2 || defined HAVE_PCRE
" --essid-regex <regex> : Filter APs by ESSID using a regular\n"
" expression\n"
#endif
@@ -857,7 +863,22 @@ int is_filtered_essid(const uint8_t * es
ret = 1;
}
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+ if (lopt.f_essid_regex)
+ {
+ lopt.f_essid_match_data
+ = pcre2_match_data_create_from_pattern(lopt.f_essid_regex, NULL);
+
+ return pcre2_match(lopt.f_essid_regex,
+ (PCRE2_SPTR) essid,
+ (int) strnlen((char *) essid, ESSID_LENGTH),
+ 0,
+ 0,
+ lopt.f_essid_match_data,
+ 0)
+ < 0;
+ }
+#elif defined HAVE_PCRE
if (lopt.f_essid_regex)
{
return pcre_exec(lopt.f_essid_regex,
@@ -5782,7 +5803,10 @@ int main(int argc, char * argv[])
int wi_read_failed = 0;
int n = 0;
int output_format_first_time = 1;
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+ int pcreerror;
+ PCRE2_SIZE pcreerroffset;
+#elif defined HAVE_PCRE
const char * pcreerror;
int pcreerroffset;
#endif
@@ -5938,7 +5962,9 @@ int main(int argc, char * argv[])
#ifdef CONFIG_LIBNL
lopt.htval = CHANNEL_NO_HT;
#endif
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+ lopt.f_essid_regex = NULL;
+#elif defined HAVE_PCRE
lopt.f_essid_regex = NULL;
#endif
@@ -6359,7 +6385,34 @@ int main(int argc, char * argv[])
case 'R':
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+ if (lopt.f_essid_regex != NULL)
+ {
+ printf("Error: ESSID regular expression already given. "
+ "Aborting\n");
+ exit(EXIT_FAILURE);
+ }
+
+ lopt.f_essid_regex = pcre2_compile((PCRE2_SPTR) optarg,
+ PCRE2_ZERO_TERMINATED,
+ 0,
+ &pcreerror,
+ &pcreerroffset,
+ NULL);
+
+ if (lopt.f_essid_regex == NULL)
+ {
+ PCRE2_UCHAR pcreerrbuffer[256];
+ pcre2_get_error_message(
+ pcreerror, pcreerrbuffer, sizeof(pcreerrbuffer));
+
+ printf("Error: regular expression compilation failed at "
+ "offset %lu: %s; aborting\n",
+ pcreerroffset,
+ pcreerrbuffer);
+ exit(EXIT_FAILURE);
+ }
+#elif defined HAVE_PCRE
if (lopt.f_essid_regex != NULL)
{
printf("Error: ESSID regular expression already given. "
@@ -7297,7 +7350,13 @@ int main(int argc, char * argv[])
if (lopt.keyout) free(lopt.keyout);
-#ifdef HAVE_PCRE
+#ifdef HAVE_PCRE2
+ if (lopt.f_essid_regex)
+ {
+ pcre2_match_data_free(lopt.f_essid_match_data);
+ pcre2_code_free(lopt.f_essid_regex);
+ }
+#elif defined HAVE_PCRE
if (lopt.f_essid_regex) pcre_free(lopt.f_essid_regex);
#endif
|