sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
173 discussions

git:3.3 Possible error creating presence tables

by Andrés Souto Vidal

Hello, I think this commit: Module: sip-router Branch: 3.3 Commit: 82ca28c8a523c015b69a3c56d02983356faefc54 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82ca28c… introduced a bug creating the presence table by kamdbctl. The problem is the comma in the previous line: --- a/utils/kamctl/mysql/presence-create.sql<http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=utils/ka…> +++ b/utils/kamctl/mysql/presence-create.sql<http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=utils/ka…> @@ -103,7<http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=utils/ka…> +103,6<http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=utils/ka…>@@ CREATE TABLE pua ( version INT(11) NOT NULL, extra_headers TEXT NOT NULL, CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag), - CONSTRAINT expires_idx UNIQUE (expires) ) ENGINE=MyISAM;

12 years, 2 months

git:3.3: kamctl: regeneration of sql creation scripts for pua table updates

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 7b40fba5cfc04781c60a849bcb0e240c4e34413a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b40fba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 14 13:02:01 2012 +0200 kamctl: regeneration of sql creation scripts for pua table updates --- utils/kamctl/db_sqlite/presence-create.sql | 4 ++-- utils/kamctl/mysql/presence-create.sql | 5 +++-- utils/kamctl/oracle/presence-create.sql | 4 ++-- utils/kamctl/postgres/presence-create.sql | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index a9a9157..4e25d80 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -102,10 +102,10 @@ CREATE TABLE pua ( remote_contact VARCHAR(128) NOT NULL, version INTEGER NOT NULL, extra_headers TEXT NOT NULL, - CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag), - CONSTRAINT pua_expires_idx UNIQUE (expires) + CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ); +CREATE INDEX pua_expires_idx ON pua (expires); CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag); CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri); CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag); diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 7f68249..928521e 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -102,13 +102,14 @@ CREATE TABLE pua ( remote_contact VARCHAR(128) NOT NULL, version INT(11) NOT NULL, extra_headers TEXT NOT NULL, - CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag), + CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ) ENGINE=MyISAM; +CREATE INDEX expires_idx ON pua (expires); CREATE INDEX dialog1_idx ON pua (call_id, from_tag, to_tag); CREATE INDEX dialog2_idx ON pua (pres_id, pres_uri); CREATE INDEX tmp_dlg1_idx ON pua (call_id, from_tag); CREATE INDEX tmp_dlg2_idx ON pua (pres_id, pres_uri, call_id, from_tag); CREATE INDEX tmp_record1_idx ON pua (pres_id); CREATE INDEX tmp_record2_idx ON pua (pres_id, etag); -CREATE INDEX expires_idx ON pua (expires); + diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index bffdba2..a1c5528 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -134,8 +134,7 @@ CREATE TABLE pua ( remote_contact VARCHAR2(128), version NUMBER(10), extra_headers CLOB, - CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag), - CONSTRAINT pua_expires_idx UNIQUE (expires) + CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ); CREATE OR REPLACE TRIGGER pua_tr @@ -146,6 +145,7 @@ END pua_tr; / BEGIN map2users('pua'); END; / +CREATE INDEX pua_expires_idx ON pua (expires); CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag); CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri); CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag); diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 1aacd99..cf3fe17 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -102,10 +102,10 @@ CREATE TABLE pua ( remote_contact VARCHAR(128) NOT NULL, version INTEGER NOT NULL, extra_headers TEXT NOT NULL, - CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag), - CONSTRAINT pua_expires_idx UNIQUE (expires) + CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag) ); +CREATE INDEX pua_expires_idx ON pua (expires); CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag); CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri); CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag);

12 years, 2 months

git:master: lib/kcore: other inline linker fixes

by Marius Zbihlei

Module: sip-router Branch: master Commit: 5b3d0d2837823a4879e493f04d4e995c3e29d37b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b3d0d2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Sep 14 13:53:00 2012 +0300 lib/kcore: other inline linker fixes use of 'static inline' where appliable --- lib/kcore/parse_sst.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/kcore/parse_sst.c b/lib/kcore/parse_sst.c index 9a5e9c1..0e5beff 100644 --- a/lib/kcore/parse_sst.c +++ b/lib/kcore/parse_sst.c @@ -37,17 +37,17 @@ #include "../../mem/mem.h" -inline int/*bool*/ is_space( char c ) { return (c == ' ' || c == '\t'); } -inline int/*bool*/ is_num( char c ) { return (c >= '0' && c <= '9'); } +static inline int/*bool*/ is_space( char c ) { return (c == ' ' || c == '\t'); } +static inline int/*bool*/ is_num( char c ) { return (c >= '0' && c <= '9'); } -inline unsigned lower_byte( char b ) { return b | 0x20; } -inline unsigned lower_4bytes( unsigned d ) { return d | 0x20202020; } -inline unsigned lower_3bytes( unsigned d ) { return d | 0x202020; } -inline unsigned read_4bytes( char *val ) { +static inline unsigned lower_byte( char b ) { return b | 0x20; } +static inline unsigned lower_4bytes( unsigned d ) { return d | 0x20202020; } +static inline unsigned lower_3bytes( unsigned d ) { return d | 0x202020; } +static inline unsigned read_4bytes( char *val ) { return (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)); } -inline unsigned read_3bytes( char *val ) { +static inline unsigned read_3bytes( char *val ) { return (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16)); }

