mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: 51degrees: Adapt the 51Degrees library

Browse Source 
I can't test this patch because the avalaible 51degrees library is
"51Degrees-C-3.1.5.2" and HAProxy obviously build with another version
(some defines and symbols disappear).

This patch is provided as-is in best effort.
This commit is contained in:
Thierry FOURNIER 2015-08-20 13:42:12 +02:00 committed by Willy Tarreau
parent 136f9d34a9
commit 2046c46468
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/51d.c
View File

@ -134,12 +134,12 @@ static int _51d_conv(const struct arg *args, struct sample *smp, void *private)
if (_51d_lru_tree) { if (_51d_lru_tree) {
unsigned long long seed = _51d_lru_seed ^ (long)args; unsigned long long seed = _51d_lru_seed ^ (long)args;
lru = lru64_get(XXH64(smp->data.str.str, smp->data.str.len, seed), lru = lru64_get(XXH64(smp->data.u.str.str, smp->data.u.str.len, seed),
_51d_lru_tree, global._51degrees.data_file_path, 0); _51d_lru_tree, global._51degrees.data_file_path, 0);
if (lru && lru->domain) { if (lru && lru->domain) {
smp->flags |= SMP_F_CONST; smp->flags |= SMP_F_CONST;
smp->data.str.str = lru->data; smp->data.u.str.str = lru->data;
smp->data.str.len = strlen(smp->data.str.str); smp->data.u.str.len = strlen(smp->data.u.str.str);
return 1; return 1;
} }
} }
@ -155,14 +155,14 @@ static int _51d_conv(const struct arg *args, struct sample *smp, void *private)
if (!smp_dup(smp)) if (!smp_dup(smp))
return 0; return 0;
smp->data.str.str[smp->data.str.len] = '\0'; smp->data.u.str.str[smp->data.u.str.len] = '\0';
/* Perform detection. */ /* Perform detection. */
#ifdef FIFTYONEDEGREES_H_PATTERN_INCLUDED #ifdef FIFTYONEDEGREES_H_PATTERN_INCLUDED
fiftyoneDegreesMatch(ws, smp->data.str.str); fiftyoneDegreesMatch(ws, smp->data.u.str.str);
#endif #endif
#ifdef FIFTYONEDEGREES_H_TRIE_INCLUDED #ifdef FIFTYONEDEGREES_H_TRIE_INCLUDED
device_offset = fiftyoneDegreesGetDeviceOffset(smp->data.str.str); device_offset = fiftyoneDegreesGetDeviceOffset(smp->data.u.str.str);
#endif #endif
i = 0; i = 0;
@ -205,8 +205,8 @@ static int _51d_conv(const struct arg *args, struct sample *smp, void *private)
temp->str[temp->len] = '\0'; temp->str[temp->len] = '\0';
} }
smp->data.str.str = temp->str; smp->data.u.str.str = temp->str;
smp->data.str.len = strlen(smp->data.str.str); smp->data.u.str.len = strlen(smp->data.u.str.str);
#ifdef FIFTYONEDEGREES_H_PATTERN_INCLUDED #ifdef FIFTYONEDEGREES_H_PATTERN_INCLUDED
fiftyoneDegreesFreeWorkset(ws); fiftyoneDegreesFreeWorkset(ws);
@ -214,7 +214,7 @@ static int _51d_conv(const struct arg *args, struct sample *smp, void *private)
if (lru) { if (lru) {
smp->flags |= SMP_F_CONST; smp->flags |= SMP_F_CONST;
lru64_commit(lru, strdup(smp->data.str.str), global._51degrees.data_file_path, 0, free); lru64_commit(lru, strdup(smp->data.u.str.str), global._51degrees.data_file_path, 0, free);
} }
return 1; return 1;