sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: usrloc(k): corrected non-gruu db insert with multidomain

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2e8264a3edb70cf08071b82915bcd2a40aec0cde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e8264a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 15 22:44:52 2012 +0200 usrloc(k): corrected non-gruu db insert with multidomain - if +sip.instance parameter in contact was missing and multidomain was enabled, then inserted values didn't match proper columns - reported by Juha Heinanen --- modules_k/usrloc/ucontact.c | 21 ++++++++++++++------- modules_k/usrloc/udomain.c | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index f8cbbe8..ff6b37f 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -510,21 +510,23 @@ int db_insert_ucontact(ucontact_t* _c) if(_c->ruid.len>0) { - keys[nr_cols] = &ruid_col; vals[nr_cols].type = DB1_STR; vals[nr_cols].nul = 0; vals[nr_cols].val.str_val = _c->ruid; - nr_cols++; + } else { + vals[nr_cols].nul = 1; } + nr_cols++; if(_c->instance.len>0) { - keys[nr_cols] = &instance_col; vals[nr_cols].type = DB1_STR; vals[nr_cols].nul = 0; vals[nr_cols].val.str_val = _c->instance; - nr_cols++; + } else { + vals[nr_cols].nul = 1; } + nr_cols++; if (use_domain) { vals[nr_cols].type = DB1_STR; @@ -541,7 +543,7 @@ int db_insert_ucontact(ucontact_t* _c) } nr_cols++; } - + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; @@ -672,15 +674,20 @@ int db_update_ucontact(ucontact_t* _c) vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->ruid; - nr_cols2++; + } else { + vals2[nr_cols2].nul = 1; } + nr_cols2++; + if(_c->instance.len>0) { vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->instance; - nr_cols2++; + } else { + vals2[nr_cols2].nul = 1; } + nr_cols2++; if (use_domain) { vals1[3].type = DB1_STR; diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index 82a1dc5..31e27cf 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -412,7 +412,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) return -1; } } else { - if (ul_dbf.query(_c, 0, 0, 0, columns, 0, (use_domain)?(15):(14), 0, + if (ul_dbf.query(_c, 0, 0, 0, columns, 0, (use_domain)?(17):(16), 0, &res) < 0) { LM_ERR("db_query failed\n"); return -1;

12 years, 7 months

git:master: registrar(k): added initial support for GRUU - RFC 5627

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fd9fe6e683ca3c446daa043035072a379f9b11bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd9fe6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 13 14:45:06 2012 +0200 registrar(k): added initial support for GRUU - RFC 5627 - save() and lookup() recognize now the GRUU cases - save() generates both pub-gruu and temp-gruu, sending them in the Contact headers for 200 reply - lookup() will match on GRUU if it is the case, resulting to a Contact address only (no additional branches) --- modules_k/registrar/Makefile | 1 + modules_k/registrar/README | 14 +++ modules_k/registrar/common.c | 37 ++++--- modules_k/registrar/common.h | 4 +- modules_k/registrar/doc/registrar_admin.xml | 17 +++ modules_k/registrar/lookup.c | 141 +++++++++++++++++++++++---- modules_k/registrar/reg_mod.c | 9 ++ modules_k/registrar/regpv.c | 2 +- modules_k/registrar/reply.c | 121 ++++++++++++++++++++++- modules_k/registrar/reply.h | 2 +- modules_k/registrar/save.c | 69 ++++++++++---- 11 files changed, 356 insertions(+), 61 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fd9…

12 years, 7 months

