June 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

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: 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

git:master: modules/tm: new implementation of load_contacts()/next_contacts ()
by Juha Heinanen 08 Aug '11

08 Aug '11

Module: sip-router Branch: master Commit: e973bbe5e7310861f77b17ce0afaf1cca35fe48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e973bbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:38:41 2010 +0300 modules/tm: new implementation of load_contacts()/next_contacts() - Simpler implementation of load_contacts()/next_contacts() functions based on recent changes related to Request-URI handling. - Function next_contacts() does not anymore set any timers. Check contact_avp and call t_set_fr() before calling t_relay() instead. - Removed fr_timer_next module parameter, because it is not needed anymore. --- modules/tm/README | 255 ++++++++++++++------------------------ modules/tm/doc/functions.xml | 51 +++----- modules/tm/doc/params.xml | 73 ----------- modules/tm/doc/tm.xml | 15 +-- modules/tm/t_serial.c | 279 ++++++++++++------------------------------ modules/tm/tm.c | 1 - 6 files changed, 190 insertions(+), 484 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e97…

2 16

git:master: core: pkg mem size configurable form the cmd line
by Andrei Pelinescu-Onciul 18 Jul '11

18 Jul '11

Module: sip-router Branch: master Commit: 7b3a6eca7bb6dd1ca2a1395ca1e5821808ec85cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b3a6ec… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 12 21:54:07 2011 +0200 core: pkg mem size configurable form the cmd line The pkg mem size used can be configured by using the "-M" parameter on the command line, e.g.: ser -M 8 -f test.cfg # start ser with 8mb of pkg memory The default remains 4Mb. --- globals.h | 1 + main.c | 83 ++++++++++++++++++++++++++++++++++++++++++++---------------- mem/mem.c | 36 +++++++++++++++++++++----- mem/mem.h | 3 +- 4 files changed, 93 insertions(+), 30 deletions(-) diff --git a/globals.h b/globals.h index 40f7214..8b3a81d 100644 --- a/globals.h +++ b/globals.h @@ -150,6 +150,7 @@ extern int cfg_warnings; extern unsigned int msg_no; extern unsigned long shm_mem_size; +extern unsigned long pkg_mem_size; /* AVP configuration */ extern char *avp_db_url; /* db url used by user preferences (AVPs) */ diff --git a/main.c b/main.c index fcc25ae..d525fb4 100644 --- a/main.c +++ b/main.c @@ -245,6 +245,7 @@ Options:\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -m nr Size of shared memory allocated in Megabytes\n\ + -M nr Size of private memory allocated, in Megabytes\n\ -w dir Change the working directory to \"dir\" (default: \"/\")\n\ -t dir Chroot to \"dir\"\n\ -u uid Change uid \n\ @@ -273,7 +274,7 @@ void print_ct_constants() #endif */ printf("MAX_RECV_BUFFER_SIZE %d, MAX_LISTEN %d," - " MAX_URI_SIZE %d, BUF_SIZE %d, PKG_SIZE %uMB\n", + " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", MAX_RECV_BUFFER_SIZE, MAX_LISTEN, MAX_URI_SIZE, BUF_SIZE, PKG_MEM_SIZE); #ifdef USE_TCP @@ -488,6 +489,8 @@ int cfg_warnings=0; /* shared memory (in MB) */ unsigned long shm_mem_size=0; +/* private (pkg) memory (in MB) */ +unsigned long pkg_mem_size=0; /* export command-line to anywhere else */ int my_argc; @@ -590,6 +593,7 @@ void cleanup(show_status) destroy_lock_ops(); if (pid_file) unlink(pid_file); if (pgid_file) unlink(pgid_file); + destroy_pkg_mallocs(); } @@ -1750,7 +1754,52 @@ int main(int argc, char** argv) dont_fork_cnt=0; daemon_status_init(); - /*init pkg mallocs (before parsing cfg or cmd line !)*/ + /* command line options */ + options= ":f:cm:M:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" +#ifdef STATS + "s:" +#endif + ; + /* Handle special command line arguments, that must be treated before + * intializing the various subsystem or before parsing other arguments: + * - get the startup debug and log_stderr values + * - look if pkg mem size is overriden on the command line (-M) and get + * the new value here (before intializing pkg_mem). + * - look if there is a -h, e.g. -f -h construction won't be caught + * later + */ + opterr = 0; + while((c=getopt(argc,argv,options))!=-1) { + switch(c) { + case 'd': + debug_flag = 1; + default_core_cfg.debug++; + break; + case 'E': + log_stderr=1; + break; + case 'M': + pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; + if (tmp &&(*tmp)){ + fprintf(stderr, "bad private mem size number: -M %s\n", + optarg); + goto error; + }; + break; + default: + if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { + printf("version: %s\n", full_version); + printf("%s",help_msg); + exit(0); + } + break; + } + } + + /*init pkg mallocs (before parsing cfg or the rest of the cmd line !)*/ + if (pkg_mem_size) + LOG(L_INFO, " private (per process) memory: %ld bytes\n", + pkg_mem_size ); if (init_pkg_mallocs()==-1) goto error; @@ -1759,11 +1808,6 @@ int main(int argc, char** argv) "DBG_MSG_QA enabled, ser may exit abruptly\n"); #endif - options= ":f:cm:dVhEb:l:L:n:vrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" -#ifdef STATS - "s:" -#endif - ; /* init counters / stats */ if (init_counters() == -1) goto error; @@ -1773,16 +1817,6 @@ int main(int argc, char** argv) #ifdef USE_SCTP init_sctp_options(); /* set defaults before the config */ #endif - /* look if there is a -h, e.g. -f -h construction won't catch it later */ - opterr = 0; - while((c=getopt(argc,argv,options))!=-1) { - if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { - printf("version: %s\n", full_version); - printf("%s",help_msg); - exit(0); - break; - } - } /* process command line (cfg. file path etc) */ optind = 1; /* reset getopt */ /* switches required before script processing */ @@ -1808,9 +1842,12 @@ int main(int argc, char** argv) LOG(L_INFO, "ser: shared memory: %ld bytes\n", shm_mem_size ); break; + case 'M': + /* ignore it, it was parsed immediately after startup, + the pkg mem. is already initialized at this point */ + break; case 'd': - debug_flag = 1; - default_core_cfg.debug++; + /* ignore it, was parsed immediately after startup */ break; case 'V': printf("version: %s\n", full_version); @@ -1829,7 +1866,7 @@ int main(int argc, char** argv) exit(0); break; case 'E': - log_stderr=1; + /* ignore it, was parsed immediately after startup */ break; case 'O': scr_opt_lev=strtol(optarg, &tmp, 10); @@ -1974,6 +2011,7 @@ try_again: case 'f': case 'c': case 'm': + case 'M': case 'd': case 'V': case 'h': @@ -1981,7 +2019,8 @@ try_again: case 'A': break; case 'E': - log_stderr=1; // use in both getopt switches + log_stderr=1; /* use in both getopt switches, + takes priority over config */ break; case 'b': maxbuffer=strtol(optarg, &tmp, 10); @@ -2322,7 +2361,7 @@ try_again: } if (disable_core_dump) set_core_dump(0, 0); - else set_core_dump(1, shm_mem_size+PKG_MEM_POOL_SIZE+4*1024*1024); + else set_core_dump(1, shm_mem_size+pkg_mem_size+4*1024*1024); if (open_files_limit>0){ if(increase_open_fds(open_files_limit)<0){ fprintf(stderr, "ERROR: error could not increase file limits\n"); diff --git a/mem/mem.c b/mem/mem.c index a2f1b9a..1180a2a 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -26,6 +26,7 @@ #include <stdio.h> +#include <stdlib.h> #include "../config.h" #include "../dprint.h" #include "../globals.h" @@ -41,15 +42,15 @@ #ifdef PKG_MALLOC #ifndef DL_MALLOC - char mem_pool[PKG_MEM_POOL_SIZE]; + char* mem_pool = 0; #endif #ifdef F_MALLOC - struct fm_block* mem_block; + struct fm_block* mem_block = 0; #elif defined DL_MALLOC /* don't need this */ #else - struct qm_block* mem_block; + struct qm_block* mem_block = 0; #endif #endif @@ -58,18 +59,25 @@ int init_pkg_mallocs() { #ifdef PKG_MALLOC /*init mem*/ + #ifndef DL_MALLOC + if (pkg_mem_size == 0) + pkg_mem_size = PKG_MEM_POOL_SIZE; + mem_pool = malloc(pkg_mem_size); + #endif #ifdef F_MALLOC - mem_block=fm_malloc_init(mem_pool, PKG_MEM_POOL_SIZE); + if (mem_pool) + mem_block=fm_malloc_init(mem_pool, pkg_mem_size); #elif DL_MALLOC /* don't need this */ #else - mem_block=qm_malloc_init(mem_pool, PKG_MEM_POOL_SIZE); + if (mem_pool) + mem_block=qm_malloc_init(mem_pool, pkg_mem_size); #endif #ifndef DL_MALLOC if (mem_block==0){ LOG(L_CRIT, "could not initialize memory pool\n"); - fprintf(stderr, "Too much pkg memory demanded: %d\n", - PKG_MEM_POOL_SIZE ); + fprintf(stderr, "Too much pkg memory demanded: %ld bytes\n", + pkg_mem_size); return -1; } #endif @@ -79,6 +87,20 @@ int init_pkg_mallocs() +void destroy_pkg_mallocs() +{ +#ifdef PKG_MALLOC + #ifndef DL_MALLOC + if (mem_pool) { + free(mem_pool); + mem_pool = 0; + } + #endif +#endif /* PKG_MALLOC */ +} + + + int init_shm_mallocs(int force_alloc) { #ifdef SHM_MEM diff --git a/mem/mem.h b/mem/mem.h index aed1442..510698a 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -58,7 +58,7 @@ extern struct qm_block* mem_block; # endif - extern char mem_pool[PKG_MEM_POOL_SIZE]; + extern char* mem_pool; # ifdef DBG_QM_MALLOC @@ -133,6 +133,7 @@ #endif int init_pkg_mallocs(); +void destroy_pkg_mallocs(); int init_shm_mallocs(int force_alloc); /*! generic logging helper for allocation errors in private memory pool/ system */

