BUILD/MAJOR:updated 51d Trie implementation to incorperate latest update to 51Degrees.c

Trie now uses a dataset structure just like Pattern, so this has been
defined in includes/types/global.h for both Pattern and Trie where it
was just Pattern.
In src/51d.c all functions used by the Trie implementation which need a
dataset as an argument now use the global dataset. The
fiftyoneDegreesDestroy method has now been replaced with
fiftyoneDegreesDataSetFree which is common to Pattern and Trie. In
addition, two extra dataset init status' have been added to the switch
statement in init_51degrees.
This commit is contained in:
ben51degrees
2016-07-06 12:07:21 +01:00
committed by Willy Tarreau
parent 17494bc695
commit 1f077ebff2
2 changed files with 18 additions and 16 deletions

View File

@@ -197,8 +197,8 @@ struct global {
char *data_file_path;
int header_count; /* number of HTTP headers related to device detection. */
struct chunk *header_names; /* array of HTTP header names. */
fiftyoneDegreesDataSet data_set; /* data set used with the pattern and trie detection methods. */
#ifdef FIFTYONEDEGREES_H_PATTERN_INCLUDED
fiftyoneDegreesDataSet data_set; /* data set used with the pattern detection method. */
fiftyoneDegreesWorksetPool *pool; /* pool of worksets to avoid creating a new one for each request. */
#endif
#ifdef FIFTYONEDEGREES_H_TRIE_INCLUDED