git:master: lib/srdb1: allow null for instance column in location

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fc7090be626304145813e90eb6a86f2200db31f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc7090b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 15 22:36:14 2012 +0200 lib/srdb1: allow null for instance column in location --- lib/srdb1/schema/aliases.xml | 3 ++- lib/srdb1/schema/location.xml | 3 ++- utils/kamctl/db_berkeley/kamailio/aliases | 2 +- utils/kamctl/db_berkeley/kamailio/location | 2 +- utils/kamctl/db_sqlite/registrar-create.sql | 2 +- utils/kamctl/db_sqlite/usrloc-create.sql | 2 +- utils/kamctl/dbtext/kamailio/aliases | 2 +- utils/kamctl/dbtext/kamailio/location | 2 +- utils/kamctl/mysql/registrar-create.sql | 2 +- utils/kamctl/mysql/usrloc-create.sql | 2 +- utils/kamctl/oracle/registrar-create.sql | 2 +- utils/kamctl/oracle/usrloc-create.sql | 2 +- utils/kamctl/postgres/registrar-create.sql | 2 +- utils/kamctl/postgres/usrloc-create.sql | 2 +- 14 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/srdb1/schema/aliases.xml b/lib/srdb1/schema/aliases.xml index 42d7353..d5bad5a 100644 --- a/lib/srdb1/schema/aliases.xml +++ b/lib/srdb1/schema/aliases.xml @@ -166,7 +166,8 @@ <name>instance</name> <type>string</type> <size>&hf_len;</size> - <default/> + <null/> + <default><null/></default> <description>The value of SIP instance parameter for GRUU.</description> </column> diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index 8446a7e..ddf0b48 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -166,7 +166,8 @@ <name>instance</name> <type>string</type> <size>&hf_len;</size> - <default/> + <null/> + <default><null/></default> <description>The value of SIP instance parameter for GRUU.</description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/aliases b/utils/kamctl/db_berkeley/kamailio/aliases index 4c52503..87bf7d5 100644 --- a/utils/kamctl/db_berkeley/kamailio/aliases +++ b/utils/kamctl/db_berkeley/kamailio/aliases @@ -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|'' +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 diff --git a/utils/kamctl/db_berkeley/kamailio/location b/utils/kamctl/db_berkeley/kamailio/location index 4c52503..87bf7d5 100644 --- a/utils/kamctl/db_berkeley/kamailio/location +++ b/utils/kamctl/db_berkeley/kamailio/location @@ -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|'' +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 diff --git a/utils/kamctl/db_sqlite/registrar-create.sql b/utils/kamctl/db_sqlite/registrar-create.sql index 12dc621..27a4d8f 100644 --- a/utils/kamctl/db_sqlite/registrar-create.sql +++ b/utils/kamctl/db_sqlite/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT 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 e771f9c..5d80120 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT 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 290e75a..29c4968 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) +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) diff --git a/utils/kamctl/dbtext/kamailio/location b/utils/kamctl/dbtext/kamailio/location index 290e75a..29c4968 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) +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) diff --git a/utils/kamctl/mysql/registrar-create.sql b/utils/kamctl/mysql/registrar-create.sql index 63f6ac5..54d143f 100644 --- a/utils/kamctl/mysql/registrar-create.sql +++ b/utils/kamctl/mysql/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT 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 9223a12..3e86737 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT 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 fcb2a3f..9ba6898 100644 --- a/utils/kamctl/oracle/registrar-create.sql +++ b/utils/kamctl/oracle/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - instance VARCHAR2(255) DEFAULT '' + instance VARCHAR2(255) DEFAULT NULL ); CREATE OR REPLACE TRIGGER aliases_tr diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 1394f77..144c859 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - instance VARCHAR2(255) DEFAULT '' + instance VARCHAR2(255) DEFAULT NULL ); CREATE OR REPLACE TRIGGER location_tr diff --git a/utils/kamctl/postgres/registrar-create.sql b/utils/kamctl/postgres/registrar-create.sql index 4ce36a0..b8889a2 100644 --- a/utils/kamctl/postgres/registrar-create.sql +++ b/utils/kamctl/postgres/registrar-create.sql @@ -17,7 +17,7 @@ CREATE TABLE aliases ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT 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 f4b1e82..c972d71 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -17,7 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - instance VARCHAR(255) DEFAULT '' NOT NULL + instance VARCHAR(255) DEFAULT NULL ); CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

12 years, 7 months

