sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

MSLIO module issue in Kamailio3.1 behind NAT

by Coca

Hi list, I have Kamailio running behind NAT. (Amazon EC2) When I use mslio module, storing messages for offline contact is working fine, however the stored messages are never sent to the contacts when they get online. My configuration is as below. Any kind of help will be great appreciated. Thank you! ---------------------------------------------------------------------------------------------------------------------- loadmodule "msilo.so" ... modparam("msilo", "add_date", 0) modparam("msilo", "db_url",DBURL) ... route[REGISTRAR] { if (is_method("REGISTER")) { if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); # uncomment next line to do SIP NAT pinging setbflag(FLB_NATSIPPING); } $avp(s:fu) = $fu; $var(initialregister) = 1; if( registered("location")){ $var(initialregister) = 0; } if (!save("location")) sl_reply_error(); if( !is_present_hf("Expires") || $(hdr(Expires){s.int})!=0 && $var(initialregister)==1 ){ # Send messages recieved while offline if (m_dump("$fu")){ xlog("L_INFO", "offline messages dumped for $avp(s:fu) \n"); } else{ xlog("L_INFO", "no offline messages dumped for $avp(s:fu) \n"); } } exit; } } # USER location service route[LOCATION] { if (!lookup("location")) { switch ($rc) { case -1: ... if (is_method("MESSAGE")) { $var(m_store_owner) = $tu; if (m_store("$var(m_store_owner)")) { xlog("L_INFO", "(MSILO_STORE) offline message stored for $var(m_store_owner)\n"); if (!t_reply("202", "Accepted")) sl_reply_error(); } else { xlog("L_ERR","BUG: dropped an offline MESSAGE: M=$rm S=$rs D=$rr F=$fu T=$tu IP=$si ID=$ci UA=$ua Txt=$rb"); if (!t_reply("503", "Service Unavailable")) sl_reply_error(); }; } exit; case -3: t_newtran(); t_reply("404", "Not Found"); exit; case -2: sl_send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } }

12 years, 9 months

git:master: core: support for receiving requests > 64kb on TCP

by Peter Dunkley

Module: sip-router Branch: master Commit: 3c9a176bac4878983d324ce82354cd844b916373 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c9a176… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Mon Jul 25 10:53:10 2011 +0100 core: support for receiving requests > 64kb on TCP - Issue found and fixed by Andrew Miller at Crocodile RCS --- tcp_options.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tcp_options.c b/tcp_options.c index 734f9fb..122965a 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -114,7 +114,7 @@ static cfg_def_t tcp_cfg_def[] = { "accept TCP messges without Content-Lenght "}, /* internal and/or "fixed" versions of some vars (not supposed to be writeable, read will provide only debugging value*/ - { "rd_buf_size", CFG_VAR_INT | CFG_ATOMIC, 512, 65536, 0, 0, + { "rd_buf_size", CFG_VAR_INT | CFG_ATOMIC, 512, 16777216, 0, 0, "internal read buffer size (should be > max. expected datagram)"}, { "wq_blk_size", CFG_VAR_INT | CFG_ATOMIC, 1, 65535, 0, 0, "internal async write block size (debugging use only for now)"},

12 years, 9 months

git:master: modules/tm: Added support for requests > 32 kb over TCP

by Peter Dunkley

Module: sip-router Branch: master Commit: c128a347602c2dc96e8138484e908b2700dd6824 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c128a34… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Mon Jul 25 10:50:38 2011 +0100 modules/tm: Added support for requests > 32 kb over TCP - Issue found and fixed by Andrew Miller at Crocodile RCS --- modules/tm/h_table.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 905e2dd..30a60e1 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -168,7 +168,7 @@ typedef struct retr_buf volatile unsigned short flags; /* DISABLED, T2 */ volatile unsigned char t_active; /* timer active */ unsigned short branch; /* no more then 65k branches :-) */ - short buffer_len; + int buffer_len; char *buffer; /*the cell that contains this retrans_buff*/ struct cell* my_T;

12 years, 9 months

Call is terminated in callee side after 36s @Kamailio 3.1 @debian sqeeze64

by Coca

Hi List, I have a Kamailio3.1 server and RTPProxy running in WAN. The calls between UA will automatically terminated in Callee UA side 36s after connected, while no one sends a BYE. While Kamailio and UA are in LAN at all , everything is just working well. Is it my rtpproxy doesn't working correctly or something else is wrong? What can I do to fix it. Any hint?? BTW, Kamailio is installed following official guide http://www.kamailio.org/dokuwiki/doku.php/install:kamailio-3.1.x-from-git The kamailio.cfg wasn't changed at all except for below: ----------------------------------------------------------------------------------------- 1) adding the following lines: #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_NAT 2)uncommenting the line below in route[REGISTRAR], setbflag(FLB_NATSIPPING); 3)change rtpproxy port corresponding modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:22222") ----------------------------------------------------------------------------------------- and my rtpproxy1.2.1 was installed by apt-get install rtpproxy, with 1) /etc/default/rtpproxy changed into: # Defaults for rtpproxy # The control socket. #CONTROL_SOCK="unix:/var/run/rtpproxy/rtpproxy.sock" # To listen on an UDP socket, uncomment this line: CONTROL_SOCK=udp:127.0.0.1:22222 LISTEN_ADDR=xx.xx.xx.xx # Additional options that are passed to the daemon. EXTRA_OPTS="-l ${LISTEN_ADDR}" 2) and started by rtpproxy -l xx.xx.xx.xx -s udp:localhost:22222 -u kamailio Your help will be great appreciated. Coca

12 years, 9 months

[tracker] Comment added: Add additional tm callbacks

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#124 - Add additional tm callbacks User who did this - Timo Reimann (tr) ---------- Unfortunately, I do not have a patch since I didn't know where to call these callbacks from in the code. Logically, I'd want the first callback (TMCB_REQUEST_OUT) to be triggered just after a request has been sent. That is, the message is gone, there is no way to modify it anymore (just like 1.5's TMCB_REQUEST_BUILT callback). TMCB_REQUEST_READY, on the contrary, should be executed right before the message is sent. IMHO, it's OK if you are *not* allowed to change the message anymore (as with 1.5's TMCB_REQUEST_PRE_OUT). FWIW, there's already a TMCB_RESPONSE_READY callback in Sip-Router. Let me know if you need any further input. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=124#comment246 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, 9 months

git:master: modules_k/pv: Add s. sql transformation to turn PV into suitable SQL value.

by Alex Hermann

Module: sip-router Branch: master Commit: b1b9d7c41189428671fa03efe88b657a6ae78b12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1b9d7c… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Jul 21 15:24:09 2011 +0200 modules_k/pv: Add s.sql transformation to turn PV into suitable SQL value. This transformation outputs valid SQL values for various PV values: - <null> values are output as NULL - integers are output as integers - everything else is output as quoted and escaped string Example: $var(null) = $null; $avp(null) = $null; $avp(str) = "String with \ illegal \\characters"; $avp(nr) = 12345; $avp(strnr) = "12345"; xlog("$$rm = $rm = $(rm{s.sql})"); xlog("$$var(null) = $var(null) = $(var(null){s.sql})"); xlog("$$avp(null) = $avp(null) = $(avp(null){s.sql})"); xlog("$$avp(str) = $avp(str) = $(avp(str){s.sql})"); xlog("$$avp(nr) = $avp(nr) = $(avp(nr){s.sql})"); xlog("$$avp(strnr) = $avp(strnr) = $(avp(strnr){s.sql})"); Output: $rm = ACK = 'ACK' $var(null) = 0 = 0 $avp(null) = <null> = NULL $avp(str) = String with \ illegal \characters = 'String with \\ illegal \\characters' $avp(nr) = 12345 = 12345 $avp(strnr) = 12345 = '12345' --- modules_k/pv/pv_trans.c | 31 ++++++++++++++++++++++++++++++- modules_k/pv/pv_trans.h | 2 +- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 8cb59f4..7b7b564 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -54,6 +54,7 @@ /*! transformation buffer */ static char _tr_buffer[TR_BUFFER_SIZE]; +static str _tr_null = { "NULL", 4 }; /*! @@ -73,7 +74,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t v, w; void *vp; - if(val==NULL || val->flags&PV_VAL_NULL) + if(val==NULL || (val->flags&PV_VAL_NULL && subtype != TR_S_SQL)) return -1; switch(subtype) @@ -593,6 +594,31 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; break; + case TR_S_SQL: + if (val->flags&PV_VAL_NULL) { + val->flags = PV_VAL_STR; + val->rs = _tr_null; + break; + } + if(val->flags&PV_TYPE_INT || !(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + val->flags = PV_VAL_STR; + break; + } + if(val->rs.len>TR_BUFFER_SIZE/2-1) { + LM_ERR("escape buffer to short"); + return -1; + } + _tr_buffer[0] = '\''; + i = escape_common(_tr_buffer+1, val->rs.s, val->rs.len); + _tr_buffer[++i] = '\''; + _tr_buffer[++i] = '\0'; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1353,6 +1379,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==3 && strncasecmp(name.s, "md5", 3)==0) { t->subtype = TR_S_MD5; goto done; + } else if(name.len==3 && strncasecmp(name.s, "sql", 3)==0) { + t->subtype = TR_S_SQL; + goto done; } else if(name.len==7 && strncasecmp(name.s, "tolower", 7)==0) { t->subtype = TR_S_TOLOWER; goto done; diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 0938ddc..2cd2fd0 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -40,7 +40,7 @@ enum _tr_s_subtype { TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, - TR_S_TIMEFORMAT + TR_S_TIMEFORMAT, TR_S_SQL }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

12 years, 9 months

git:master: core: Add fixup_pvar_uint helper function

by Alex Hermann

Module: sip-router Branch: master Commit: e11893c8a7abdd68b1186afc6a7b8594aee19c69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e11893c… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Jun 10 12:56:11 2011 +0200 core: Add fixup_pvar_uint helper function --- mod_fix.c | 17 +++++++++++++++++ mod_fix.h | 3 +++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 0ff29d9..8ea5211 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -395,6 +395,23 @@ int fixup_free_pvar_str_str(void** param, int param_no) } +int fixup_pvar_uint(void** param, int param_no) +{ + if (param_no == 1) + return fixup_pvar_all(param, param_no); + else if (param_no == 2) + return fixup_uint_uint(param, param_no); + return E_UNSPEC; +} + + +int fixup_free_pvar_uint(void** param, int param_no) +{ + if (param_no == 1) + return fixup_free_pvar_all(param, param_no); + return E_UNSPEC; +} + FIXUP_F2FP(igp_null, 1, 1, 1, FPARAM_INT|FPARAM_PVS, 0) FIXUP_F2FP(igp_igp, 1, 2, 2, FPARAM_INT|FPARAM_PVS, 0) diff --git a/mod_fix.h b/mod_fix.h index ec395b4..9c06bc5 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -105,6 +105,9 @@ int fixup_free_pvar_str(void** param, int param_no); int fixup_pvar_str_str(void** param, int param_no); int fixup_free_pvar_str_str(void** param, int param_no); +int fixup_pvar_uint(void** param, int param_no); +int fixup_free_pvar_uint(void** param, int param_no); + int fixup_igp_igp(void** param, int param_no); int fixup_free_igp_igp(void** param, int param_no); int fixup_igp_null(void** param, int param_no);

12 years, 9 months

git:master: modules_k/uac: fix reg_ht_get_byuser when domain is not used.

by Alex Hermann

Module: sip-router Branch: master Commit: a28c9c753f7012d50183f467452cabd35c210580 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a28c9c7… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Jun 3 16:12:19 2011 +0200 modules_k/uac: fix reg_ht_get_byuser when domain is not used. --- modules_k/uac/uac_reg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/uac/uac_reg.c b/modules_k/uac/uac_reg.c index d2677c1..21a8c08 100644 --- a/modules_k/uac/uac_reg.c +++ b/modules_k/uac/uac_reg.c @@ -381,6 +381,8 @@ reg_uac_t *reg_ht_get_byuser(str *user, str *domain) { return it->r; } + } else { + return it->r; } } it = it->next;

12 years, 9 months

git:master: modules_k/uac: Allow all type of PV' s for uac auth_*_avp instead of just AVP's

by Alex Hermann

Module: sip-router Branch: master Commit: 0c3664778b50bee82c39194334729123164dcdf6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c36647… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Jun 3 12:24:12 2011 +0200 modules_k/uac: Allow all type of PV's for uac auth_*_avp instead of just AVP's Keep the parameter names as *_avp to keep backwards compatibility even though the names make no sense anymore. --- modules_k/uac/auth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/auth.c b/modules_k/uac/auth.c index 8fb8853..18a0cf1 100644 --- a/modules_k/uac/auth.c +++ b/modules_k/uac/auth.c @@ -432,7 +432,7 @@ int uac_auth( struct sip_msg *msg) /* can we authenticate this realm? */ crd = 0; /* first look into AVP, if set */ - if ( auth_realm_spec.type==PVT_AVP ) + if ( auth_realm_spec.type!=PVT_NONE ) crd = get_avp_credential( msg, &auth.realm ); /* if not found, look into predefined credentials */ if (crd==0)

12 years, 9 months

git:master: core: Allow SUBST in include_file and import_file.

by Alex Hermann

Module: sip-router Branch: master Commit: 4c5120b7925eae1d9b5e1215c7fc579441201e41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c5120b… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Jun 16 16:01:33 2011 +0200 core: Allow SUBST in include_file and import_file. --- cfg.lex | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cfg.lex b/cfg.lex index 7b984f1..82b4cdc 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1298,21 +1298,29 @@ IMPORTFILE "import_file" <INCLF>[ \t]* /* eat the whitespace */ <INCLF>[^ \t\n]+ { /* get the include file name */ - if(sr_push_yy_state(yytext, 0)<0) + memset(&s_buf, 0, sizeof(s_buf)); + addstr(&s_buf, yytext, yyleng); + r = pp_subst_run(&s_buf.s); + if(sr_push_yy_state(s_buf.s, 0)<0) { LOG(L_CRIT, "error at %s line %d\n", (finame)?finame:"cfg", line); exit(-1); } + memset(&s_buf, 0, sizeof(s_buf)); BEGIN(INITIAL); } <IMPTF>[ \t]* /* eat the whitespace */ <IMPTF>[^ \t\n]+ { /* get the import file name */ - if(sr_push_yy_state(yytext, 1)<0) + memset(&s_buf, 0, sizeof(s_buf)); + addstr(&s_buf, yytext, yyleng); + r = pp_subst_run(&s_buf.s); + if(sr_push_yy_state(s_buf.s, 1)<0) { LOG(L_CRIT, "error at %s line %d\n", (finame)?finame:"cfg", line); exit(-1); } + memset(&s_buf, 0, sizeof(s_buf)); BEGIN(INITIAL); } @@ -1496,12 +1504,12 @@ static int sr_push_yy_state(char *fin, int mode) l = strlen(fin); if(l>=MAX_INCLUDE_FNAME) { - LOG(L_CRIT, "included file name too long\n"); + LOG(L_CRIT, "included file name too long: %s\n", fin); return -1; } if(fin[0]!='"' || fin[l-1]!='"') { - LOG(L_CRIT, "included file name must be between quotes\n"); + LOG(L_CRIT, "included file name must be between quotes: %s\n", fin); return -1; } j = 0; @@ -1511,7 +1519,7 @@ static int sr_push_yy_state(char *fin, int mode) case '\\': if(i+1==l-1) { - LOG(L_CRIT, "invalid escape in included file name\n"); + LOG(L_CRIT, "invalid escape at %d in included file name: %s\n", i, fin); return -1; } i++; @@ -1535,7 +1543,7 @@ static int sr_push_yy_state(char *fin, int mode) } if(j==0) { - LOG(L_CRIT, "invalid included file name\n"); + LOG(L_CRIT, "invalid included file name: %s\n", fin); return -1; } fbuf[j] = '\0';

12 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011