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
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
/*-
* Copyright 2016 Vsevolod Stakhov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "config.h"
#include "rspamd.h"
#include "radix.h"
#include "ottery.h"
const gsize max_elts = 50 * 1024;
const gint lookup_cycles = 1 * 1024;
const uint masks[] = {
8,
16,
24,
32,
27,
29,
19,
13,
22
};
struct _tv {
const char *ip;
const char *nip;
const char *m;
guint32 mask;
guint8 *addr;
guint8 *naddr;
gsize len;
} test_vec[] = {
{"192.168.1.1", "192.168.1.2", "32", 0, 0, 0, 0},
{"192.168.1.0", "192.168.2.1", "24", 0, 0, 0, 0},
{"192.0.0.0", "193.167.2.1", "8", 0, 0, 0, 0},
{"172.0.0.0", "171.16.1.0", "8", 0, 0, 0, 0},
{"172.16.0.1", "127.0.0.1", "16", 0, 0, 0, 0},
{"172.17.1.0", "10.0.0.1", "27", 0, 0, 0, 0},
{"172.17.1.1", "0.0.0.1", "32", 0, 0, 0, 0},
/* Some bad data known to cause problem in the past */
{"191.245.170.246", NULL, "19", 0, 0, 0, 0},
{"227.88.150.170", NULL, "23", 0, 0, 0, 0},
{"105.225.182.92", NULL, "24", 0, 0, 0, 0},
{"223.167.155.240", NULL, "29", 0, 0, 0, 0},
{"125.241.220.172", NULL, "2", 0, 0, 0, 0},
/* Mask = 0 */
{"143.105.181.13", NULL, "8", 0, 0, 0, 0},
{"113.241.233.86", NULL, "26", 0, 0, 0, 0},
{"185.187.122.222", NULL, "8", 0, 0, 0, 0},
{"109.206.26.202", NULL, "12", 0, 0, 0, 0},
{"130.244.233.150", NULL, "0", 0, 0, 0, 0},
/* Close ip addresses */
{"1.2.3.1", NULL, "32", 0, 0, 0, 0},
{"1.2.3.2", NULL, "32", 0, 0, 0, 0},
{"1.2.3.3", NULL, "32", 0, 0, 0, 0},
{"1.2.3.4", NULL, "32", 0, 0, 0, 0},
{NULL, NULL, NULL, 0, 0, 0, 0}
};
static void
rspamd_radix_text_vec (void)
{
radix_compressed_t *tree = radix_create_compressed ();
struct _tv *t = &test_vec[0];
struct in_addr ina;
struct in6_addr in6a;
gulong i, val;
while (t->ip != NULL) {
t->addr = g_malloc (sizeof (in6a));
t->naddr = g_malloc (sizeof (in6a));
if (inet_pton (AF_INET, t->ip, &ina) == 1) {
memcpy (t->addr, &ina, sizeof (ina));
t->len = sizeof (ina);
}
else if (inet_pton (AF_INET6, t->ip, &in6a) == 1) {
memcpy (t->addr, &in6a, sizeof (in6a));
t->len = sizeof (in6a);
}
else {
g_assert (0);
}
if (t->nip) {
if (inet_pton (AF_INET, t->nip, &ina) == 1) {
memcpy (t->naddr, &ina, sizeof (ina));
}
else if (inet_pton (AF_INET6, t->nip, &in6a) == 1) {
memcpy (t->naddr, &in6a, sizeof (in6a));
}
else {
g_assert (0);
}
}
t->mask = t->len * NBBY - strtoul (t->m, NULL, 10);
t ++;
}
t = &test_vec[0];
i = 0;
while (t->ip != NULL) {
radix_insert_compressed (tree, t->addr, t->len, t->mask, ++i);
t ++;
}
i = 0;
t = &test_vec[0];
while (t->ip != NULL) {
val = radix_find_compressed (tree, t->addr, t->len);
g_assert (val == ++i);
//g_assert (val != RADIX_NO_VALUE);
if (t->nip != NULL) {
val = radix_find_compressed (tree, t->naddr, t->len);
g_assert (val != i);
}
t ++;
}
radix_destroy_compressed (tree);
}
void
rspamd_radix_test_func (void)
{
#if 0
radix_tree_t *tree = radix_tree_create ();
#endif
radix_compressed_t *comp_tree = radix_create_compressed ();
struct {
guint32 addr;
guint32 mask;
guint8 addr6[16];
guint32 mask6;
} *addrs;
gsize nelts, i;
gint lc;
gboolean all_good = TRUE;
gdouble ts1, ts2;
double diff;
/* Test suite for the compressed trie */
rspamd_radix_text_vec ();
nelts = max_elts;
/* First of all we generate many elements and push them to the array */
addrs = g_malloc (nelts * sizeof (addrs[0]));
for (i = 0; i < nelts; i ++) {
addrs[i].addr = ottery_rand_uint32 ();
addrs[i].mask = masks[ottery_rand_range(G_N_ELEMENTS (masks) - 1)];
ottery_rand_bytes (addrs[i].addr6, sizeof(addrs[i].addr6));
addrs[i].mask6 = ottery_rand_range(128);
}
#if 0
msg_info ("old radix performance (%z elts)", nelts);
ts1 = rspamd_get_ticks ();
for (i = 0; i < nelts; i ++) {
guint32 mask = G_MAXUINT32 << (32 - addrs[i].mask);
radix32tree_insert (tree, addrs[i].addr, mask, 1);
}
ts2 = rspamd_get_ticks ();
diff = (ts2 - ts1) * 1000.0;
msg_info ("Added %z elements in %.6f ms", nelts, diff);
ts1 = rspamd_get_ticks ();
for (lc = 0; lc < lookup_cycles; lc ++) {
for (i = 0; i < nelts; i ++) {
g_assert (radix32tree_find (tree, addrs[i].addr) != RADIX_NO_VALUE);
}
}
ts2 = rspamd_get_ticks ();
diff = (ts2 - ts1) * 1000.0;
msg_info ("Checked %z elements in %.6f ms", nelts, diff);
ts1 = rspamd_get_ticks ();
for (i = 0; i < nelts; i ++) {
radix32tree_delete (tree, addrs[i].addr, addrs[i].mask);
}
ts2 = rspamd_get_ticks ();
diff = (ts2 - ts1) * 1000.;
msg_info ("Deleted %z elements in %.6f ms", nelts, diff);
radix_tree_free (tree);
#endif
msg_info ("new radix performance (%z elts)", nelts);
ts1 = rspamd_get_ticks ();
for (i = 0; i < nelts; i ++) {
radix_insert_compressed (comp_tree, addrs[i].addr6, sizeof (addrs[i].addr6),
128 - addrs[i].mask6, i);
}
ts2 = rspamd_get_ticks ();
diff = (ts2 - ts1) * 1000.0;
msg_info ("Added %z elements in %.6f ms", nelts, diff);
ts1 = rspamd_get_ticks ();
for (lc = 0; lc < lookup_cycles; lc ++) {
for (i = 0; i < nelts; i ++) {
if (radix_find_compressed (comp_tree, addrs[i].addr6, sizeof (addrs[i].addr6))
== RADIX_NO_VALUE) {
all_good = FALSE;
}
}
}
#if 1
if (!all_good) {
for (i = 0; i < nelts; i ++) {
/* Used to write bad random vector */
char ipbuf[INET6_ADDRSTRLEN + 1];
inet_ntop(AF_INET6, addrs[i].addr6, ipbuf, sizeof(ipbuf));
msg_info("{\"%s\", NULL, \"%ud\", 0, 0, 0, 0},",
ipbuf,
addrs[i].mask6);
}
}
#endif
g_assert (all_good);
ts2 = rspamd_get_ticks ();
diff = (ts2 - ts1) * 1000.0;
msg_info ("Checked %z elements in %.6f ms", nelts, diff);
radix_destroy_compressed (comp_tree);
g_free (addrs);
}
|