git:master: registrar(k): fix of lookup condition for non-gruu addresses

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f420472cac12459b1c7f8d9d9e45f46f1387484f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f420472… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 15 12:17:21 2012 +0200 registrar(k): fix of lookup condition for non-gruu addresses - reported by Juha Heinanen --- modules_k/registrar/lookup.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 62b76d7..123b642 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -161,15 +161,23 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) if(VALID_CONTACT(ptr,act_time)) { if(allowed_method(_m,ptr)) { /* match on instance, if pub-gruu */ - if(inst.len>0 - && reg_cmp_instances(&inst, &ptr->instance)==0) - { - /* found by instance */ - LM_DBG("contact for [%.*s] found by pub gruu [%.*s]\n", - aor.len, ZSW(aor.s), inst.len, inst.s); + if(inst.len>0) { + if(reg_cmp_instances(&inst, &ptr->instance)==0) + { + /* pub-gruu - found by instance */ + LM_DBG("contact for [%.*s] found by pub gruu [%.*s]\n", + aor.len, ZSW(aor.s), inst.len, inst.s); + break; + } + } else { + /* no-gruu - found by address */ + LM_DBG("contact for [%.*s] found by address\n", + aor.len, ZSW(aor.s)); break; } } else { + LM_DBG("contact for [%.*s] cannot handle the SIP method\n", + aor.len, ZSW(aor.s)); ret = -2; } } @@ -177,6 +185,7 @@ int lookup(struct sip_msg* _m, udomain_t* _d, str* _uri) } if (ptr==0) { /* nothing found */ + LM_DBG("'%.*s' has no valid contact in usrloc\n", aor.len, ZSW(aor.s)); goto done; } } else {

12 years, 7 months

[tracker] Comment added: pua_reginfo: registration state may be incorrect when unregistering single contact

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#213 - pua_reginfo: registration state may be incorrect when unregistering single contact User who did this - stefan sayer (sayer) ---------- btw: only tested in kamailio-3.2.0+lucid1, but usrloc_cb.c has not changed compared to master. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=213#comment516 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

[tracker] Task opened: pua_reginfo: registration state may be incorrect when unregistering single contact (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - stefan sayer (sayer) Attached to Project - sip-router Summary - pua_reginfo: registration state may be incorrect when unregistering single contact Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - when unregistering a single contact, the state of the registration may be incorrectly reported as 'active'. the attached patch also fixes a small inefficiency of repeatedly calling time(2) in the same function. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=213 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

[tracker] Assignee added: pua_reginfo: registration state may be incorrect when unregistering single contact

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#213 - pua_reginfo: registration state may be incorrect when unregistering single contact User who did this - stefan sayer (sayer) http://sip-router.org/tracker/index.php?do=details&task_id=213 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

[tracker] Assignee added: pua_reginfo callid XML string assignment small bug

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#212 - pua_reginfo callid XML string assignment small bug User who did this - stefan sayer (sayer) http://sip-router.org/tracker/index.php?do=details&task_id=212 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

[tracker] Task opened: pua_reginfo callid XML string assignment small bug (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - stefan sayer (sayer) Attached to Project - sip-router Summary - pua_reginfo callid XML string assignment small bug Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - small bug when constructing XML for reginfo may lead to incorrect UTF-8 string, thus truncated PUBLISH body. fixed by attached patch. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=212 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 7 months

[ openser-Feature Requests-3518147 ] OxJdNi <a href="http://qmailkamjbhk.com/">qmailkamjbhk</a>,

by SourceForge.net

Feature Requests item #3518147, was opened at 2012-04-15 04:58 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3518147&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: core Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: OxJdNi <a href="http://qmailkamjbhk.com/">qmailkamjbhk</a>, Initial Comment: OxJdNi <a href="http://qmailkamjbhk.com/">qmailkamjbhk</a>, [url=http://krtolfvoepuy.com/]krtolfvoepuy[/url], [link=http://irodaerxllsc.com/]irodaerxllsc[/link], http://xybziwcksnhl.com/ ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3518147&group_…

12 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012