August 2011 - sr-dev - kamailio.org

[tracker] Assignee added: Assignment operators don't work
by sip-router 29 May '26

29 May '26

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#100 - Assignment operators don't work User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=100 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.

10 9

git:master: pv: use suip2a(...) for $snd(..)
by Daniel-Constantin Mierla 04 Dec '25

04 Dec '25

Module: sip-router Branch: master Commit: e151a9e99b1fed7805eaed5d16ca3d6466e1f517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e151a9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 18 22:37:07 2011 +0200 pv: use suip2a(...) for $snd(..) - fixes FS#140, reported by Klaus Darilion --- modules_k/pv/pv_branch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index a9dd1bc..4081429 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -395,7 +395,7 @@ int pv_get_sndto(struct sip_msg *msg, pv_param_t *param, (int)snd_inf->len); default: /* 0 - ip */ - s.s = su2a(snd_inf->to, sizeof(*snd_inf->to)); + s.s = suip2a(snd_inf->to, sizeof(*snd_inf->to)); s.len = strlen(s.s); return pv_get_strval(msg, param, res, &s); }

2 1

IMS branch
by Klaus Darilion 11 Oct '11

11 Oct '11

Hi! Carsten, Jason, I wonder what is the main motivation for you to have IMS components? Are you using Kamailio in an mobile operator environment and thus have to support all the IMS interfaces, or do you plan to use those modules also in "normal" VoIP provider scenarios (benefits?) Thanks Klaus

4 6

git:master: utils: Add database creation scripts for dialog variable table
by Timo Reimann 07 Oct '11

07 Oct '11

Module: sip-router Branch: master Commit: ec21c13b86139f10d2280fe75a7ba15f3e30a83a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec21c13… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 16 20:33:06 2011 +0200 utils: Add database creation scripts for dialog variable table (dialog_vars). --- utils/kamctl/db_berkeley/kamailio/dialog_vars | 10 ++++++++++ utils/kamctl/db_sqlite/dialog-vars-create.sql | 11 +++++++++++ utils/kamctl/dbtext/kamailio/dialog_vars | 1 + utils/kamctl/mysql/dialog-vars-create.sql | 11 +++++++++++ utils/kamctl/oracle/dialog-vars-create.sql | 19 +++++++++++++++++++ utils/kamctl/postgres/dialog-vars-create.sql | 11 +++++++++++ 6 files changed, 63 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/dialog_vars b/utils/kamctl/db_berkeley/kamailio/dialog_vars new file mode 100644 index 0000000..1b66d4e --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/dialog_vars @@ -0,0 +1,10 @@ +METADATA_COLUMNS +id(int) hash_entry(int) hash_id(int) dialog_key(str) dialog_value(str) +METADATA_KEY +1 2 +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|NIL|NIL|NIL|NIL diff --git a/utils/kamctl/db_sqlite/dialog-vars-create.sql b/utils/kamctl/db_sqlite/dialog-vars-create.sql new file mode 100644 index 0000000..860a87d --- /dev/null +++ b/utils/kamctl/db_sqlite/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id INTEGER PRIMARY KEY NOT NULL, + hash_entry INTEGER NOT NULL, + hash_id INTEGER NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) NOT NULL +) ENGINE=MyISAM; + +CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/dbtext/kamailio/dialog_vars b/utils/kamctl/dbtext/kamailio/dialog_vars new file mode 100644 index 0000000..d39ef42 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/dialog_vars @@ -0,0 +1 @@ +id(int,auto) hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string) diff --git a/utils/kamctl/mysql/dialog-vars-create.sql b/utils/kamctl/mysql/dialog-vars-create.sql new file mode 100644 index 0000000..c8787e6 --- /dev/null +++ b/utils/kamctl/mysql/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + hash_entry INT(10) UNSIGNED NOT NULL, + hash_id INT(10) UNSIGNED NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) NOT NULL +) ENGINE=MyISAM; + +CREATE INDEX hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/oracle/dialog-vars-create.sql b/utils/kamctl/oracle/dialog-vars-create.sql new file mode 100644 index 0000000..9dbaea7 --- /dev/null +++ b/utils/kamctl/oracle/dialog-vars-create.sql @@ -0,0 +1,19 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id NUMBER(10) PRIMARY KEY, + hash_entry NUMBER(10), + hash_id NUMBER(10), + dialog_key VARCHAR2(128), + dialog_value VARCHAR2(512) +); + +CREATE OR REPLACE TRIGGER dialog_vars_tr +before insert on dialog_vars FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END dialog_vars_tr; +/ +BEGIN map2users('dialog_vars'); END; +/ +CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id); + diff --git a/utils/kamctl/postgres/dialog-vars-create.sql b/utils/kamctl/postgres/dialog-vars-create.sql new file mode 100644 index 0000000..ccc7d68 --- /dev/null +++ b/utils/kamctl/postgres/dialog-vars-create.sql @@ -0,0 +1,11 @@ +INSERT INTO version (table_name, table_version) values ('dialog_vars','1'); +CREATE TABLE dialog_vars ( + id SERIAL PRIMARY KEY NOT NULL, + hash_entry INTEGER NOT NULL, + hash_id INTEGER NOT NULL, + dialog_key VARCHAR(128) NOT NULL, + dialog_value VARCHAR(512) +); + +CREATE INDEX dialog_vars_hash_idx ON dialog_vars (hash_entry, hash_id); +

