sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
347 discussions

git:master: srdb1: new column reg_id to location and aliases tables
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: 6927fcf7bb48d88a708028a0c877a050150ef05d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6927fcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 17 11:47:34 2012 +0200 srdb1: new column reg_id to location and aliases tables - stores the value of reg-id Contact parameter defined by RFC5626 --- lib/srdb1/schema/aliases.xml | 9 +++++++++ lib/srdb1/schema/location.xml | 8 ++++++++ utils/kamctl/db_berkeley/kamailio/aliases | 4 ++-- utils/kamctl/db_berkeley/kamailio/location | 4 ++-- utils/kamctl/db_sqlite/registrar-create.sql | 3 ++- utils/kamctl/db_sqlite/usrloc-create.sql | 3 ++- utils/kamctl/dbtext/kamailio/aliases | 2 +- utils/kamctl/dbtext/kamailio/location | 2 +- utils/kamctl/mysql/registrar-create.sql | 3 ++- utils/kamctl/mysql/usrloc-create.sql | 3 ++- utils/kamctl/oracle/registrar-create.sql | 3 ++- utils/kamctl/oracle/usrloc-create.sql | 3 ++- utils/kamctl/postgres/registrar-create.sql | 3 ++- utils/kamctl/postgres/usrloc-create.sql | 3 ++- 14 files changed, 39 insertions(+), 14 deletions(-) diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index d5bad5a..fe7df18 100644 --- a/lib/srdb1/schema/aliases.xml +++ b/lib/srdb1/schema/aliases.xml @@ -171,6 +171,15 @@ <description>The value of SIP instance parameter for GRUU.</description> </column> + <column> + <name>reg_id</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value of reg-id contact parameter</description> + </column> + + <index> <name>alias_idx</name> <colref linkend="username"/> diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index ddf0b48..0276212 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -171,6 +171,14 @@ <description>The value of SIP instance parameter for GRUU.</description> </column> + <column> + <name>reg_id</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value of reg-id contact parameter</description> + </column> + <index> <name>account_contact_idx</name> diff --git a/utils/kamctl/db_berkeley/kamailio/aliases b/utils/kamctl/db_berkeley/kamailio/aliases index 87bf7d5..edc1177 100644 --- a/utils/kamctl/db_berkeley/kamailio/aliases +++ b/utils/kamctl/db_berkeley/kamailio/aliases @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) ruid(str) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) instance(str) +id(int) ruid(str) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) instance(str) reg_id(int) METADATA_KEY 1 2 3 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL +NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 diff --git a/utils/kamctl/db_berkeley/kamailio/location b/utils/kamctl/db_berkeley/kamailio/location index 87bf7d5..edc1177 100644 --- a/utils/kamctl/db_berkeley/kamailio/location +++ b/utils/kamctl/db_berkeley/kamailio/location @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) ruid(str) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) instance(str) +id(int) ruid(str) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) instance(str) reg_id(int) METADATA_KEY 1 2 3 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL +NIL|''|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 diff --git a/utils/kamctl/db_sqlite/registrar-create.sql b/utils/kamctl/db_sqlite/registrar-create.sql index 27a4d8f..8743517 100644 --- a/utils/kamctl/db_sqlite/registrar-create.sql +++ b/utils/kamctl/db_sqlite/registrar-create.sql @@ -17,7 +17,8 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT NULL + instance VARCHAR(255) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ); CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact); diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index 5d80120..72fd3d9 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -17,7 +17,8 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT NULL + instance VARCHAR(255) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ); CREATE INDEX location_account_contact_idx ON location (username, domain, contact); diff --git a/utils/kamctl/dbtext/kamailio/aliases b/utils/kamctl/dbtext/kamailio/aliases index 29c4968..f3f0c72 100644 --- a/utils/kamctl/dbtext/kamailio/aliases +++ b/utils/kamctl/dbtext/kamailio/aliases @@ -1 +1 @@ -id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) +id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) reg_id(int) diff --git a/utils/kamctl/dbtext/kamailio/location b/utils/kamctl/dbtext/kamailio/location index 29c4968..f3f0c72 100644 --- a/utils/kamctl/dbtext/kamailio/location +++ b/utils/kamctl/dbtext/kamailio/location @@ -1 +1 @@ -id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) +id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) reg_id(int) diff --git a/utils/kamctl/mysql/registrar-create.sql b/utils/kamctl/mysql/registrar-create.sql index 54d143f..73f808c 100644 --- a/utils/kamctl/mysql/registrar-create.sql +++ b/utils/kamctl/mysql/registrar-create.sql @@ -17,7 +17,8 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - instance VARCHAR(255) DEFAULT NULL + instance VARCHAR(255) DEFAULT NULL, + reg_id INT(11) DEFAULT 0 NOT NULL ) ENGINE=MyISAM; CREATE INDEX alias_idx ON aliases (username, domain, contact); diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 3e86737..dc1fa5a 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -17,7 +17,8 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - instance VARCHAR(255) DEFAULT NULL + instance VARCHAR(255) DEFAULT NULL, + reg_id INT(11) DEFAULT 0 NOT NULL ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact); diff --git a/utils/kamctl/oracle/registrar-create.sql b/utils/kamctl/oracle/registrar-create.sql index 9ba6898..0409d84 100644 --- a/utils/kamctl/oracle/registrar-create.sql +++ b/utils/kamctl/oracle/registrar-create.sql @@ -17,7 +17,8 @@ CREATE TABLE aliases ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - instance VARCHAR2(255) DEFAULT NULL + instance VARCHAR2(255) DEFAULT NULL, + reg_id NUMBER(10) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER aliases_tr diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 144c859..386af40 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -17,7 +17,8 @@ CREATE TABLE location ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - instance VARCHAR2(255) DEFAULT NULL + instance VARCHAR2(255) DEFAULT NULL, + reg_id NUMBER(10) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER location_tr diff --git a/utils/kamctl/postgres/registrar-create.sql b/utils/kamctl/postgres/registrar-create.sql index b8889a2..2771e01 100644 --- a/utils/kamctl/postgres/registrar-create.sql +++ b/utils/kamctl/postgres/registrar-create.sql @@ -17,7 +17,8 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT NULL + instance VARCHAR(255) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ); CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact); diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index c972d71..a74fe87 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -17,7 +17,8 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT NULL + instance VARCHAR(255) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ); CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

