diff options
| author | Larry Hynes <larry@larryhynes.com> | 2016-05-13 19:45:03 +0100 |
|---|---|---|
| committer | Larry Hynes <larry@larryhynes.com> | 2016-05-13 19:45:03 +0100 |
| commit | 96b4bd69ef1e5e30cb0d1ffad2617b2c7bfd629d (patch) | |
| tree | 2179566b59a65ae27500c2e4e9dcae7149d60486 /src/libserver/cfg_rcl.c | |
| parent | 5559a4a7b7ff358545a434434a94c3b9e82e0976 (diff) | |
| parent | 25b777b360662a391454f64346589dbec792831f (diff) | |
| download | rspamd-96b4bd69ef1e5e30cb0d1ffad2617b2c7bfd629d.tar.gz rspamd-96b4bd69ef1e5e30cb0d1ffad2617b2c7bfd629d.zip | |
Merge remote-tracking branch 'upstream/master'
* upstream/master: (36 commits)
[Feature] Add versions to fuzzy storage
[Fix] Another fix for maps scheduling
[Fix] Fix events handling when scheduling map wacth
[Fix] Try to fix false positive URL detections in text parts
[Fix] Include fuzzy key to distinguish storages with different keys
[Feature] Rework and improve fuzzy storage
[Test] Add static test for shingles
[Minor] Adjust hashes
[Feature] Use metrohash as well
[Minor] 8 bytes fits perfect for mumhash
[Fix] Fix handling of the same words
[Feature] Further micro-optimizations for hashing and shingles
[Feature] Optimize alignment to speed up hashing
[Feature] Try to select the optimal possible function for input
[Feature] Limit logging of elements that could have too many items
[Feature] Add more algorithms for shingles generation
[Fix] Fix compilation issue
[Feature] Use mumhash for words hashing
[Feature] Add and use mumhash for non-crypto hashing
[Feature] Add a simple script to evaluate rspamd rules in the logs
...
Diffstat (limited to 'src/libserver/cfg_rcl.c')
| -rw-r--r-- | src/libserver/cfg_rcl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index b90c1116b..f774ac126 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -1894,7 +1894,7 @@ rspamd_rcl_config_init (struct rspamd_config *cfg) "Limit of files count in `cores_dir`"); rspamd_rcl_add_default_handler (sub, "local_addrs", - rspamd_rcl_parse_struct_string, + rspamd_rcl_parse_struct_ucl, G_STRUCT_OFFSET (struct rspamd_config, local_addrs), 0, "Use the specified addresses as local ones"); @@ -2976,13 +2976,13 @@ static guint rspamd_worker_param_key_hash (gconstpointer p) { const struct rspamd_worker_param_key *k = p; - XXH64_state_t st; + rspamd_cryptobox_fast_hash_state_t st; - XXH64_reset (&st, rspamd_hash_seed ()); - XXH64_update (&st, k->name, strlen (k->name)); - XXH64_update (&st, &k->ptr, sizeof (gpointer)); + rspamd_cryptobox_fast_hash_init (&st, rspamd_hash_seed ()); + rspamd_cryptobox_fast_hash_update (&st, k->name, strlen (k->name)); + rspamd_cryptobox_fast_hash_update (&st, &k->ptr, sizeof (gpointer)); - return XXH64_digest (&st); + return rspamd_cryptobox_fast_hash_final (&st); } static gboolean |