3 2

git:master: Increase callid length to varchar(255) in acc table.
by Jon Bonilla 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: aa28b8db51cb426d284a71debfb75965722c16a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa28b8d… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Thu Jun 30 18:36:37 2011 +0200 Increase callid length to varchar(255) in acc table. --- lib/srdb1/schema/acc.xml | 2 +- utils/kamctl/db_berkeley/kamailio/version | 8 ++------ utils/kamctl/db_sqlite/acc-create.sql | 2 +- utils/kamctl/dbtext/kamailio/version | 4 +--- utils/kamctl/mysql/acc-create.sql | 2 +- utils/kamctl/oracle/acc-create.sql | 2 +- utils/kamctl/postgres/acc-create.sql | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/srdb1/schema/acc.xml b/lib/srdb1/schema/acc.xml index 3d3d344..cabe9ba 100644 --- a/lib/srdb1/schema/acc.xml +++ b/lib/srdb1/schema/acc.xml @@ -54,7 +54,7 @@ <name>callid</name> <type>string</type> <natural/> - <size>&domain_len;</size> + <size>&description_len;</size> <default/> <description>Call-ID header field uniquely identifies a particular invitation or all registrations of a particular client. </description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index c533ac2..6c2ac06 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -16,10 +16,10 @@ address| address|4 aliases| aliases|1004 -carrier_name| -carrier_name|1 carrierfailureroute| carrierfailureroute|2 +carrier_name| +carrier_name|1 carrierroute| carrierroute|3 cpl| @@ -68,8 +68,6 @@ matrix| matrix|1 missed_calls| missed_calls|3 -mtree| -mtree|1 pdt| pdt|1 presentity| @@ -94,8 +92,6 @@ subscriber| subscriber|6 trusted| trusted|5 -uacreg| -uacreg|1 uri| uri|1 userblacklist| diff --git a/utils/kamctl/db_sqlite/acc-create.sql b/utils/kamctl/db_sqlite/acc-create.sql index 4d23363..09b0da3 100644 --- a/utils/kamctl/db_sqlite/acc-create.sql +++ b/utils/kamctl/db_sqlite/acc-create.sql @@ -4,7 +4,7 @@ CREATE TABLE acc ( method VARCHAR(16) DEFAULT '' NOT NULL, from_tag VARCHAR(64) DEFAULT '' NOT NULL, to_tag VARCHAR(64) DEFAULT '' NOT NULL, - callid VARCHAR(64) DEFAULT '' NOT NULL, + callid VARCHAR(255) DEFAULT '' NOT NULL, sip_code VARCHAR(3) DEFAULT '' NOT NULL, sip_reason VARCHAR(32) DEFAULT '' NOT NULL, time TIMESTAMP WITHOUT TIME ZONE NOT NULL diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 4410f97..1bd5e62 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -3,8 +3,8 @@ acc:4 active_watchers:9 address:4 aliases:1004 -carrier_name:1 carrierfailureroute:2 +carrier_name:1 carrierroute:3 cpl:1 dbaliases:1 @@ -29,7 +29,6 @@ lcr_rule_target:1 location:1004 matrix:1 missed_calls:3 -mtree:1 pdt:1 presentity:3 pua:6 @@ -42,7 +41,6 @@ sip_trace:2 speed_dial:2 subscriber:6 trusted:5 -uacreg:1 uri:1 userblacklist:1 usr_preferences:2 diff --git a/utils/kamctl/mysql/acc-create.sql b/utils/kamctl/mysql/acc-create.sql index 17f272c..7a2fafa 100644 --- a/utils/kamctl/mysql/acc-create.sql +++ b/utils/kamctl/mysql/acc-create.sql @@ -4,7 +4,7 @@ CREATE TABLE acc ( method VARCHAR(16) DEFAULT '' NOT NULL, from_tag VARCHAR(64) DEFAULT '' NOT NULL, to_tag VARCHAR(64) DEFAULT '' NOT NULL, - callid VARCHAR(64) DEFAULT '' NOT NULL, + callid VARCHAR(255) DEFAULT '' NOT NULL, sip_code VARCHAR(3) DEFAULT '' NOT NULL, sip_reason VARCHAR(32) DEFAULT '' NOT NULL, time DATETIME NOT NULL diff --git a/utils/kamctl/oracle/acc-create.sql b/utils/kamctl/oracle/acc-create.sql index fbcb946..c9c4b75 100644 --- a/utils/kamctl/oracle/acc-create.sql +++ b/utils/kamctl/oracle/acc-create.sql @@ -4,7 +4,7 @@ CREATE TABLE acc ( method VARCHAR2(16) DEFAULT '', from_tag VARCHAR2(64) DEFAULT '', to_tag VARCHAR2(64) DEFAULT '', - callid VARCHAR2(64) DEFAULT '', + callid VARCHAR2(255) DEFAULT '', sip_code VARCHAR2(3) DEFAULT '', sip_reason VARCHAR2(32) DEFAULT '', time DATE diff --git a/utils/kamctl/postgres/acc-create.sql b/utils/kamctl/postgres/acc-create.sql index b8e1f53..4e4c252 100644 --- a/utils/kamctl/postgres/acc-create.sql +++ b/utils/kamctl/postgres/acc-create.sql @@ -4,7 +4,7 @@ CREATE TABLE acc ( method VARCHAR(16) DEFAULT '' NOT NULL, from_tag VARCHAR(64) DEFAULT '' NOT NULL, to_tag VARCHAR(64) DEFAULT '' NOT NULL, - callid VARCHAR(64) DEFAULT '' NOT NULL, + callid VARCHAR(255) DEFAULT '' NOT NULL, sip_code VARCHAR(3) DEFAULT '' NOT NULL, sip_reason VARCHAR(32) DEFAULT '' NOT NULL, time TIMESTAMP WITHOUT TIME ZONE NOT NULL

1 0

git:master: tmx: new pseudo-variable class $T(name)
by Daniel-Constantin Mierla 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: 793a3d362a31aeba402b481896176368e6d13ee7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=793a3d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 30 15:55:49 2011 +0200 tmx: new pseudo-variable class $T(name) - retrieve transaction related attributes - name can be: - id_label - internal transaction label - id_index - internal transaction index - branch_index - return the current branch index in transaction (alias to $T_branch_idx) - reply_code - the winning reply code currently set for transaction (alias to $T_reply_code) --- modules_k/tmx/t_var.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/tmx/t_var.h | 3 ++ modules_k/tmx/tmx_mod.c | 2 + 3 files changed, 73 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index 7f537ff..ff78f45 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -444,3 +444,71 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_parse_t_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 8: + if(strncmp(in->s, "id_label", 8)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "id_index", 8)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + case 10: + if(strncmp(in->s, "reply_code", 10)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else goto error; + break; + case 12: + if(strncmp(in->s, "branch_index", 12)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + return -1; + +} + +int pv_get_t(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + tm_cell_t *t; + + if(msg==NULL || param==NULL) + return -1; + + /* aliases to old TM pvs */ + switch(param->pvn.u.isname.name.n) + { + case 2: + return pv_get_tm_reply_code(msg, param, res); + case 3: + return pv_get_tm_branch_idx(msg, param, res); + } + + t = _tmx_tmb.t_gett(); + if(t==NULL || t==T_UNDEFINED) { + /* no T */ + return pv_get_null(msg, param, res); + } + switch(param->pvn.u.isname.name.n) + { + case 1: + return pv_get_uintval(msg, param, res, t->label); + default: + return pv_get_uintval(msg, param, res, t->hash_index); + } +} diff --git a/modules_k/tmx/t_var.h b/modules_k/tmx/t_var.h index 414bfb2..0d2e431 100644 --- a/modules_k/tmx/t_var.h +++ b/modules_k/tmx/t_var.h @@ -41,4 +41,7 @@ int pv_get_tm_branch_idx(struct sip_msg *msg, pv_param_t *param, int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_t(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_parse_t_name(pv_spec_p sp, str *in); #endif diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 8a36352..9bbd98c 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -121,6 +121,8 @@ static pv_export_t mod_pvs[] = { pv_parse_t_var_name, 0, 0, 0 }, { {"T_rpl", sizeof("T_rpl")-1}, PVT_OTHER, pv_get_t_var_rpl, 0, pv_parse_t_var_name, 0, 0, 0 }, + { {"T", sizeof("T")-1}, PVT_OTHER, pv_get_t, 0, + pv_parse_t_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

1 0

git:master: db_mysql: search also for mysql_config5 in Makefile
by Daniel-Constantin Mierla 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: d0858edd95726117d2ccc9567b9f7bf012204448 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0858ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 30 15:54:42 2011 +0200 db_mysql: search also for mysql_config5 in Makefile - on some OSes, the mysql_config tool might have the name mysql_config5 --- modules/db_mysql/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index d71ca94..6c7c01c 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -14,6 +14,9 @@ DEFS +=-DSER_MOD_INTERFACE ifeq ($(CROSS_COMPILE),) MYSQLCFG=$(shell which mysql_config) +ifeq ($(MYSQLCFG),) +MYSQLCFG=$(shell which mysql_config5) +endif endif ifneq ($(MYSQLCFG),)

1 0

git:master: pdt(k): removed add/delete mi commands
by Elena-Ramona Modroiu 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: a32f948029dcd9f5875d6244b5d4c2efd23a1b88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a32f948… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Thu Jun 30 15:50:14 2011 +0200 pdt(k): removed add/delete mi commands - pdt_add and pdt_delete were just insert/delete sql queries followed by internal call of pdt_reload, creating unecessary code maintenace, thus they were removed. SQL queries can be executed directly from terminal and then pdt_reload to get same functionality --- modules_k/pdt/README | 60 ++++++--------------------------------- modules_k/pdt/doc/pdt_admin.xml | 56 +----------------------------------- 2 files changed, 10 insertions(+), 106 deletions(-) diff --git a/modules_k/pdt/README b/modules_k/pdt/README index e306acc..4523390 100644 --- a/modules_k/pdt/README +++ b/modules_k/pdt/README @@ -48,10 +48,8 @@ Elena-Ramona Modroiu 5. Exported MI Functions - 5.1. pdt_add - 5.2. pdt_delete - 5.3. pdt_list - 5.4. pdt_reload + 5.1. pdt_list + 5.2. pdt_reload 6. Installation and Running @@ -99,10 +97,8 @@ Chapter 1. Admin Guide 5. Exported MI Functions - 5.1. pdt_add - 5.2. pdt_delete - 5.3. pdt_list - 5.4. pdt_reload + 5.1. pdt_list + 5.2. pdt_reload 6. Installation and Running @@ -148,8 +144,7 @@ sip:12391001@mydomain.com => sip:91001@alpha.org adding/deleting prefix-domain pairs or reloading from database at runtime. * Sample shell scripts to manage prefix-domain pairs are also located - in './doc/' (pdt_fifo_add.sh, pdt_fifo_delete.sh, - pdt_fifo_list.sh). + in './doc/' (pdt_fifo_list.sh). 2. Dependencies @@ -351,10 +346,8 @@ prefix2domain(); 5. Exported MI Functions - 5.1. pdt_add - 5.2. pdt_delete - 5.3. pdt_list - 5.4. pdt_reload + 5.1. pdt_list + 5.2. pdt_reload The database is loaded by Kamailio at start up time. The module uses only the cache to look up domains. If you want to add or delete a new @@ -362,42 +355,7 @@ prefix2domain(); changes made via these commands are applied to database and the cache is updated correspondingly. -5.1. pdt_add - - Adds a new sdomain-prefix-domain entry. - - Name: pdt_add - - Parameters: - * _sdomain_ : source domain - * _prefix_: prefix - * _domain_: domain corresponding to a pair of source domain and - prefix - - MI FIFO Command Format: - :pdt_add:_reply_fifo_file_ - _sdomain_ - _prefix_ - _domain_ - _empty_line_ - -5.2. pdt_delete - - Removes a sdomain-prefix-domain entry. - - Name: pdt_delete - - Parameters: - * _sdomain_ : a source domain - * _domain_: a domain associated via a prefix with the source domain - - MI FIFO Command Format: - :pdt_delete:_reply_fifo_file_ - _sdomain_ - _domain_ - _empty_line_ - -5.3. pdt_list +5.1. pdt_list Produces a listing of the entries prefixes/domains/sdomains. @@ -428,7 +386,7 @@ prefix2domain(); * “pdt_list . 2 open” : Lists the entries where sdomain is anything, prefix starts with '2' and domain starts with 'open'. -5.4. pdt_reload +5.2. pdt_reload Reload all sdomain-prefix-domain records from database. diff --git a/modules_k/pdt/doc/pdt_admin.xml b/modules_k/pdt/doc/pdt_admin.xml index cf4270d..230b82e 100644 --- a/modules_k/pdt/doc/pdt_admin.xml +++ b/modules_k/pdt/doc/pdt_admin.xml @@ -80,7 +80,7 @@ sip:12391001@mydomain.com => sip:91001@alpha.org <listitem> <para> Sample shell scripts to manage prefix-domain pairs are also located - in './doc/' (pdt_fifo_add.sh, pdt_fifo_delete.sh, pdt_fifo_list.sh). + in './doc/' (pdt_fifo_list.sh). </para> </listitem> </itemizedlist> @@ -425,60 +425,6 @@ prefix2domain(); <section> <title> - <function moreinfo="none">pdt_add</function> - </title> - <para> - Adds a new sdomain-prefix-domain entry. - </para> - <para> - Name: <emphasis>pdt_add</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para>_sdomain_ : source domain</para></listitem> - <listitem><para>_prefix_: prefix</para></listitem> - <listitem><para>_domain_: domain corresponding to a pair of source domain and prefix</para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :pdt_add:_reply_fifo_file_ - _sdomain_ - _prefix_ - _domain_ - _empty_line_ - </programlisting> - </section> - - <section> - <title> - <function moreinfo="none">pdt_delete</function> - </title> - <para> - Removes a sdomain-prefix-domain entry. - </para> - <para> - Name: <emphasis>pdt_delete</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para>_sdomain_ : a source domain</para></listitem> - <listitem><para>_domain_: a domain associated via a prefix with the source domain</para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :pdt_delete:_reply_fifo_file_ - _sdomain_ - _domain_ - _empty_line_ - </programlisting> - </section> - - <section> - <title> <function moreinfo="none">pdt_list</function> </title> <para>

1 0

git:master: pdt(k): restructured sources
by Elena-Ramona Modroiu 30 Jun '11

30 Jun '11

Module: sip-router Branch: master Commit: ecf769e633bf4401782ccbff3a216291105b8cf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecf769e… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Thu Jun 30 15:44:50 2011 +0200 pdt(k): restructured sources - prepared for adding rpc commands to replace mi - mi commands moved in a dedicated file for now - removed unnecesary mi commads to simplify maintenance --- modules_k/pdt/pdt.c | 454 ++++-------------------------------------------- modules_k/pdt/pdt_mi.c | 283 ++++++++++++++++++++++++++++++ modules_k/pdt/pdtree.c | 41 ++++- modules_k/pdt/pdtree.h | 12 +- 4 files changed, 358 insertions(+), 432 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ecf…

1 0