RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-11 22:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: WURFL: removes heading wurfl-information-separator from wurfl-get-all() and wurfl-get() results

Browse Source
This commit is contained in:
mbellomi 2019-05-21 16:29:22 +02:00 committed by Willy Tarreau
parent 4304e30af1
commit e9fedf560a
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wurfl.c
View File

@ -442,7 +442,6 @@ static int ha_wurfl_get_all(const struct arg *args, struct sample *smp, const ch
chunk_reset(temp); chunk_reset(temp);
list_for_each_entry(wi, &global_wurfl.information_list, list) { list_for_each_entry(wi, &global_wurfl.information_list, list) {
chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
switch(wi->data.type) { switch(wi->data.type) {
case HA_WURFL_DATA_TYPE_UNKNOWN : case HA_WURFL_DATA_TYPE_UNKNOWN :
@ -478,11 +477,20 @@ static int ha_wurfl_get_all(const struct arg *args, struct sample *smp, const ch
break; break;
} }
// append wurfl-information-list-separator
chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
} }
wurfl_device_destroy(dHandle); wurfl_device_destroy(dHandle);
smp->data.u.str.area = temp->area; smp->data.u.str.area = temp->area;
smp->data.u.str.data = temp->data; smp->data.u.str.data = temp->data;
// remove trailing wurfl-information-list-separator
if (temp->data) {
temp->area[temp->data] = '\0';
--smp->data.u.str.data;
}
return 1; return 1;
} }
@ -508,7 +516,6 @@ static int ha_wurfl_get(const struct arg *args, struct sample *smp, const char *
chunk_reset(temp); chunk_reset(temp);
while (args[i].data.str.area) { while (args[i].data.str.area) {
chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
node = ebst_lookup(&global_wurfl.btree, args[i].data.str.area); node = ebst_lookup(&global_wurfl.btree, args[i].data.str.area);
if (node) { if (node) {
@ -549,6 +556,9 @@ static int ha_wurfl_get(const struct arg *args, struct sample *smp, const char *
break; break;
} }
// append wurfl-information-list-separator
chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
} else { } else {
ha_wurfl_log("WURFL: %s not in wurfl-information-list \n", ha_wurfl_log("WURFL: %s not in wurfl-information-list \n",
args[i].data.str.area); args[i].data.str.area);
@ -560,6 +570,13 @@ static int ha_wurfl_get(const struct arg *args, struct sample *smp, const char *
wurfl_device_destroy(dHandle); wurfl_device_destroy(dHandle);
smp->data.u.str.area = temp->area; smp->data.u.str.area = temp->area;
smp->data.u.str.data = temp->data; smp->data.u.str.data = temp->data;
// remove trailing wurfl-information-list-separator
if (temp->data) {
temp->area[temp->data] = '\0';
--smp->data.u.str.data;
}
return 1; return 1;
} }