sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: core: be prepared to get Via received param with brackets around ipv6 addr

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b7bc7a5450b1e31697fb389a503463eac644b796 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7bc7a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 17:31:34 2014 +0200 core: be prepared to get Via received param with brackets around ipv6 addr - helper function to generate similar value --- config.h | 2 +- ip_addr.h | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/config.h b/config.h index 687e6a6..a240f7b 100644 --- a/config.h +++ b/config.h @@ -166,7 +166,7 @@ #define BUF_SIZE 65535 #define MAX_VIA_LINE_SIZE 240 /*!< forwarding -- Via buffer dimensioning */ -#define MAX_RECEIVED_SIZE 57 /*!< forwarding -- Via buffer dimensioning - Received header */ +#define MAX_RECEIVED_SIZE 59 /*!< forwarding -- Via buffer dimensioning - Received header */ #define MAX_RPORT_SIZE 13 /*!< forwarding -- Via buffer dimensioning - Rport */ #define MAX_BRANCHES 12 /*!< maximum number of branches per transaction */ diff --git a/ip_addr.h b/ip_addr.h index 4efb3bc..3cdecc6 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -692,7 +692,27 @@ static inline char* ip_addr2a(struct ip_addr* ip) return buff; } +/* full address in text representation, including [] for ipv6 */ +static inline char* ip_addr2strz(struct ip_addr* ip) +{ + + static char buff[IP_ADDR_MAX_STR_SIZE+2]; + char *p; + int len; + + p = buff; + if(ip->af==AF_INET6) { + *p++ = '['; + } + len=ip_addr2sbuf(ip, p, sizeof(buff)-3); + p += len; + if(ip->af==AF_INET6) { + *p++ = ']'; + } + *p=0; + return buff; +} #define SU2A_MAX_STR_SIZE (IP6_MAX_STR_SIZE + 2 /* [] */+\ 1 /* : */ + USHORT2SBUF_MAX_LEN + 1 /* \0 */)

9 years, 6 months