12 years, 2 months

git:master: core: Fixed inline function declaration for non-gcc linkers

by Marius Zbihlei

Module: sip-router Branch: master Commit: d5a8649a2059466a1a8b9e2adbef139d0300a599 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5a8649… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Sep 14 13:15:47 2012 +0300 core: Fixed inline function declaration for non-gcc linkers usage of either 'extern inline' or 'static inline' depending on function scope is recommended --- parser/parse_param.h | 2 +- raw_sock.c | 2 +- sip_msg_clone.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parser/parse_param.h b/parser/parse_param.h index e0b15fd..db7f401 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -150,7 +150,7 @@ typedef union param_hooks { * 0: success, but expect a next paramter * 1: success and exepect no more parameters */ -inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); +extern inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); /*! \brief diff --git a/raw_sock.c b/raw_sock.c index b514a87..1d18e5a 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -391,7 +391,7 @@ error: * in _host_ order. * @return the partial checksum in host order */ -inline unsigned short udpv4_vhdr_sum( struct udphdr* uh, +static inline unsigned short udpv4_vhdr_sum( struct udphdr* uh, struct in_addr* src, struct in_addr* dst, unsigned short length) diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 28933b2..58ce353 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -150,7 +150,7 @@ do { \ -inline struct via_body* via_body_cloner( char* new_buf, +static inline struct via_body* via_body_cloner( char* new_buf, char *org_buf, struct via_body *param_org_via, char **p) { struct via_body *new_via;

12 years, 2 months

FAQ page on the wiki

by Daniel-Constantin Mierla

Hello, I just started a FAQ page on the wiki site. Hopefully people will collect there useful content, based on their experience, questions that repeat on the mailing lists or other sources. Added just a few content for the moment, to show the syntax -- the page is available at: * http://www.kamailio.org/wiki/tutorials/faq/main It is using the QNA plugin for dokuwiki: * https://www.dokuwiki.org/plugin:qna Anyone can make an own account to edit the wiki, the registration form is available at: * https://www.kamailio.org/wiki/start?do=register Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat Kamailio Advanced Training, Miami, USA, Nov 12-14, 2012 - http://asipto.com/u/katu

12 years, 2 months

sdpops: new function sdp_get_ip_c

by Vicente Hernando

Hello, attached patch shows a new function in sdpops module: sdp_get_ip_c It receives as parameter an avp variable, and stores there every connection IP for each stream. If a stream has not c IP, then it returns session default one. Any opinion or criticism? Kind regards, Vicente.

12 years, 2 months

git:master: usrloc(k): keep time of the last keepalive for natted UDP contacts

by Juha Heinanen

Klaus wrote: Why only UDP? Are TCP contacts removed when the TCP connections is closed? IMO there should also be a mechanism to remove ALL expired unresponsive contacts. how about the following for tcp contacts: - set_forward_no_connect(); - if t_relay() fails because tcp connection does not exist, unregister the AoR/contact what would be needed is a find out that t_relay() failed due to non-existing connection and a script function to do un-registration of an AoR/contact. perhaps both of these two things already exist? -- juha

12 years, 2 months

git:master: corex: documented the new parameter alias_subdomains

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 95581558c230054b082200f10509b8c61e036131 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9558155… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 11 22:02:21 2012 +0200 corex: documented the new parameter alias_subdomains --- modules/corex/README | 68 ++++++++++++++++++++++++++----------- modules/corex/doc/corex_admin.xml | 28 +++++++++++++++ 2 files changed, 76 insertions(+), 20 deletions(-) diff --git a/modules/corex/README b/modules/corex/README index 5cffb3c..68860dd 100644 --- a/modules/corex/README +++ b/modules/corex/README @@ -23,18 +23,23 @@ Daniel-Constantin Mierla 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters - 3.1. append_branch([ uri, [ q ] ]) + 3.1. alias_subdomains (string) - 4. RPC Commands + 4. Functions - 4.1. corex.list_sockets - 4.2. corex.list_aliases + 4.1. append_branch([ uri, [ q ] ]) + + 5. RPC Commands + + 5.1. corex.list_sockets + 5.2. corex.list_aliases List of Examples - 1.1. append_branch usage + 1.1. Set alias_subdomains parameter + 1.2. append_branch usage Chapter 1. Admin Guide @@ -46,14 +51,18 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters + + 3.1. alias_subdomains (string) - 3.1. append_branch([ uri, [ q ] ]) + 4. Functions - 4. RPC Commands + 4.1. append_branch([ uri, [ q ] ]) - 4.1. corex.list_sockets - 4.2. corex.list_aliases + 5. RPC Commands + + 5.1. corex.list_sockets + 5.2. corex.list_aliases 1. Overview @@ -84,11 +93,30 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * None -3. Functions +3. Parameters + + 3.1. alias_subdomains (string) + +3.1. alias_subdomains (string) + + Register a domain and all its sub-domains to match the myself + condition. It can be set many times. Its full format is: + 'proto:domain:port', allowing to set restrictions on protocol and port + as well. Protocol and port are optional. + + Default value is "NULL". + + Example 1.1. Set alias_subdomains parameter +... +modparam("corex", "alias_subdomain", "kamailio.org") +modparam("corex", "alias_subdomain", "udp:sip-router.org:5060") +... + +4. Functions - 3.1. append_branch([ uri, [ q ] ]) + 4.1. append_branch([ uri, [ q ] ]) -3.1. append_branch([ uri, [ q ] ]) +4.1. append_branch([ uri, [ q ] ]) Append a new branch to the destination set, useful to build the addresses for parallel forking or redirect replies. @@ -104,25 +132,25 @@ Chapter 1. Admin Guide This function can be used from REQUEST_ROUTE or FAILURE_ROUTE. - Example 1.1. append_branch usage + Example 1.2. append_branch usage ... append_branch(); append_branch("$avp(uri)", "0.5"); ... -4. RPC Commands +5. RPC Commands - 4.1. corex.list_sockets - 4.2. corex.list_aliases + 5.1. corex.list_sockets + 5.2. corex.list_aliases -4.1. corex.list_sockets +5.1. corex.list_sockets Print the list of sockets the application is listening on. Example: sercmd corex.list_sockets -4.2. corex.list_aliases +5.2. corex.list_aliases Print the list of hostname aliases used to match myself condition. diff --git a/modules/corex/doc/corex_admin.xml b/modules/corex/doc/corex_admin.xml index bc01fe5..4ceb77b 100644 --- a/modules/corex/doc/corex_admin.xml +++ b/modules/corex/doc/corex_admin.xml @@ -61,6 +61,34 @@ </para> </section> </section> + + <section> + <title>Parameters</title> + <section> + <title><varname>alias_subdomains</varname> (string)</title> + <para> + Register a domain and all its sub-domains to match the myself + condition. It can be set many times. Its full format is: + 'proto:domain:port', allowing to set restrictions on protocol + and port as well. Protocol and port are optional. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>alias_subdomains</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("corex", "alias_subdomain", "kamailio.org") +modparam("corex", "alias_subdomain", "udp:sip-router.org:5060") +... +</programlisting> + </example> + </section> + </section> + <section> <title>Functions</title> <section>

12 years, 2 months

git:master: corex: new parameter alias_subdomains

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: eaed27161e36b0bec9bef2660d2fae80092a2e42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eaed271… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 11 21:52:01 2012 +0200 corex: new parameter alias_subdomains - adds domain and all its subdomains to myself condition, registering a callback for check self event --- modules/corex/corex_lib.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ modules/corex/corex_lib.h | 4 ++ modules/corex/corex_mod.c | 22 ++++++++ 3 files changed, 149 insertions(+), 0 deletions(-) diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index d8ad3c5..1f69847 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -26,6 +26,7 @@ #include "../../dprint.h" #include "../../dset.h" +#include "../../forward.h" #include "corex_lib.h" @@ -88,3 +89,125 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq) return ret; } + +typedef struct corex_alias { + str alias; + unsigned short port; + unsigned short proto; + int flags; + struct corex_alias* next; +} corex_alias_t; + +static corex_alias_t *_corex_alias_list = NULL; + +int corex_add_alias_subdomains(char* aliasval) +{ + char *p = NULL; + corex_alias_t ta; + corex_alias_t *na; + + memset(&ta, 0, sizeof(corex_alias_t)); + + p = strchr(aliasval, ':'); + if(p==NULL) { + /* only hostname */ + ta.alias.s = aliasval; + ta.alias.len = strlen(aliasval); + goto done; + } + if((p-aliasval)==3 || (p-aliasval)==4) { + /* check if it is protocol */ + if((p-aliasval)==3 && strncasecmp(aliasval, "udp", 3)==0) { + ta.proto = PROTO_UDP; + } else if((p-aliasval)==3 && strncasecmp(aliasval, "tcp", 3)==0) { + ta.proto = PROTO_TCP; + } else if((p-aliasval)==3 && strncasecmp(aliasval, "tls", 3)==0) { + ta.proto = PROTO_TLS; + } else if((p-aliasval)==4 && strncasecmp(aliasval, "sctp", 4)==0) { + ta.proto = PROTO_SCTP; + } else { + /* use hostname */ + ta.alias.s = aliasval; + ta.alias.len = p - aliasval; + } + } + if(ta.alias.len==0) { + p++; + if(p>=aliasval+strlen(aliasval)) + goto error; + ta.alias.s = p; + p = strchr(ta.alias.s, ':'); + if(p==NULL) { + ta.alias.len = strlen(ta.alias.s); + goto done; + } + } + /* port */ + p++; + if(p>=aliasval+strlen(aliasval)) + goto error; + ta.port = str2s(p, strlen(p), NULL); + +done: + if(ta.alias.len==0) + goto error; + + na = (corex_alias_t*)pkg_malloc(sizeof(corex_alias_t)); + if(na==NULL) { + LM_ERR("no memory for adding alias subdomains: %s\n", aliasval); + return -1; + } + memcpy(na, &ta, sizeof(corex_alias_t)); + na->next = _corex_alias_list; + _corex_alias_list = na; + + return 0; + +error: + LM_ERR("error adding alias subdomains: %s\n", aliasval); + return -1; +} + + +int corex_check_self(str* host, unsigned short port, unsigned short proto) +{ + corex_alias_t *ta; + + for(ta=_corex_alias_list; ta; ta=ta->next) { + if(host->len<ta->alias.len) + continue; + if(ta->port!=0 && port!=0 && ta->port!=port) + continue; + if(ta->proto!=0 && proto!=0 && ta->proto!=proto) + continue; + if(host->len==ta->alias.len + && strncasecmp(host->s, ta->alias.s, host->len)==0) { + /* match domain */ + LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->port, + ta->alias.len, ta->alias.s, (int)ta->proto); + return 1; + } + if(strncasecmp(ta->alias.s, host->s + host->len - ta->alias.len, + ta->alias.len)==0) { + if(host->s[host->len - ta->alias.len - 1]=='.') { + /* match sub-domain */ + LM_DBG("check self sub-domain match: %d:%.*s:%d\n", (int)ta->port, + ta->alias.len, ta->alias.s, (int)ta->proto); + return 1; + } + } + } + + return 0; /* no match */ +} + +int corex_register_check_self(void) +{ + if(_corex_alias_list==NULL) + return 0; + if (register_check_self_func(corex_check_self) <0 ) { + LM_ERR("failed to register check self function\n"); + return -1; + } + return 0; +} diff --git a/modules/corex/corex_lib.h b/modules/corex/corex_lib.h index c997fce..49fa712 100644 --- a/modules/corex/corex_lib.h +++ b/modules/corex/corex_lib.h @@ -26,4 +26,8 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq); +int corex_add_alias_subdomains(char* aliasval); + +int corex_register_check_self(void); + #endif diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index 4fda1a2..5b4690c 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -35,6 +35,8 @@ MODULE_VERSION static int w_append_branch(sip_msg_t *msg, char *su, char *sq); +int corex_alias_subdomains_param(modparam_t type, void *val); + static int mod_init(void); static int child_init(int); static void mod_destroy(void); @@ -52,6 +54,8 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ + {"alias_subdomains", STR_PARAM|USE_FUNC_PARAM, + (void*)corex_alias_subdomains_param}, {0, 0, 0} }; @@ -83,6 +87,12 @@ static int mod_init(void) return -1; } + if(corex_register_check_self()<0) + { + LM_ERR("failed to register check self callback\n"); + return -1; + } + return 0; } @@ -113,3 +123,15 @@ static int w_append_branch(sip_msg_t *msg, char *su, char *sq) return 1; } + +int corex_alias_subdomains_param(modparam_t type, void *val) +{ + if(val==NULL) + goto error; + + return corex_add_alias_subdomains((char*)val); +error: + return -1; + +} +

12 years, 2 months

git:3.3: modules_k/pua: Adjusted locking for dialog insertion. Candidate fix for "temporary dialog" error reported by Juha

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: 91e8cb4bf7456eeebefa96269887f6aae46626d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91e8cb4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Sep 11 13:23:23 2012 +0100 modules_k/pua: Adjusted locking for dialog insertion. Candidate fix for "temporary dialog" error reported by Juha (cherry picked from commit b0d642016cca83c519ea9aa0e04aa9bf353e07e4) --- modules_k/pua/hash.c | 18 +++--------------- modules_k/pua/hash.h | 3 ++- modules_k/pua/pua.c | 7 ++++++- modules_k/pua/send_publish.c | 4 +++- modules_k/pua/send_subscribe.c | 6 ++---- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/modules_k/pua/hash.c b/modules_k/pua/hash.c index 1fa6149..9ad169b 100644 --- a/modules_k/pua/hash.c +++ b/modules_k/pua/hash.c @@ -235,7 +235,7 @@ void update_htable(ua_pres_t* p, time_t desired_expires, int expires, } } /* insert in front; so when searching the most recent result is returned*/ -void _insert_htable(ua_pres_t* presentity, unsigned int hash_code) +void insert_htable(ua_pres_t* presentity, unsigned int hash_code) { ua_pres_t* p= NULL; @@ -253,18 +253,6 @@ void _insert_htable(ua_pres_t* presentity, unsigned int hash_code) p->next= presentity; } -void insert_htable(ua_pres_t* presentity) -{ - unsigned int hash_code; - - hash_code= core_hash(presentity->pres_uri,presentity->watcher_uri, HASH_SIZE); - lock_get(&HashT->p_records[hash_code].lock); - - _insert_htable(presentity, hash_code); - - lock_release(&HashT->p_records[hash_code].lock); -} - /* This function used to perform a search to find the hash table entry that matches the presentity it is passed. However, everywhere it is used it is passed a pointer to the correct @@ -349,7 +337,7 @@ int convert_temporary_dialog(ua_pres_t *dialog) else return -1; - _insert_htable(dialog, hash_code); + insert_htable(dialog, hash_code); lock_release(&HashT->p_records[hash_code].lock); @@ -695,4 +683,4 @@ list_entry_t *get_subs_list(str *did) } done: return list; -} \ No newline at end of file +} diff --git a/modules_k/pua/hash.h b/modules_k/pua/hash.h index 61ccd54..9912eba 100644 --- a/modules_k/pua/hash.h +++ b/modules_k/pua/hash.h @@ -116,7 +116,8 @@ htable_t* new_htable(void); ua_pres_t* search_htable(ua_pres_t* pres, unsigned int hash_code); -void insert_htable(ua_pres_t* presentity ); +void insert_htable(ua_pres_t* presentity, unsigned int hash_code); + void update_htable(ua_pres_t* presentity,time_t desired_expires, int expires, str* etag, unsigned int hash_code, str* contact); diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 2297219..8734d35 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -391,6 +391,7 @@ static int db_restore(void) int watcher_col,callid_col,totag_col,fromtag_col,cseq_col,remote_contact_col; int event_col,contact_col,tuple_col,record_route_col, extra_headers_col; int version_col; + unsigned int hash_code; if (dbmode==PUA_DB_ONLY) { @@ -643,7 +644,11 @@ static int db_restore(void) } print_ua_pres(p); - insert_htable(p); + + hash_code= core_hash(p->pres_uri, p->watcher_uri, HASH_SIZE); + lock_get(&HashT->p_records[hash_code].lock); + insert_htable(p, hash_code); + lock_release(&HashT->p_records[hash_code].lock); } } while((db_fetch_next(&pua_dbf, pua_fetch_rows, pua_db, &res)==1) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index 97935c1..4273495 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -422,7 +422,9 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) } else { - insert_htable(presentity); + lock_get(&HashT->p_records[hash_code].lock); + insert_htable(presentity, hash_code); + lock_release(&HashT->p_records[hash_code].lock); } LM_DBG("***Inserted in hash table\n"); diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index 89a8141..c1476cd 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -1011,9 +1011,6 @@ int send_subscribe(subs_info_t* subs) int size; insert: - if (dbmode!=PUA_DB_ONLY) - lock_release(&HashT->p_records[hash_code].lock); - if (subs->expires == 0) /* Don't create a new dialog when expires == 0 */ goto done; @@ -1123,7 +1120,8 @@ insert: } else { - insert_htable(presentity); + insert_htable(presentity, hash_code); + lock_release(&HashT->p_records[hash_code].lock); } uac_r.dialog->rem_target.s = 0;

12 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2012