sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
192 discussions

git:4.1:29c81c48: registrar: fix backport f2d23c1a038703
by Victor Seva 08 Aug '15

08 Aug '15

Module: kamailio Branch: 4.1 Commit: 29c81c48b06c349c36f88f06404e7d3f93397be6 URL: https://github.com/kamailio/kamailio/commit/29c81c48b06c349c36f88f06404e7d3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-08T08:01:23+02:00 registrar: fix backport f2d23c1a038703 --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/29c81c48b06c349c36f88f06404e7d3… Patch: https://github.com/kamailio/kamailio/commit/29c81c48b06c349c36f88f06404e7d3… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index ef0e700..9f100ca 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -322,7 +322,6 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.received = path_received; } - ci.server_id = server_id; if(_m->contact) { _c = (((contact_body_t*)_m->contact->parsed)->contacts); if(_c->instance!=NULL && _c->instance->body.len>0) {

1 0

[kamailio] Kamailio not compatible with registration refresh by lax UAs (#280)
by Ben Langfeld 07 Aug '15

07 Aug '15

First, a spec reference: https://tools.ietf.org/html/rfc3261#section-10.2.4 > A UA SHOULD use the same Call-ID for all registrations during a single boot cycle. On the surface is is then reasonable for Kamailio to default to contact lookup by contact and Call-ID. It does, however, [default to contact only lookup](http://kamailio.org/docs/modules/4.2.x/modules/usrloc.html#usrloc.p…. In a repeat registration scenario like this: ~15:32:28 ``` REGISTER sip:ben-test.callix.com.br SIP/2.0 Call-ID: aa26998a7a2648a6243a11eda51a3aa6(a)172.31.31.221 CSeq: 2 REGISTER From: <sip:destination_007@ben-test.callix.com.br>;tag=61616278_117e27da_7c77d0dd_13a609f6-c985-463b-b43f-ac43090d221e To: <sip:destination_007@ben-test.callix.com.br> Max-Forwards: 70 Contact: <sip:destination_007@172.31.31.221:5080> User-Agent: Callix/Click2Call Expires: 180 Via: SIP/2.0/UDP chandler.localdomain:5080;branch=z9hG4bK13a609f6-c985-463b-b43f-ac43090d221e_7c77d0dd_e6dd0acb-255f-4c1c-afe6-67a360a7f581 Authorization: Digest username="destination_007",realm="ben-test.callix.com.br",nonce="VcItt1XCLIsaLIdqq1Uo9wYmRIbpfQhP",uri="sip:ben-test.callix.com.br",response="0a014dd4613deb4b89fc9457d43d5cee" Route: <sip:registrar.oneclick.callix.com.br;lr> Content-Length: 0 SIP/2.0 200 OK Call-ID: aa26998a7a2648a6243a11eda51a3aa6(a)172.31.31.221 CSeq: 2 REGISTER From: <sip:destination_007@ben-test.callix.com.br>;tag=61616278_117e27da_7c77d0dd_13a609f6-c985-463b-b43f-ac43090d221e To: <sip:destination_007@ben-test.callix.com.br>;tag=b27e1a1d33761e85846fc98f5f3a7e58.73ee Via: SIP/2.0/UDP chandler.localdomain:5080;branch=z9hG4bK13a609f6-c985-463b-b43f-ac43090d221e_7c77d0dd_e6dd0acb-255f-4c1c-afe6-67a360a7f581;received=172.31.31.221 Contact: <sip:destination_007@172.31.31.221:5080>;expires=180 Supported: outbound Server: kamailio (4.1.6 (x86_64/linux)) Content-Length: 0 ``` ~15:34:28 ``` REGISTER sip:ben-test.callix.com.br SIP/2.0 Call-ID: d6a13584901f0336dd9f877f125f1574(a)172.31.31.221 CSeq: 2 REGISTER From: <sip:destination_007@ben-test.callix.com.br>;tag=10060555_117e27da_7c77d0dd_13a609f6-c985-463b-b43f-ac43090d221e To: <sip:destination_007@ben-test.callix.com.br> Max-Forwards: 70 Contact: <sip:destination_007@172.31.31.221:5080> User-Agent: Callix/Click2Call Expires: 180 Via: SIP/2.0/UDP chandler.localdomain:5080;branch=z9hG4bK13a609f6-c985-463b-b43f-ac43090d221e_7c77d0dd_4c667124-f13e-4bae-b637-4f19472bd417 Authorization: Digest username="destination_007",realm="ben-test.callix.com.br",nonce="VcIuMFXCLQQbB0Z4Q92WkVEu4iM2wjU3",uri="sip:ben-test.callix.com.br",response="8161b70052e50a5e3f51a843080c1eac" Route: <sip:registrar.oneclick.callix.com.br;lr> Content-Length: 0 SIP/2.0 200 OK Call-ID: d6a13584901f0336dd9f877f125f1574(a)172.31.31.221 CSeq: 2 REGISTER From: <sip:destination_007@ben-test.callix.com.br>;tag=10060555_117e27da_7c77d0dd_13a609f6-c985-463b-b43f-ac43090d221e To: <sip:destination_007@ben-test.callix.com.br>;tag=b27e1a1d33761e85846fc98f5f3a7e58.6229 Via: SIP/2.0/UDP chandler.localdomain:5080;branch=z9hG4bK13a609f6-c985-463b-b43f-ac43090d221e_7c77d0dd_4c667124-f13e-4bae-b637-4f19472bd417;received=172.31.31.221 Contact: <sip:destination_007@172.31.31.221:5080>;expires=180 Supported: outbound Server: kamailio (4.1.6 (x86_64/linux)) Content-Length: 0 ``` I see the following queries in the Kamailio logs: ``` Aug 5 15:32:28 lexington /usr/sbin/kamailio[12366]: DEBUG: db_postgres [km_dbase.c:230]: db_postgres_submit_query(): sending query ok: 0x7fc5155669a0 (1) - [insert into location (username,contact,expires,q,callid,cseq,flags,cflags,user_agent,received,path,socket,methods,last_modified,ruid,instance,reg_id,domain ) values ('destination_007','sip:destination_007@172.31.31.221:5080','2015-08-05 15:35:28',-1.00 ,'aa26998a7a2648a6243a11eda51a3aa6(a)172.31.31.221',2,0,0,'Callix/Click2Call',NULL,NULL,'udp:172.31.26.82:5060',NULL,'2015-08-05 15:32:28','uloc-55c220c7-304e-96',NULL,0,'ben-test.callix.com.br')] Aug 5 15:34:28 lexington /usr/sbin/kamailio[12364]: DEBUG: db_postgres [km_dbase.c:230]: db_postgres_submit_query(): sending query ok: 0x7fc5155669a0 (2) - [select contact,expires,q,callid,cseq,flags,cflags,user_agent,received,path,socket,methods,last_modified,ruid,instance,reg_id from location where username='destination_007' AND domain='ben-test.callix.com.br' order by q] Aug 5 15:34:28 lexington /usr/sbin/kamailio[12364]: DEBUG: db_postgres [km_dbase.c:230]: db_postgres_submit_query(): sending query ok: 0x7fc5155669a0 (1) - [update location set expires='2015-08-05 15:37:28',q=-1.00 ,cseq=2,flags=0,cflags=0,user_agent='Callix/Click2Call',received=NULL,path=NULL,socket='udp:172.31.26.82:5060',methods=NULL,last_modified='2015-08-05 15:34:28',ruid='uloc-55c220c7-304e-96',instance=NULL,reg_id=0,contact='sip:destination_007@172.31.31.221:5080' where username='destination_007' AND contact='sip:destination_007@172.31.31.221:5080' AND callid='d6a13584901f0336dd9f877f125f1574(a)172.31.31.221' AND domain='ben-test.callix.com.br'] ``` Evidently the contact-only nature of usrloc lookup is not being respected when a follow-up registration is attempted. This means that every pre-expiry registration for a static contact from a UA which does not comply with RFC3621's normative `SHOULD` will silently fail. This is not a big deal; most do comply and I could fix mine to comply. What is a bigger deal is that if the UA is restarted, it is not to be reasonably expected to maintain the same CallID. It will use a new CallID (precisely the same way as my "faulty" UA does) on its first registration. If this occurs while there is an active registration for the same Contact, this new registration will effectively be ignored. I *think*, though I'm likely to be corrected, that we should only be including the CallID in the UPDATE's WHERE clause if we used it in the SELECT and got a result. In my "faulty" UA case, this would at least leave me with duplicate registrations rather than 0 registrations. I could then follow the normative `SHOULD` and eliminate the duplication. Caveat that I have only tested with usrloc's `dbmode` parameter as `3`. I am using Postgres. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/280

4 12

[kamailio] can we change database primary keys from serial int to uuid (#274)
by mading087 07 Aug '15

07 Aug '15

I'm trying to finish developing a kamailio server cluster using database replication (db_mode=3). One of the issues is "split brain" when there is network connection problem that prevents the database servers from replicating data to each other for some time. This is especially bad for the serial int type primary keys defined in current kamailio tables. When there is a conflict in serial int primary keys, the record with the latest timestamp would win, but that record may not always be the correct one, or may not even for the same user. It seem the best solution to this problem is to use globally unique id as primary key instead of serial int. I have tried to change the id in location table from serial int to uuid, and tested with pjsib clients. Things seem to work. uuid is supported by most common databases now (postgresql and mysql at least). Wonder if it is a good idea to change all serial int to uuid for all kamailio tables. I didn't verify all modules, but it seems the db modules can handle all db types without any code change. If I missed anything, or there is some spot we need to make code change, please let me know. Here is the change I made to location table (postgresql). current id: id SERIAL PRIMARY KEY NOT NULL, to: id UUID PRIMARY KEY DEFAULT gen_random_uuid(), --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/274

3 4

[kamailio] registrar: max_contacts logic fails when REGISTER contact has sip.instance (#278)
by Victor Seva 07 Aug '15

07 Aug '15

``` modparam("registrar", "max_contacts", 1) ``` Two REGISTERS with the same sip.instace+reg_id should produce an update, but: ``` 2015/08/06 20:26:33.903451 127.0.0.1:5061 -> 127.0.0.1:5060 REGISTER sip:127.0.0.1 SIP/2.0 Via: SIP/2.0/UDP 172.17.0.4:5061;branch=z9hG4bK-28433-1-0 From: <sip:3000@127.0.0.1>;tag=1 To: <sip:3000@127.0.0.1> Call-ID: 1-28433(a)172.17.0.4 CSeq: 1 REGISTER Contact: <sip:3000@127.0.0.1:5061>; reg-id=1;+sip.instance="<urn:uuid:C3DD6013-3000-40E3-8EA2-5849B02ED0C4>" Max-Forwards: 10 Expires: 120 User-Agent: SIPp/Win32 Content-Length: 0 (null) (null) 127.0.0.1:5060 -> 127.0.0.1:5061 SIP/2.0 200 OK Via: SIP/2.0/UDP 172.17.0.4:5061;branch=z9hG4bK-28433-1-0;received=127.0.0.1 From: <sip:3000@127.0.0.1>;tag=1 To: <sip:3000@127.0.0.1>;tag=b27e1a1d33761e85846fc98f5f3a7e58.2c14 Call-ID: 1-28433(a)172.17.0.4 CSeq: 1 REGISTER Contact: <sip:3000@127.0.0.1:5061>;expires=30;+sip.instance="<urn:uuid:C3DD6013-3000-40E3-8EA2-5849B02ED0C4>";reg-id=1 Server: kamailio (4.3.0 (x86_64/linux)) Content-Length: 0 2015/08/06 20:26:34.315096 127.0.0.1:5061 -> 127.0.0.1:5060 REGISTER sip:127.0.0.1 SIP/2.0 Via: SIP/2.0/UDP 172.17.0.4:5061;branch=z9hG4bK-28437-1-0 From: <sip:3000@127.1.0.1>;tag=1 To: <sip:3000@127.1.0.1> Call-ID: 1-28437(a)172.17.0.4 CSeq: 1 REGISTER Contact: <sip:3000@127.1.0.1:5061>; reg-id=1;+sip.instance="<urn:uuid:C3DD6013-3000-40E3-8EA2-5849B02ED0C4>" Max-Forwards: 10 Expires: 120 User-Agent: SIPp/Win32 Content-Length: 0 (null) (null) 127.0.0.1:5060 -> 127.0.0.1:5061 SIP/2.0 503 Service Unavailable Via: SIP/2.0/UDP 172.17.0.4:5061;branch=z9hG4bK-28437-1-0;received=127.0.0.1 From: <sip:3000@127.1.0.1>;tag=1 To: <sip:3000@127.1.0.1>;tag=b27e1a1d33761e85846fc98f5f3a7e58.2dc6 Call-ID: 1-28437(a)172.17.0.4 CSeq: 1 REGISTER Contact: <sip:3000@127.0.0.1:5061>;expires=29;+sip.instance="<urn:uuid:C3DD6013-3000-40E3-8EA2-5849B02ED0C4>";reg-id=1 P-Registrar-Error: Too many registered contacts Server: kamailio (4.3.0 (x86_64/linux)) Content-Length: 0 ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/278

2 6

git:4.2:5b62b14c: registrar: get instance and ref_id when using msg
by Victor Seva 07 Aug '15

07 Aug '15

Module: kamailio Branch: 4.2 Commit: 5b62b14c0655bfff77359d1169b31f74a354783f URL: https://github.com/kamailio/kamailio/commit/5b62b14c0655bfff77359d1169b31f7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-07T11:30:15+02:00 registrar: get instance and ref_id when using msg needed for check max_contacts properly if sip.instance exists as contact parameter See: #278 (cherry picked from commit 99ce64fc555cc0b6b0189d812c6156cb05fb2e1b) --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/5b62b14c0655bfff77359d1169b31f7… Patch: https://github.com/kamailio/kamailio/commit/5b62b14c0655bfff77359d1169b31f7… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index a3a5b29..32c2c10 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -322,6 +322,22 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.received = path_received; } + ci.server_id = server_id; + if(_m->contact) { + _c = (((contact_body_t*)_m->contact->parsed)->contacts); + if(_c->instance!=NULL && _c->instance->body.len>0) { + ci.instance = _c->instance->body; + LM_DBG("set instance[%.*s]\n", ci.instance.len, ci.instance.s); + } + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) + { + LM_ERR("invalid reg-id value\n"); + goto error; + } + } + } + allow_parsed = 0; /* not parsed yet */ received_found = 0; /* not found yet */ m = _m; /* remember the message */

1 0

git:4.1:f2d23c1a: registrar: get instance and ref_id when using msg
by Victor Seva 07 Aug '15

07 Aug '15

Module: kamailio Branch: 4.1 Commit: f2d23c1a038703e37a32dd5ea75d9b442e2fbc93 URL: https://github.com/kamailio/kamailio/commit/f2d23c1a038703e37a32dd5ea75d9b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-07T11:31:20+02:00 registrar: get instance and ref_id when using msg needed for check max_contacts properly if sip.instance exists as contact parameter See: #278 (cherry picked from commit 99ce64fc555cc0b6b0189d812c6156cb05fb2e1b) --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/f2d23c1a038703e37a32dd5ea75d9b4… Patch: https://github.com/kamailio/kamailio/commit/f2d23c1a038703e37a32dd5ea75d9b4… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index fd5471b..ef0e700 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -322,6 +322,22 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig ci.received = path_received; } + ci.server_id = server_id; + if(_m->contact) { + _c = (((contact_body_t*)_m->contact->parsed)->contacts); + if(_c->instance!=NULL && _c->instance->body.len>0) { + ci.instance = _c->instance->body; + LM_DBG("set instance[%.*s]\n", ci.instance.len, ci.instance.s); + } + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) + { + LM_ERR("invalid reg-id value\n"); + goto error; + } + } + } + allow_parsed = 0; /* not parsed yet */ received_found = 0; /* not found yet */ m = _m; /* remember the message */

1 0

git:4.3:a2b8efe1: registrar: get instance and ref_id when using msg
by Victor Seva 07 Aug '15

07 Aug '15

Module: kamailio Branch: 4.3 Commit: a2b8efe1c24a213ef6c4221a59af544a3873e9d2 URL: https://github.com/kamailio/kamailio/commit/a2b8efe1c24a213ef6c4221a59af544… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-07T11:28:35+02:00 registrar: get instance and ref_id when using msg needed for check max_contacts properly if sip.instance exists as contact parameter See: #278 (cherry picked from commit 99ce64fc555cc0b6b0189d812c6156cb05fb2e1b) --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/a2b8efe1c24a213ef6c4221a59af544… Patch: https://github.com/kamailio/kamailio/commit/a2b8efe1c24a213ef6c4221a59af544… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index ae311e8..1ebb849 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -307,6 +307,20 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } ci.server_id = server_id; + if(_m->contact) { + _c = (((contact_body_t*)_m->contact->parsed)->contacts); + if(_c->instance!=NULL && _c->instance->body.len>0) { + ci.instance = _c->instance->body; + LM_DBG("set instance[%.*s]\n", ci.instance.len, ci.instance.s); + } + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) + { + LM_ERR("invalid reg-id value\n"); + goto error; + } + } + } allow_parsed = 0; /* not parsed yet */ received_found = 0; /* not found yet */

1 0

git:master:e5ec5a44: Merge pull request #279 from kamailio/vseva/registrar_max_contacts_instance
by Victor Seva 07 Aug '15

07 Aug '15

Module: kamailio Branch: master Commit: e5ec5a443aaec732390bae6247fe561ea312b709 URL: https://github.com/kamailio/kamailio/commit/e5ec5a443aaec732390bae6247fe561… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-07T11:27:42+02:00 Merge pull request #279 from kamailio/vseva/registrar_max_contacts_instance registrar: ci_pack, get instance and ref_id when using msg --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/e5ec5a443aaec732390bae6247fe561… Patch: https://github.com/kamailio/kamailio/commit/e5ec5a443aaec732390bae6247fe561… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index ae311e8..1ebb849 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -307,6 +307,20 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } ci.server_id = server_id; + if(_m->contact) { + _c = (((contact_body_t*)_m->contact->parsed)->contacts); + if(_c->instance!=NULL && _c->instance->body.len>0) { + ci.instance = _c->instance->body; + LM_DBG("set instance[%.*s]\n", ci.instance.len, ci.instance.s); + } + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) + { + LM_ERR("invalid reg-id value\n"); + goto error; + } + } + } allow_parsed = 0; /* not parsed yet */ received_found = 0; /* not found yet */

1 0

git:master:99ce64fc: registrar: get instance and ref_id when using msg
by Victor Seva 07 Aug '15

07 Aug '15

Module: kamailio Branch: master Commit: 99ce64fc555cc0b6b0189d812c6156cb05fb2e1b URL: https://github.com/kamailio/kamailio/commit/99ce64fc555cc0b6b0189d812c6156c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-08-06T20:39:19+02:00 registrar: get instance and ref_id when using msg needed for check max_contacts properly if sip.instance exists as contact parameter See: #278 --- Modified: modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/99ce64fc555cc0b6b0189d812c6156c… Patch: https://github.com/kamailio/kamailio/commit/99ce64fc555cc0b6b0189d812c6156c… --- diff --git a/modules/registrar/save.c b/modules/registrar/save.c index ae311e8..1ebb849 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -307,6 +307,20 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } ci.server_id = server_id; + if(_m->contact) { + _c = (((contact_body_t*)_m->contact->parsed)->contacts); + if(_c->instance!=NULL && _c->instance->body.len>0) { + ci.instance = _c->instance->body; + LM_DBG("set instance[%.*s]\n", ci.instance.len, ci.instance.s); + } + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) + { + LM_ERR("invalid reg-id value\n"); + goto error; + } + } + } allow_parsed = 0; /* not parsed yet */ received_found = 0; /* not found yet */

1 0

[kamailio] registrar: get instance and ref_id when using msg (#279)
by Victor Seva 07 Aug '15

07 Aug '15

needed for check max_contacts properly if sip.instance exists as contact parameter See: #278 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/279 -- Commit Summary -- * registrar: get instance and ref_id when using msg -- File Changes -- M modules/registrar/save.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/279.patch https://github.com/kamailio/kamailio/pull/279.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/279

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2015