1 0

git:master: registrar(k): store +sip.instance always in contact structure
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: 45a01f51e2393fac6883956739a6a41859076323 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45a01f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 17 11:51:15 2012 +0200 registrar(k): store +sip.instance always in contact structure - if it is provided, keep it, since it used either for gruu or outbound extensions - mirror reg-id to contact in 200ok if provided in REGISTER - updated the prototype of the usrloc function to match by instance --- modules_k/registrar/reply.c | 22 +++++++++++++++++++--- modules_k/registrar/save.c | 27 ++++++++++++++++++--------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/modules_k/registrar/reply.c b/modules_k/registrar/reply.c index a759aeb..2e27f9a 100644 --- a/modules_k/registrar/reply.c +++ b/modules_k/registrar/reply.c @@ -76,6 +76,11 @@ #define TMP_GRUU_PARAM ";temp-gruu=" #define TMP_GRUU_PARAM_LEN (sizeof(TMP_GRUU_PARAM) - 1) +#define REG_ID_PARAM ";reg-id=" +#define REG_ID_PARAM_LEN (sizeof(REG_ID_PARAM) - 1) + +extern int reg_gruu_enabled; + /*! \brief * Buffer for Contact header field */ @@ -113,7 +118,7 @@ static inline unsigned int calc_buf_len(ucontact_t* c, str *host, int mode) + 1 /* dquote */ ; } - if (c->instance.len>0 && mode==1) { + if (reg_gruu_enabled==1 && c->instance.len>0 && mode==1) { /* pub-gruu */ len += PUB_GRUU_PARAM_LEN + 1 /* " */ @@ -147,6 +152,10 @@ static inline unsigned int calc_buf_len(ucontact_t* c, str *host, int mode) + 1 /* " */ ; } + if (c->reg_id>0) { + /* reg-id */ + len += REG_ID_PARAM_LEN + INT2STR_MAX_LEN; + } } c = c->next; } @@ -239,7 +248,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) p += c->received.len; *p++ = '\"'; } - if (c->instance.len>0 && mode==1) { + if (reg_gruu_enabled==1 && c->instance.len>0 && mode==1) { user.s = c->aor->s; a = memchr(c->aor->s, '@', c->aor->len); if(a!=NULL) { @@ -306,7 +315,14 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) p += c->instance.len; *p++ = '\"'; } - + if (c->reg_id>0) { + /* reg-id */ + memcpy(p, REG_ID_PARAM, REG_ID_PARAM_LEN); + p += REG_ID_PARAM_LEN; + cp = int2str(c->reg_id, &len); + memcpy(p, cp, len); + p += len; + } } c = c->next; diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 78e0c24..8f18ea7 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -357,9 +357,15 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, ci.received = received; } } - if(reg_gruu_enabled==1 && _c->instance!=NULL - && _c->instance->body.len>0) + if(_c->instance!=NULL && _c->instance->body.len>0) ci.instance = _c->instance->body; + if(_c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(str2int(&_c->reg_id->body, &ci.reg_id)<0) + { + LM_ERR("invalid reg-id value\n"); + goto error; + } + } if(sruid_next(&_reg_sruid)<0) goto error; ci.ruid = _reg_sruid.uid; @@ -473,15 +479,20 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a) goto error; } - if ( r->contacts==0 || - ul.get_ucontact_by_instance(r, &_c->uri, ci->callid, ci->path, ci->cseq+1, - &ci->instance, &c) != 0) { + /* hack to work with buggy clients having many contacts with same + * address in one REGISTER - increase CSeq to detect if there was + * one alredy added, then update */ + ci->cseq++; + if ( r->contacts==0 + || ul.get_ucontact_by_instance(r, &_c->uri, ci, &c) != 0) { + ci->cseq--; if (ul.insert_ucontact( r, &_c->uri, ci, &c) < 0) { rerrno = R_UL_INS_C; LM_ERR("failed to insert contact\n"); goto error; } } else { + ci->cseq--; if (ul.update_ucontact( r, c, ci) < 0) { rerrno = R_UL_UPD_C; LM_ERR("failed to update contact\n"); @@ -552,8 +563,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, /* calculate expires */ calc_contact_expires(_m, _c->expires, &e); - ret = ul.get_ucontact_by_instance( _r, &_c->uri, ci->callid, ci->path, ci->cseq, - &ci->instance, &cont); + ret = ul.get_ucontact_by_instance( _r, &_c->uri, ci, &cont); if (ret==-1) { LM_ERR("invalid cseq for aor <%.*s>\n",_r->aor.len,_r->aor.s); rerrno = R_INV_CSEQ; @@ -642,8 +652,7 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, calc_contact_expires(_m, _c->expires, &expires); /* search for the contact*/ - ret = ul.get_ucontact_by_instance( _r, &_c->uri, ci->callid, ci->path, - ci->cseq, &ci->instance, &c); + ret = ul.get_ucontact_by_instance( _r, &_c->uri, ci, &c); if (ret==-1) { LM_ERR("invalid cseq for aor <%.*s>\n",_r->aor.len,_r->aor.s); rerrno = R_INV_CSEQ;