2 3

multiple values in mtree modes
by Juha Heinanen 15 Sep '11

15 Sep '11

daniel, if i have understood correctly, current mtree implementation does not allow more than one value per node (prefix) in the three. it some cases it might make sense to have more that one value. for example, if an mtree is used to map telephone numbers to values, one could have: prefix value 0046 sweden 0046 nordic country 0046 eu member 0046 european country 00375 belarus 00375 european country and when a telephone number, such as 004692345678 or 0037592345678 is matched, all values that the prefix has, would be assigned to an avp. is is ok for you as author of mtree module, if i try to extend it so that a prefix could be associated with more than one value? -- juha

2 5

git:master: modules_k/nathelper: add_contact_alias adds <> s around contact URI
by Juha Heinanen 07 Sep '11

07 Sep '11

Module: sip-router Branch: master Commit: 3ff9594a30eff2d18e6ea0595c5f82f878eaca1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ff9594… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. (cherry picked from commit f5ef15fee0c3bf09adf2506effa0895f72af9034) --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 51c1086..52c5e5f 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

3 13

Re: [sr-dev] [SR-Users] db_mysql "Commands out of sync; you can't run this command now "
by Alex Hermann 06 Sep '11

06 Sep '11

On Sunday 28 August 2011, MÉSZÁROS Mihály wrote: > I attached the log file. > If you need detailed log/higher log level, then please let me know. usrloc seems to be using the same connection from multiple processes: pid: 18389 and 18391, connection: 0xb7387d5c Aug 28 12:40:10 hal /usr/sbin/kamailio[18389]: INFO: db_mysql [km_dbase.c:83]: submit_query: con: 0xb7387d5c table: location query: select contact,expires,q,callid,cseq,flags,cflags,user_agent,received,path,socket,methods,last_modified from location where username='mutf-hd' order by q Aug 28 12:40:10 hal /usr/sbin/kamailio[18391]: INFO: db_mysql [km_dbase.c:83]: submit_query: con: 0xb7387d5c table: location query: select contact,expires,q,callid,cseq,flags,cflags,user_agent,received,path,socket,methods,last_modified from location where username='ppke-vjk' order by q Aug 28 12:40:10 hal /usr/sbin/kamailio[18389]: INFO: db_mysql [km_dbase.c:177]: store_result: con: 0xb7387d5c table: location Aug 28 12:40:10 hal /usr/sbin/kamailio[18389]: INFO: db_mysql [km_dbase.c:83]: submit_query: con: 0xb7387d5c table: location query: update location set expires='2011-08-28 12:45:10',q=-1.00 ,cseq=2,flags=0,cflags=0,user_agent='Polycom HDX 8000 HD (Release - 3.0.2.1-17007)',received=NULL,path=NULL,socket='tcp:195.111.192.7:5060',methods=24575,last_modified='2011-08-28 12:40:10' where username='mutf-hd' AND contact='sip:mutf-hd@193.225.216.28:5060;transport=tcp' AND callid='3533311123-1752' Aug 28 12:40:10 hal /usr/sbin/kamailio[18391]: INFO: db_mysql [km_dbase.c:177]: store_result: con: 0xb7387d5c table: location Aug 28 12:40:10 hal /usr/sbin/kamailio[18391]: INFO: db_mysql [km_dbase.c:83]: submit_query: con: 0xb7387d5c table: location query: insert into location Aug 28 12:40:10 hal /usr/sbin/kamailio[18389]: INFO: db_mysql [km_dbase.c:83]: submit_query: con: 0xb7387d5c table: location query: select contact,expires,q,callid,cseq,flags,cflags,user_agent,received,path,socket,methods,last_modified from location where username='de-tek-hpc' order by q Aug 28 12:40:10 hal /usr/sbin/kamailio[18389]: ERROR: db_mysql [km_dbase.c:131]: driver error on query: Commands out of sync; you can't run this command now It probably needs a fix like below because mod_init has also created a db connection which is inherited by at least one child and ul_dbh is not 0 anymore. That process needs to be excluded from opening a database connection, all other childs need to open their own DB connection. I just don't know what rank mod_init is run as and thus don't know which process to exclude. Maybe some other dev can jump in. diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index b3a9499..ca50b01 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -378,7 +378,7 @@ static int child_init(int _rank) break; } - if (!ul_dbh) + if (rank != PROC_MAIN) ul_dbh = ul_dbf.init(&db_url); /* Get a new database connection */ if (!ul_dbh) { LM_ERR("child(%d): failed to connect to database\n", _rank);