git:master: core: more verbose log message for failing to find local socket

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f50c1e9fab16fb611f7bbc6002f4c8607bc8fbf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f50c1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 16:47:35 2014 +0200 core: more verbose log message for failing to find local socket --- forward.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index 849325f..b7bf23b 100644 --- a/forward.c +++ b/forward.c @@ -218,6 +218,8 @@ retry: return si; error: LOG(L_ERR, "ERROR: get_out_socket: no socket found\n"); + ERR("no corresponding socket found for(%s:%s)\n", + proto2a(proto), su2a(to, sizeof(*to))); if (unlikely(mhomed_sock_cache_disabled && *temp_sock >=0)){ close(*temp_sock); *temp_sock=-1;

9 years, 6 months

git:master: tm: more verbose debug when failing to find socket for forwarding

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 51f5826732bbbb2af394c0b0a75db2a310f57b18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51f5826… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 16:34:02 2014 +0200 tm: more verbose debug when failing to find socket for forwarding --- modules/tm/ut.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tm/ut.h b/modules/tm/ut.h index 0b1c5f6..ea98a8f 100644 --- a/modules/tm/ut.h +++ b/modules/tm/ut.h @@ -340,7 +340,9 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, dst->send_sock = get_send_socket2(force_send_socket, &dst->to, dst->proto, 0); if (dst->send_sock==0) { - ERR("no corresponding socket for af %d\n", dst->to.s.sa_family); + ERR("no corresponding socket found for \"%.*s\" af %d (%s:%s)\n", + host->len, ZSW(host->s), dst->to.s.sa_family, + proto2a(dst->proto), su2a(&dst->to, sizeof(dst->to))); /* ser_error = E_NO_SOCKET;*/ /* try to continue */ }

9 years, 6 months

RFC: updating default values

by Daniel-Constantin Mierla

Hello, I am opening this discussion to decide if there is need to adjust some of the default values we have in Kamailio. Many of them were set even like 10 years ago, so they might not be very actual anymore. The main goal is to get the best possible settings for common usage. To start with, here are some values that should be reviewed: - default private memory is 4MB - if the config is not that small, it might not be sufficient free pkg to play with (e.g., for sql_query() result, storage of $var(...) values). Should it be increased to 8MB or other value? Debian/Centos have startup script that sets its value to 8 via command line - default shared memory is 32MB - for a decent deployment with tm, location, lcr/dispatcher, permissions, and anti-flood, it might leave not much free space. Should we double it or set to a different value - usrloc - db_ops_ruid should enabled (1) - seems stable, without it there are problems updating/deleting location records when UA changes the call-id for same contact address. - usrloc - hash_size - now is 9, which results in 512 slots, meaning is ok for few thousands of registered users, for more, performance will decrease when doing save/lookup location -- should it be made 10 (1024 slots for internal hash table)? - auth_db - load_credentials defaults to 'rpid', meaning that the query to get the password will retrieve also the rpid column. I haven't see rpid being used that much lately (replaced by PAI/PPI). I would make this parameter empty by default to avoid querying for an extra column that is likely to be empty. Perhaps there are more, I just wanted to get started. Reply with your comments to above list as well as add new items you thinks their default values should be adjusted. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

9 years, 6 months

git:master: mohqueue: fixed db_qtable parameter name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 321575dcd18e42fe6c62942ef417dd8acf7f466d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=321575d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 10:18:11 2014 +0200 mohqueue: fixed db_qtable parameter name - reported by Marino Mileti --- modules/mohqueue/mohq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/mohqueue/mohq.c b/modules/mohqueue/mohq.c index 30c0c94..0a16606 100644 --- a/modules/mohqueue/mohq.c +++ b/modules/mohqueue/mohq.c @@ -70,7 +70,7 @@ int moh_maxcalls = 50; static param_export_t mod_parms [] = { { "db_url", PARAM_STR, &db_url }, { "db_ctable", PARAM_STR, &db_ctable }, - { "db_ctable", PARAM_STR, &db_qtable }, + { "db_qtable", PARAM_STR, &db_qtable }, { "mohdir", PARAM_STRING, &mohdir }, { "moh_maxcalls", INT_PARAM, &moh_maxcalls }, { NULL, 0, NULL },

9 years, 6 months

git:master: test/unit: updates to auth parameter in unit 7 cfg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4f8f45bdcb7c4c82192bd8d0f7c8d2166dd75dac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f8f45b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 12:16:15 2014 +0200 test/unit: updates to auth parameter in unit 7 cfg --- test/unit/7.cfg | 8 ++++---- test/unit/7.sh | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/unit/7.cfg b/test/unit/7.cfg index cf62c82..ab8ddfe 100644 --- a/test/unit/7.cfg +++ b/test/unit/7.cfg @@ -544,11 +544,11 @@ route[10] route[11] { sl_send_reply("100", "Trying"); - if(!www_authorize("", "subscriber")) + if(!www_authorize("$td", "subscriber")) { xlog("L_INFO", "Register authentication failed - M=$rm RURI=$ru F=$fu T=$tu IP=$si ID=$ci\n"); - www_challenge("", "0"); + www_challenge("$td", "0"); exit; } if(!check_to()) @@ -692,11 +692,11 @@ route[13] } else { - if(!proxy_authorize("", "subscriber")) + if(!proxy_authorize("$fd", "subscriber")) { xlog("L_INFO", "Proxy authentication failed - M=$rm RURI=$ru F=$fu T=$tu IP=$si ID=$ci\n"); - proxy_challenge("", "0"); + proxy_challenge("$fd", "0"); exit; } if(!check_from()) diff --git a/test/unit/7.sh b/test/unit/7.sh index b4dab07..5aaf636 100755 --- a/test/unit/7.sh +++ b/test/unit/7.sh @@ -33,8 +33,7 @@ if ! (check_kamailio); then fi ; # start -$BIN -w . -f $CFG -a no -E -e -dd -#> /dev/null +$BIN -a no -w . -f $CFG > /dev/null ret=$? sleep 1

9 years, 6 months

git:master: test/unit: updates to unit 7

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 73fef4d500e58600758ac1c2b4eadf66d4b506a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73fef4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 11:55:59 2014 +0200 test/unit: updates to unit 7 --- test/unit/7.cfg | 85 ++++++++++++++++++------------------------------------- test/unit/7.sh | 5 ++- 2 files changed, 31 insertions(+), 59 deletions(-) diff --git a/test/unit/7.cfg b/test/unit/7.cfg index f27b575..cf62c82 100644 --- a/test/unit/7.cfg +++ b/test/unit/7.cfg @@ -31,10 +31,6 @@ # You have to insert all locally served domains (i.e. # "kamailioctl domain add your.domain.com"). # -# nat-mediaproxy: -# You have to install mediaproxy -# (http://mediaproxy.ag-projects.com/) for relaying RTP traffic. -# # usr-preferences: # This feature relies on UUID-based provisioning. Thus, you have # to add the uuid-column to the subscriber table ("alter table @@ -104,9 +100,9 @@ ######################################################################## listen = udp:127.0.0.1:5060 -mpath = "../modules" +mpath = "../../modules" children = 8 -debug = 3 +debug = 2 fork = yes disable_tcp = no log_facility = LOG_DAEMON @@ -124,6 +120,8 @@ dns_try_ipv6 = yes dns_use_search_list = yes loadmodule "pv/pv.so" +loadmodule "corex/corex.so" +loadmodule "kex/kex.so" loadmodule "usrloc/usrloc.so" modparam("usrloc", "user_column", "username") @@ -179,24 +177,22 @@ modparam("mi_fifo", "reply_indent", "\t") loadmodule "domain/domain.so" modparam("domain", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") -modparam("domain", "db_mode", 1) modparam("domain", "domain_table", "domain") modparam("domain", "domain_col", "domain") loadmodule "nathelper/nathelper.so" modparam("nathelper", "natping_interval", 0) modparam("nathelper", "ping_nated_only", 1) -modparam("nathelper", "rtpproxy_sock", "unix:/var/run/rtpproxy.sock") -modparam("nathelper", "rtpproxy_disable_tout", 60) -modparam("nathelper", "rtpproxy_tout", 1) -modparam("nathelper", "rtpproxy_retr", 5) modparam("nathelper", "sipping_method", "OPTIONS") modparam("nathelper", "received_avp", "$avp(i:801)") -loadmodule "textops/textops.so" +loadmodule "rtpproxy/rtpproxy.so" +modparam("rtpproxy", "rtpproxy_sock", "unix:/var/run/rtpproxy.sock") +modparam("rtpproxy", "rtpproxy_disable_tout", 60) +modparam("rtpproxy", "rtpproxy_tout", 1) +modparam("rtpproxy", "rtpproxy_retr", 5) -loadmodule "mediaproxy/mediaproxy.so" -modparam("mediaproxy", "mediaproxy_socket", "/var/run/proxydispatcher.sock") +loadmodule "textops/textops.so" loadmodule "siputils/siputils.so" @@ -216,7 +212,7 @@ modparam("registrar", "path_use_received", 0) modparam("registrar", "received_avp", "$avp(i:801)") loadmodule "sl/sl.so" -modparam("sl", "enable_stats", 1) +modparam("sl", "bind_tm", 1) loadmodule "db_mysql/db_mysql.so" modparam("db_mysql", "ping_interval", 300) @@ -224,8 +220,6 @@ modparam("db_mysql", "auto_reconnect", 1) loadmodule "auth/auth.so" modparam("auth", "nonce_expire", 300) -modparam("auth", "rpid_suffix", ";party=calling;id-type=subscriber;screen=yes") -modparam("auth", "rpid_avp", "$avp(s:rpid)") loadmodule "auth_db/auth_db.so" modparam("auth_db", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") @@ -274,25 +268,9 @@ modparam("permissions", "peer_tag_avp", "$avp(s:peer_uuid)") loadmodule "lcr/lcr.so" modparam("lcr", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") -modparam("lcr", "gw_table", "gw") -modparam("lcr", "gw_name_column", "gw_name") -modparam("lcr", "ip_addr_column", "ip_addr") -modparam("lcr", "port_column", "port") -modparam("lcr", "uri_scheme_column", "uri_scheme") -modparam("lcr", "transport_column", "transport") -modparam("lcr", "grp_id_column", "grp_id") -modparam("lcr", "lcr_table", "lcr") -modparam("lcr", "strip_column", "strip") -modparam("lcr", "prefix_column", "prefix") -modparam("lcr", "from_uri_column", "from_uri") -modparam("lcr", "priority_column", "priority") -modparam("lcr", "gw_uri_avp", "$avp(i:1400)") -modparam("lcr", "ruri_user_avp", "$avp(i:1402)") -modparam("lcr", "fr_inv_timer_avp", "$avp(s:fr_inv_timer_avp)") -modparam("lcr", "fr_inv_timer", 90) -modparam("lcr", "fr_inv_timer_next", 30) -modparam("lcr", "rpid_avp", "$avp(s:rpid)") -modparam("lcr", "flags_avp", "$avp(i:712)") +modparam("lcr", "gw_uri_avp", "$avp(709)") +modparam("lcr", "ruri_user_avp", "$avp(500)") +modparam("lcr", "tag_avp", "$avp(lcr_tag)") loadmodule "uac_redirect/uac_redirect.so" modparam("uac_redirect", "default_filter", "accept") @@ -308,9 +286,10 @@ modparam("alias_db", "alias_domain_column", "alias_domain") modparam("alias_db", "use_domain", 0) loadmodule "uac/uac.so" -modparam("uac", "rr_store_param", "vsf") -modparam("uac", "from_restore_mode", "auto") -modparam("uac", "from_passwd", "s1p:Wiz4rd!") +modparam("uac", "rr_from_store_param", "vsf") +modparam("uac", "rr_to_store_param", "vsf") +modparam("uac", "restore_mode", "auto") +modparam("uac", "restore_passwd", "s1p:Wiz4rd!") loadmodule "acc/acc.so" modparam("acc", "early_media", 0) @@ -337,17 +316,9 @@ modparam("acc", "multi_leg_info", "src_leg=$avp(i:901);dst_leg=$avp(i:902)") ######################################################################## # Request route 'main' ######################################################################## -route[0] -{ +request_route { xlog("L_INFO", "New request - M=$rm RURI=$ru F=$fu T=$tu IP=$si ID=$ci\n"); force_rport(); - if(msg:len > max_len) - { - - xlog("L_INFO", "Message too big - M=$rm RURI=$ru F=$fu T=$tu IP=$si ID=$ci\n"); - sl_send_reply("513", "Message Too Big"); - exit; - } if (!mf_process_maxfwd_header("10")) { @@ -368,7 +339,7 @@ route[0] } if(is_method("CANCEL") || is_method("BYE")) { - end_media_session(); + rtpproxy_destroy(); } if(loose_route()) { @@ -562,7 +533,7 @@ route[10] { if(isflagset(22)) { - end_media_session(); + rtpproxy_destroy(); } } @@ -635,7 +606,7 @@ route[12] if(!isflagset(22) && !search("^Content-Length:[ ]*0")) { setflag(22); - use_media_proxy(); + rtpproxy_manage(); } t_on_reply("2"); @@ -669,12 +640,12 @@ route[12] xlog("L_INFO", "Request leaving server, D-URI='$du' - M=$rm RURI=$ru F=$fu T=$tu IP=$si ID=$ci\n"); # no 100 (we already sent it) and no DNS blacklisting - if(!t_relay("0x05")) + if(!t_relay_to("0x05")) { sl_reply_error(); if(is_method("INVITE") && isbflagset(6)) { - end_media_session(); + rtpproxy_destroy(); } } exit; @@ -687,7 +658,7 @@ route[12] route[13] { sl_send_reply("100", "Trying"); - if(from_gw()) + if(from_gw(1)) { $avp(s:caller_uuid) = "0"; @@ -835,7 +806,7 @@ route[16] if(uri =~ "^sip:[0-9]+@") { # only route numeric users to PSTN - if(!load_gws()) + if(!load_gws(1)) { xlog("L_ERR", "Error loading PSTN gateways - M=$rm RURI=$ru F=$fu T=$tu IP=$si ID=$ci\n"); @@ -1027,7 +998,7 @@ onreply_route[2] { if(!search("^Content-Length:[ ]*0")) { - use_media_proxy(); + rtpproxy_manage(); } } exit; @@ -1097,7 +1068,7 @@ failure_route[2] route(14); exit; } - if($avp(s:cfc) != NULL) + if($avp(s:cfc) != $null) { avp_delete("$avp(s:acc_caller_user)/g"); avp_delete("$avp(s:acc_caller_domain)/g"); diff --git a/test/unit/7.sh b/test/unit/7.sh index b2851a4..b4dab07 100755 --- a/test/unit/7.sh +++ b/test/unit/7.sh @@ -33,10 +33,11 @@ if ! (check_kamailio); then fi ; # start -$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG -a no -E -e -dd +#> /dev/null ret=$? sleep 1 $KILL -exit $ret \ No newline at end of file +exit $ret

9 years, 6 months

git:master: lcr: declare inline function static to work with llvm linker

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 509659a83a53f8d979da37cee24941d22f5fffdc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=509659a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 11:54:54 2014 +0200 lcr: declare inline function static to work with llvm linker --- modules/lcr/lcr_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index eadcda9..ae01b24 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1638,7 +1638,7 @@ int reload_tables() } -inline int encode_avp_value(char *value, unsigned int gw_index, +static inline int encode_avp_value(char *value, unsigned int gw_index, char *scheme, unsigned int scheme_len, unsigned int strip, char *prefix, unsigned int prefix_len, @@ -1703,7 +1703,7 @@ inline int encode_avp_value(char *value, unsigned int gw_index, return at - value; } -inline int decode_avp_value(char *value, unsigned int *gw_index, str *scheme, +static inline int decode_avp_value(char *value, unsigned int *gw_index, str *scheme, unsigned int *strip, str *prefix, str *tag, struct ip_addr *addr, str *hostname, str *port, str *params, str *transport, unsigned int *flags)

9 years, 6 months

git:4.1: mohqueue: fixed db_qtable parameter name

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: f3820f1a9837451b9209aa40ca5ab750e59fec19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3820f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 10:18:11 2014 +0200 mohqueue: fixed db_qtable parameter name - reported by Marino Mileti (cherry picked from commit 321575dcd18e42fe6c62942ef417dd8acf7f466d) Conflicts: modules/mohqueue/mohq.c --- modules/mohqueue/mohq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mohqueue/mohq.c b/modules/mohqueue/mohq.c index 0c0d118..20a9ace 100644 --- a/modules/mohqueue/mohq.c +++ b/modules/mohqueue/mohq.c @@ -70,7 +70,7 @@ int moh_maxcalls = 50; static param_export_t mod_parms [] = { { "db_url", STR_PARAM, &db_url }, { "db_ctable", STR_PARAM, &db_ctable }, - { "db_ctable", STR_PARAM, &db_qtable }, + { "db_qtable", STR_PARAM, &db_qtable }, { "mohdir", STR_PARAM, &mohdir }, { "moh_maxcalls", INT_PARAM, &moh_maxcalls }, { NULL, 0, NULL }, @@ -439,4 +439,4 @@ if (pmod_data->pcall_lock->plock) shm_free (pmod_data); pmod_data = NULL; return -1; -} \ No newline at end of file +}

9 years, 6 months

git:master: usrloc: hash_size default value set to 10

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1f1b81ed76dda3a889ffec52c173c53b2225dee4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f1b81e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 09:51:46 2014 +0200 usrloc: hash_size default value set to 10 - as discussed on mailing lists --- modules/usrloc/README | 6 +++--- modules/usrloc/doc/usrloc_admin.xml | 6 +++--- modules/usrloc/ul_mod.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index 688b2d9..f480ad9 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -689,14 +689,14 @@ modparam("usrloc", "fetch_rows", 3000) 3.26. hash_size (integer) The number of entries of the hash table used by usrloc to store the - location records is 2^hash_size. For hash_size=4, the number of entries + location records is 2^hash_size. For hash_size=4, the number of slots of the hash table is 16. - Default value is "9". + Default value is "10" (1024 slots). Example 1.26. Set hash_size parameter ... -modparam("usrloc", "hash_size", 10) +modparam("usrloc", "hash_size", 12) ... 3.27. preload (string) diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index a256e7a..0f99681 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -722,19 +722,19 @@ modparam("usrloc", "fetch_rows", 3000) <title><varname>hash_size</varname> (integer)</title> <para> The number of entries of the hash table used by usrloc to store the - location records is 2^hash_size. For hash_size=4, the number of entries + location records is 2^hash_size. For hash_size=4, the number of slots of the hash table is 16. </para> <para> <emphasis> - Default value is <quote>9</quote>. + Default value is <quote>10</quote> (1024 slots). </emphasis> </para> <example> <title>Set <varname>hash_size</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("usrloc", "hash_size", 10) +modparam("usrloc", "hash_size", 12) ... </programlisting> </example> diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index d3a1021..5992258 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -166,7 +166,7 @@ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ int handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ -int ul_hash_size = 9; +int ul_hash_size = 10; int ul_db_insert_null = 0; /* flags */

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014