1 0

git:master: registrar(k): add gruu parameters only when supported
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: 1ff39475221c823a3da2cc02b10121771137b780 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ff3947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 16 23:05:40 2012 +0200 registrar(k): add gruu parameters only when supported - check Supported header for gruu tag in order to ad pub/temp-gruu to the Contact header in 200ok --- modules_k/registrar/reply.c | 23 ++++++++++++++++++----- modules_k/registrar/reply.h | 2 +- modules_k/registrar/save.c | 24 ++++++++++++------------ 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/modules_k/registrar/reply.c b/modules_k/registrar/reply.c index 818888a..a759aeb 100644 --- a/modules_k/registrar/reply.c +++ b/modules_k/registrar/reply.c @@ -89,8 +89,9 @@ static struct { /*! \brief * Calculate the length of buffer needed to * print contacts + * - mode specifies if GRUU header params are added */ -static inline unsigned int calc_buf_len(ucontact_t* c, str *host) +static inline unsigned int calc_buf_len(ucontact_t* c, str *host, int mode) { unsigned int len; int qlen; @@ -112,7 +113,7 @@ static inline unsigned int calc_buf_len(ucontact_t* c, str *host) + 1 /* dquote */ ; } - if (c->instance.len>0) { + if (c->instance.len>0 && mode==1) { /* pub-gruu */ len += PUB_GRUU_PARAM_LEN + 1 /* " */ @@ -137,6 +138,8 @@ static inline unsigned int calc_buf_len(ucontact_t* c, str *host) - 1 /* = */ + 1 /* " */ ; + } + if (c->instance.len>0) { /* +sip-instance */ len += SIP_INSTANCE_PARAM_LEN + 1 /* " */ @@ -157,7 +160,7 @@ static inline unsigned int calc_buf_len(ucontact_t* c, str *host) * Allocate a memory buffer and print Contact * header fields into it */ -int build_contact(ucontact_t* c, str *host) +int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) { char *p, *cp; char *a; @@ -166,9 +169,17 @@ int build_contact(ucontact_t* c, str *host) str inst; unsigned int ahash; unsigned short digit; + int mode; + + if(msg!=NULL && parse_supported(msg)==0 + && (get_supported(msg) & F_SUPPORTED_GRUU)) + mode = 1; + else + mode = 0; + + contact.data_len = calc_buf_len(c, host, mode); - contact.data_len = calc_buf_len(c, host); if (!contact.data_len) return 0; if (!contact.buf || (contact.buf_len < contact.data_len)) { @@ -228,7 +239,7 @@ int build_contact(ucontact_t* c, str *host) p += c->received.len; *p++ = '\"'; } - if (c->instance.len>0) { + if (c->instance.len>0 && mode==1) { user.s = c->aor->s; a = memchr(c->aor->s, '@', c->aor->len); if(a!=NULL) { @@ -284,7 +295,9 @@ int build_contact(ucontact_t* c, str *host) memcpy(p, GR_PARAM, GR_PARAM_LEN); p += GR_PARAM_LEN - 1; *p++ = '\"'; + } + if (c->instance.len>0) { /* +sip-instance */ memcpy(p, SIP_INSTANCE_PARAM, SIP_INSTANCE_PARAM_LEN); p += SIP_INSTANCE_PARAM_LEN; diff --git a/modules_k/registrar/reply.h b/modules_k/registrar/reply.h index 963d970..f17f3c0 100644 --- a/modules_k/registrar/reply.h +++ b/modules_k/registrar/reply.h @@ -44,7 +44,7 @@ int reg_send_reply(struct sip_msg* _m); /*! \brief * Build Contact HF for reply */ -int build_contact(ucontact_t* c, str* host); +int build_contact(sip_msg_t *msg, ucontact_t* c, str* host); /*! \brief diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 36bff89..78e0c24 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -85,7 +85,7 @@ extern sruid_t _reg_sruid; * we will remove all bindings with the given username * from the usrloc and return 200 OK response */ -static inline int star(udomain_t* _d, str* _a, str *_h) +static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) { urecord_t* r; ucontact_t* c; @@ -115,7 +115,7 @@ static inline int star(udomain_t* _d, str* _a, str *_h) */ rerrno = R_UL_DEL_R; if (!ul.get_urecord(_d, _a, &r)) { - build_contact(r->contacts, _h); + build_contact(_m, r->contacts, _h); ul.release_urecord(r); } ul.unlock_udomain(_d, _a); @@ -186,7 +186,7 @@ static struct socket_info *get_sock_hdr(struct sip_msg *msg) * containing a list of all existing bindings for the * given username (in To HF) */ -static inline int no_contacts(udomain_t* _d, str* _a, str* _h) +static inline int no_contacts(sip_msg_t *_m, udomain_t* _d, str* _a, str* _h) { urecord_t* r; int res; @@ -201,10 +201,10 @@ static inline int no_contacts(udomain_t* _d, str* _a, str* _h) } if (res == 0) { /* Contacts found */ - build_contact(r->contacts, _h); + build_contact(_m, r->contacts, _h); ul.release_urecord(r); } else { /* No contacts found */ - build_contact(NULL, _h); + build_contact(_m, NULL, _h); } ul.unlock_udomain(_d, _a); return 0; @@ -508,10 +508,10 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a) if (r) { if (r->contacts) - build_contact(r->contacts, &u->host); + build_contact(_m, r->contacts, &u->host); ul.release_urecord(r); } else { /* No contacts found */ - build_contact(NULL, &u->host); + build_contact(_m, NULL, &u->host); } #ifdef USE_TCP @@ -788,12 +788,12 @@ static inline int add_contacts(struct sip_msg* _m, udomain_t* _d, if (res == 0) { /* Contacts found */ if ((ret=update_contacts(_m, r, _mode)) < 0) { - build_contact(r->contacts, &u->host); + build_contact(_m, r->contacts, &u->host); ul.release_urecord(r); ul.unlock_udomain(_d, _a); return -3; } - build_contact(r->contacts, &u->host); + build_contact(_m, r->contacts, &u->host); ul.release_urecord(r); } else { if (insert_contacts(_m, _d, _a) < 0) { @@ -846,10 +846,10 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) if (c == 0) { if (st) { - if (star((udomain_t*)_d, &aor, &u->host) < 0) goto error; + if (star(_m, (udomain_t*)_d, &aor, &u->host) < 0) goto error; else ret=3; } else { - if (no_contacts((udomain_t*)_d, &aor, &u->host) < 0) goto error; + if (no_contacts(_m, (udomain_t*)_d, &aor, &u->host) < 0) goto error; else ret=4; } } else { @@ -889,7 +889,7 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri) return -1; } - if (star(_d, &aor, &u->host) < 0) + if (star(_m, _d, &aor, &u->host) < 0) { LM_ERR("error unregistering user [%.*s]\n", aor.len, aor.s); return -1;

1 0

git:master: parser: added hook for reg-id param of Contact header
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: 506be363fa75b04540f724644fabb7f48cd60eab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=506be36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 17 00:16:52 2012 +0200 parser: added hook for reg-id param of Contact header --- parser/contact/contact.c | 4 +++- parser/contact/contact.h | 1 + parser/parse_param.c | 4 ++++ parser/parse_param.h | 2 ++ 4 files changed, 10 insertions(+), 1 deletions(-) diff --git a/parser/contact/contact.c b/parser/contact/contact.c index 4b953f3..cc8bc5a 100644 --- a/parser/contact/contact.c +++ b/parser/contact/contact.c @@ -248,6 +248,7 @@ int parse_contacts(str* _s, contact_t** _c) c->received = hooks.contact.received; c->methods = hooks.contact.methods; c->instance = hooks.contact.instance; + c->reg_id = hooks.contact.reg_id; if (_s->len == 0) goto ok; } @@ -315,8 +316,9 @@ void print_contacts(FILE* _o, contact_t* _c) fprintf(_o, "q : %p\n", ptr->q); fprintf(_o, "expires : %p\n", ptr->expires); fprintf(_o, "received: %p\n", ptr->received); - fprintf(_o, "methods : %p\n", ptr->methods); + fprintf(_o, "methods : %p\n", ptr->methods); fprintf(_o, "instance: %p\n", ptr->instance); + fprintf(_o, "reg-id : %p\n", ptr->reg_id); fprintf(_o, "len : %d\n", ptr->len); if (ptr->params) { print_params(_o, ptr->params); diff --git a/parser/contact/contact.h b/parser/contact/contact.h index 1865bd4..71d9f50 100644 --- a/parser/contact/contact.h +++ b/parser/contact/contact.h @@ -51,6 +51,7 @@ typedef struct contact { param_t* methods; /* methods parameter hook */ param_t* received; /* received parameter hook */ param_t* instance; /* sip.instance parameter hook */ + param_t* reg_id; /* reg-id parameter hook */ param_t* params; /* List of all parameters */ int len; /* Total length of the element */ struct contact* next; /* Next contact in the list */ diff --git a/parser/parse_param.c b/parser/parse_param.c index 951d1d6..986b873 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -159,6 +159,10 @@ static inline void parse_contact_class(param_hooks_t* _h, param_t* _p) (!strncasecmp(_p->name.s + 1, "eceived", 7))) { _p->type = P_RECEIVED; _h->contact.received = _p; + } else if((_p->name.len == 6) && + (!strncasecmp(_p->name.s + 1, "eg-id", 5))) { + _p->type = P_REG_ID; + _h->contact.reg_id = _p; } break; case '+': diff --git a/parser/parse_param.h b/parser/parse_param.h index edcc62f..e0b15fd 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -62,6 +62,7 @@ typedef enum ptype { P_DSTIP, /*!< URI: dstip parameter */ P_DSTPORT, /*!< URi: dstport parameter */ P_INSTANCE, /*!< Contact: sip.instance parameter */ + P_REG_ID, /*!< Contact: reg-id parameter */ P_FTAG, /*!< URI: ftag parameter */ P_CALL_ID, /*!< Dialog event package: call-id */ P_FROM_TAG, /*!< Dialog event package: from-tag */ @@ -104,6 +105,7 @@ struct contact_hooks { struct param* methods; /*!< methods parameter */ struct param* received; /*!< received parameter */ struct param* instance; /*!< sip.instance parameter */ + struct param* reg_id; /*!< reg-id parameter */ };

1 0

git:master: kcore: added outbound tag to Supported hdr parser
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: 41e57ff7c446ec60939d6ea25c33e9d80be068c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41e57ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 16 23:42:39 2012 +0200 kcore: added outbound tag to Supported hdr parser --- lib/kcore/parse_supported.c | 7 +++++++ lib/kcore/parse_supported.h | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parse_supported.c b/lib/kcore/parse_supported.c index c30225a..eb90290 100644 --- a/lib/kcore/parse_supported.c +++ b/lib/kcore/parse_supported.c @@ -108,6 +108,13 @@ static inline int parse_supported_body(str *body, unsigned int *sup) *sup |= F_SUPPORTED_GRUU; pos += SUPPORTED_GRUU_LEN + 1; p += SUPPORTED_GRUU_LEN + 1; + } else if(pos+SUPPORTED_OUTBOUND_LEN<=len + && strncasecmp(p, SUPPORTED_OUTBOUND_STR, + SUPPORTED_OUTBOUND_LEN)==0 + && IS_DELIM(p+SUPPORTED_OUTBOUND_LEN)) { + *sup |= F_SUPPORTED_OUTBOUND; + pos += SUPPORTED_OUTBOUND_LEN + 1; + p += SUPPORTED_OUTBOUND_LEN + 1; } else { /* skip element */ for (; pos < len && !IS_DELIM(p); ++pos, ++p); diff --git a/lib/kcore/parse_supported.h b/lib/kcore/parse_supported.h index f479eb5..2a37073 100644 --- a/lib/kcore/parse_supported.h +++ b/lib/kcore/parse_supported.h @@ -45,6 +45,7 @@ #define F_SUPPORTED_TIMER (1 << 2) #define F_SUPPORTED_EVENTLIST (1 << 3) #define F_SUPPORTED_GRUU (1 << 4) +#define F_SUPPORTED_OUTBOUND (1 << 5) #define SUPPORTED_PATH_STR "path" #define SUPPORTED_PATH_LEN (sizeof(SUPPORTED_PATH_STR)-1) @@ -65,6 +66,10 @@ #define SUPPORTED_GRUU_STR "gruu" #define SUPPORTED_GRUU_LEN (sizeof(SUPPORTED_GRUU_STR)-1) +/* RFC 5626 */ +#define SUPPORTED_OUTBOUND_STR "outbound" +#define SUPPORTED_OUTBOUND_LEN (sizeof(SUPPORTED_OUTBOUND_STR)-1) + #define get_supported(p_msg) \ ((p_msg)->supported ? ((struct supported_body*)(p_msg)->supported->parsed)->supported_all : 0)

1 0

git:master: pv: use msg context id when caching the value for $TV
by Daniel-Constantin Mierla 17 Apr '12

17 Apr '12

Module: sip-router Branch: master Commit: e4972ebd926b1fea6af795f58785a2b766439e5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4972eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 23 12:53:31 2012 +0100 pv: use msg context id when caching the value for $TV - reported by Klaus Darilion --- modules_k/pv/pv_time.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index ad7dd2c..9cbc375 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -35,17 +35,15 @@ #include "pv_time.h" -static unsigned int _pv_msg_id = 0; -static int _pv_msg_pid = 0; +static msg_ctx_id_t _pv_time_msgid = { 0 }; static time_t _pv_msg_tm = 0; -static int pv_update_time(struct sip_msg *msg, time_t *t) +static int pv_update_time(sip_msg_t *msg, time_t *t) { - if(_pv_msg_id != msg->id || _pv_msg_pid != msg->pid || _pv_msg_tm==0) + if(msg_ctx_id_match(msg, &_pv_time_msgid)!=1 || _pv_msg_tm==0) { _pv_msg_tm = time(NULL); - _pv_msg_id = msg->id; - _pv_msg_pid = msg->pid; + msg_ctx_id_set(msg, &_pv_time_msgid); if(t!=NULL) *t=_pv_msg_tm; @@ -124,7 +122,7 @@ int pv_parse_strftime_name(pv_spec_p sp, str *in) } static struct tm _cfgutils_ts; -static unsigned int _cfgutils_msg_id = 0; +static msg_ctx_id_t _cfgutils_msgid = { 0 }; /** * return broken-down time attributes @@ -137,10 +135,10 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || param==NULL) return -1; - if(_cfgutils_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_cfgutils_msgid)!=1) { pv_update_time(msg, &t); - _cfgutils_msg_id = msg->id; + msg_ctx_id_set(msg, &_cfgutils_msgid); if(localtime_r(&t, &_cfgutils_ts) == NULL) { LM_ERR("unable to break time to attributes\n"); @@ -189,10 +187,10 @@ int pv_get_strftime(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || param==NULL) return -1; - if(_cfgutils_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_cfgutils_msgid)!=1) { pv_update_time(msg, &t); - _cfgutils_msg_id = msg->id; + msg_ctx_id_set(msg, &_cfgutils_msgid); if(localtime_r(&t, &_cfgutils_ts) == NULL) { LM_ERR("unable to break time to attributes\n"); @@ -267,7 +265,7 @@ int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, } static struct timeval _timeval_ts; -static unsigned int _timeval_msg_id = 0; +static msg_ctx_id_t _timeval_msgid = { 0 }; static char _timeval_ts_buf[32]; int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, @@ -282,14 +280,14 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: - if(_timeval_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_timeval_msgid)!=1) { if(gettimeofday(&_timeval_ts, NULL)!=0) { LM_ERR("unable to get time val attributes\n"); return -1; } - _timeval_msg_id = msg->id; + msg_ctx_id_set(msg, &_timeval_msgid); } return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_usec); case 2: @@ -319,14 +317,14 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, s.s = _timeval_ts_buf; return pv_get_strval(msg, param, res, &s); default: - if(_timeval_msg_id != msg->id) + if(msg_ctx_id_match(msg, &_timeval_msgid)!=1) { if(gettimeofday(&_timeval_ts, NULL)!=0) { LM_ERR("unable to get time val attributes\n"); return -1; } - _timeval_msg_id = msg->id; + msg_ctx_id_set(msg, &_timeval_msgid); } return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_sec); }

2 5

indicating gruu support
by Juha Heinanen 16 Apr '12

16 Apr '12

daniel, i noticed that master sr assumes gruu support if ua includes +sip.instance contact param in register request, because contact in 200 ok response contains gruu params. according to rfc5627 gruu support is indicated by Supported: gruu that is, +sip.instance contact param is not enough. could you fix this by making supported gruu test before adding gruu contact params in 200 ok to register request? -- juha

4 11

Strange issue with presence_xml on FreeBSD
by Olle E. Johansson 16 Apr '12

16 Apr '12

Got the following error: 0(86255) DEBUG: <core> [modparam.c:96]: set_mod_param_regex: 'presence_xml' matches module 'presence_xml' 0(86255) DEBUG: <core> [sr_module.c:763]: find_param_export: found <db_url> in module presence_xml [/usr/local/lib64/kamailio/modules_k/presence_xml.so] 0(86255) DEBUG: <core> [modparam.c:113]: set_mod_param_regex: found <db_url> in module presence_xml [/usr/local/lib64/kamailio/modules_k/presence_xml.so] 0(86255) DEBUG: <core> [mem/q_malloc.c:369]: qm_malloc(0x800c00000, 73) called from <core>: modparam.c: set_mod_param_regex(124) 0(86255) DEBUG: <core> [mem/q_malloc.c:413]: qm_malloc(0x800c00000, 80) returns address 0x800c5bde0 frag. 0x800c5bdb0 (size=80) on 1 -th hit 0(86255) DEBUG: <core> [modparam.c:96]: set_mod_param_regex: 'presence_xml' matches module 'presence_xml' 0(86255) DEBUG: <core> [sr_module.c:769]: find_param_export: parameter <db_url> not found in module <presence_xml> 0(86255) ERROR: <core> [modparam.c:151]: set_mod_param_regex: parameter <db_url> not found in module <presence_xml> First it seams to find db_url in presence_xml, then when trying to configure the parameter, it's nowhere to be found... The same applies for all other mod_params in presence_xml. Kamailio 3.2.2 on FreeBSD. I don't even know where to start looking for this. THe source code for presence_xml clearly defines db_url as a parameter. /O

2 6

git:master: tmrec(k): fix week-day handling.
by Andreas Granig 16 Apr '12

16 Apr '12

Module: sip-router Branch: master Commit: 5d03575bd73ee80e794a7f398973f84ceed63681 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d03575… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Mon Apr 16 16:47:27 2012 +0200 tmrec(k): fix week-day handling. - days of week need an offset of 1. --- modules/tmrec/period.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tmrec/period.c b/modules/tmrec/period.c index 317e7b2..c5e4407 100644 --- a/modules/tmrec/period.c +++ b/modules/tmrec/period.c @@ -69,7 +69,7 @@ static void get_time_vars(int time_vars[SCALE_MAX], time_t t) { time_vars[SCALE_MONTH] = tm.tm_mon + 1; time_vars[SCALE_WEEK] = (tm.tm_mday - 1 + (tm.tm_wday - tm.tm_mday + 1) % 7) / 7 + 1; time_vars[SCALE_MDAY] = tm.tm_mday; - time_vars[SCALE_WDAY] = tm.tm_wday; + time_vars[SCALE_WDAY] = tm.tm_wday + 1; time_vars[SCALE_YDAY] = tm.tm_yday + 1; time_vars[SCALE_HOUR] = tm.tm_hour; time_vars[SCALE_MINUTE] = tm.tm_min;

1 0

git:master: debugger: safe wrapper around cfg name
by Daniel-Constantin Mierla 16 Apr '12

16 Apr '12

Module: sip-router Branch: master Commit: 40ddcf88df9ef71bba7c182b7a1d76b559645628 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40ddcf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 16 14:03:14 2012 +0200 debugger: safe wrapper around cfg name - some actions can be executed from inside the code, with no cfg file name attached to it -- that makes debugger crash on solaris while printing executed action details - reported by Nathaniel --- modules/debugger/debugger_api.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index 7fbfd0d..bbf31a0 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -252,7 +252,7 @@ int dbg_cfg_trace(void *data) LOG_(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, _dbg_cfgtrace_prefix, " c=[%s] l=%d a=%d n=%.*s\n", - a->cfile, a->cline, a->type, an->len, an->s + ZSW(a->cfile), a->cline, a->type, an->len, ZSW(an->s) ); } } @@ -267,7 +267,7 @@ int dbg_cfg_trace(void *data) LOG(_dbg_cfgtrace_level, "breakpoint hit: p=[%u] c=[%s] l=%d a=%d n=%.*s\n", _dbg_pid_list[process_no].pid, - a->cfile, a->cline, a->type, an->len, an->s + ZSW(a->cfile), a->cline, a->type, an->len, ZSW(an->s) ); _dbg_pid_list[process_no].in.cmd = DBG_CMD_NOP; _dbg_pid_list[process_no].state = DBG_STATE_WAIT; @@ -295,7 +295,7 @@ int dbg_cfg_trace(void *data) olen = snprintf(_dbg_pid_list[process_no].out.buf, DBG_CMD_SIZE, "exec [%s:%d] a=%d n=%.*s", - a->cfile, a->cline, a->type, an->len, an->s); + ZSW(a->cfile), a->cline, a->type, an->len, ZSW(an->s)); if(olen<0) { _dbg_pid_list[process_no].out.cmd = DBG_CMD_ERR;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012