3 13

git:alexh/master: core: allow negative decimal numbers in configuration file parser
by Alex Hermann 02 Sep '11

02 Sep '11

Module: sip-router Branch: alexh/master Commit: 99f314429cea4341240836e9c9d62c38176eae12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99f3144… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 5 15:32:14 2011 +0200 core: allow negative decimal numbers in configuration file parser --- cfg.lex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index ff35a8a..ecf92db 100644 --- a/cfg.lex +++ b/cfg.lex @@ -525,7 +525,7 @@ NUM_ID {ALPHANUM}+ HEX [0-9a-fA-F] HEXNUMBER 0x{HEX}+ OCTNUMBER 0[0-7]+ -DECNUMBER 0|([1-9]{DIGIT}*) +DECNUMBER 0|(-?[1-9]{DIGIT}*) BINNUMBER [0-1]+b HEX4 {HEX}{1,4} IPV6ADDR ({HEX4}":"){7}{HEX4}|({HEX4}":"){1,7}(":"{HEX4}){1,7}|":"(":"{HEX4}){1,7}|({HEX4}":"){1,7}":"|"::"

2 2

Bug and fix in app_lua module
by Hugh Waite 31 Aug '11

31 Aug '11

Hello, I've discovered a copy-and-paste error in the app_lua module where it checks that modules are loaded for the registrar functions. This bug is visible if the registrar module is exported but the maxfwd module is not. Patch is attached. Regards, Hugh -- -- Hugh Waite Senior Design Engineer Crocodile RCS Ltd.

2 1

git:master: app_lua: fixed copy-and-paste error in loadin registrar API
by Daniel-Constantin Mierla 31 Aug '11

31 Aug '11

Module: sip-router Branch: master Commit: da79de336c13dca23ad6cfd13c961ec1ebee7e46 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da79de3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 31 23:49:14 2011 +0200 app_lua: fixed copy-and-paste error in loadin registrar API - patch by Hugh Waite --- modules/app_lua/app_lua_exp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 5662843..46061e7 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -1026,9 +1026,9 @@ static int lua_sr_registrar_save(lua_State *L) flags = 0; env_L = sr_lua_env_get(); - if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MAXFWD)) + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_REGISTRAR)) { - LM_WARN("weird: maxfwd function executed but module not registered\n"); + LM_WARN("weird: registrar function executed but module not registered\n"); return app_lua_return_error(L); } if(env_L->msg==NULL) @@ -1067,9 +1067,9 @@ static int lua_sr_registrar_lookup(lua_State *L) env_L = sr_lua_env_get(); - if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MAXFWD)) + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_REGISTRAR)) { - LM_WARN("weird: maxfwd function executed but module not registered\n"); + LM_WARN("weird: registrar function executed but module not registered\n"); return app_lua_return_error(L); } if(env_L->msg==NULL)

1 0