sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: core: reason phrase param updated to be str*

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 20f4c97f53405b6d74d0e9aa966e6d8cd6fc00a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20f4c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:28:03 2010 +0200 core: reason phrase param updated to be str* - build_res_buf_from_sip_req() takes reply reason phrase parameter as str* - many calls of this function have already the reason length --- msg_translator.c | 11 ++++------- msg_translator.h | 10 +++++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 154c7fe..c96d5b6 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1908,7 +1908,7 @@ error: } -char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, +char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, struct sip_msg* msg, unsigned int *returned_len, struct bookmark *bmark) { char *buf, *p; @@ -1925,7 +1925,6 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, unsigned int warning_len; char* content_len_buf; unsigned int content_len_len; - unsigned int text_len; char *after_body; str to_tag; char *totags; @@ -1935,8 +1934,6 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, received_buf=rport_buf=warning_buf=content_len_buf=0; received_len=rport_len=warning_len=content_len_len=0; - text_len=strlen(text); - to_tag.s=0; /* fixes gcc 4.0 warning */ to_tag.len=0; @@ -1975,7 +1972,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, /* first line */ len += msg->first_line.u.request.version.len + 1/*space*/ + 3/*code*/ + 1/*space*/ + - text_len + CRLF_LEN/*new line*/; + text->len + CRLF_LEN/*new line*/; /*headers that will be copied (TO, FROM, CSEQ,CALLID,VIA)*/ for ( hdr=msg->headers ; hdr ; hdr=hdr->next ) { switch (hdr->type) { @@ -2055,8 +2052,8 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag, *(p+i) = '0' + foo - ( foo/10 )*10; p += 3; *(p++) = ' ' ; - memcpy( p , text , text_len ); - p += text_len; + memcpy( p , text->s , text->len ); + p += text->len; memcpy( p, CRLF, CRLF_LEN ); p+=CRLF_LEN; /* headers*/ diff --git a/msg_translator.h b/msg_translator.h index d381f18..33caa40 100644 --- a/msg_translator.h +++ b/msg_translator.h @@ -80,17 +80,17 @@ struct hostport { (hp)->port=&default_global_port; \ }while(0) -char * build_req_buf_from_sip_req ( struct sip_msg* msg, +char * build_req_buf_from_sip_req(struct sip_msg* msg, unsigned int *returned_len, struct dest_info* send_info, unsigned int mode); -char * build_res_buf_from_sip_res( struct sip_msg* msg, +char * build_res_buf_from_sip_res(struct sip_msg* msg, unsigned int *returned_len); -char * build_res_buf_from_sip_req( unsigned int code , - char *text , - str *new_tag , +char * build_res_buf_from_sip_req(unsigned int code, + str *text, + str *new_tag, struct sip_msg* msg, unsigned int *returned_len, struct bookmark *bmark);

14 years, 4 months

git:master: sl: quick update to provie reason param as str*

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e37c4b117d85f1a5294ceac1d697a1f7eb288788 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e37c4b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:31:09 2010 +0200 sl: quick update to provie reason param as str* --- modules/sl/sl_funcs.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index 11b8d70..0dc771a 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -128,6 +128,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) struct dest_info dst; struct bookmark dummy_bm; int backup_mhomed, ret; + str text; if (msg->first_line.u.request.method_value==METHOD_ACK) @@ -151,6 +152,9 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) } } + text.s = reason; + text.len = strlen(reason); + /* add a to-tag if there is a To header field without it */ if ( /* since RFC3261, we append to-tags anywhere we can, except * 100 replies */ @@ -160,15 +164,15 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) && (get_to(msg)->tag_value.s==0 || get_to(msg)->tag_value.len==0) ) { if(tag!=NULL && tag->s!=NULL) { - buf.s = build_res_buf_from_sip_req(code, reason, tag, + buf.s = build_res_buf_from_sip_req(code, &text, tag, msg, (unsigned int*)&buf.len, &dummy_bm); } else { calc_crc_suffix( msg, tag_suffix ); - buf.s = build_res_buf_from_sip_req(code,reason, &sl_tag, msg, + buf.s = build_res_buf_from_sip_req(code, &text, &sl_tag, msg, (unsigned int*)&buf.len, &dummy_bm); } } else { - buf.s = build_res_buf_from_sip_req(code, reason, 0, msg, + buf.s = build_res_buf_from_sip_req(code, &text, 0, msg, (unsigned int*)&buf.len, &dummy_bm); } if (!buf.s)

14 years, 4 months

git:master: makefile: for kamailio flavour define AS support

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f821c005ab3c8db522394b24d9b6213f8086e50d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f821c00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:31:58 2010 +0200 makefile: for kamailio flavour define AS support - needed by seas module --- Makefile.defs | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 73edb4b..e8a1a21 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -146,6 +146,8 @@ CFG_NAME=kamailio KMSTATS ?= 1 # fast malloc statistics on FMSTATS ?= 1 +# application server support on +WITHAS ?= 1 else # default: # main binary name MAIN_NAME=sip-router @@ -699,6 +701,9 @@ endif ifeq ($(FMSTATS), 1) C_DEFS+= -DMALLOC_STATS endif +ifeq ($(WITHAS), 1) + C_DEFS+= -DWITH_AS_SUPPORT +endif ifneq ($(STUN),) C_DEFS+= -DUSE_STUN

14 years, 4 months

git:master: modules_k:rtpproxy - updated examples

by Ovidiu Sas

Module: sip-router Branch: master Commit: 85f4d191a10be49a2c70a8f7c69cd261f1aadf01 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85f4d19… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Aug 16 09:15:50 2010 -0400 modules_k:rtpproxy - updated examples - load rtpproxy module for rtpproxy functions --- modules_k/rtpproxy/examples/4to6.cfg | 1 + modules_k/rtpproxy/examples/alg.cfg | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/rtpproxy/examples/4to6.cfg b/modules_k/rtpproxy/examples/4to6.cfg index 4c1e4a6..5dd5ba9 100644 --- a/modules_k/rtpproxy/examples/4to6.cfg +++ b/modules_k/rtpproxy/examples/4to6.cfg @@ -26,6 +26,7 @@ loadmodule "/usr/local/lib/ser/modules/maxfwd.so" loadmodule "/usr/local/lib/ser/modules/usrloc.so" loadmodule "/usr/local/lib/ser/modules/registrar.so" loadmodule "/usr/local/lib/ser/modules/nathelper.so" +loadmodule "/usr/local/lib/ser/modules/rtpproxy.so" # ----------------- setting module-specific parameters --------------- diff --git a/modules_k/rtpproxy/examples/alg.cfg b/modules_k/rtpproxy/examples/alg.cfg index 24f028e..d2678a5 100644 --- a/modules_k/rtpproxy/examples/alg.cfg +++ b/modules_k/rtpproxy/examples/alg.cfg @@ -23,6 +23,7 @@ loadmodule "/usr/local/lib/ser/modules/maxfwd.so" loadmodule "/usr/local/lib/ser/modules/usrloc.so" loadmodule "/usr/local/lib/ser/modules/registrar.so" loadmodule "/usr/local/lib/ser/modules/nathelper.so" +loadmodule "/usr/local/lib/ser/modules/rtpproxy.so" # ----------------- setting module-specific parameters ---------------

14 years, 4 months

git:master: modules_k:nathelper - updated examples

by Ovidiu Sas

Module: sip-router Branch: master Commit: 5fedfc5276b63ddb9adf31ef10a8357c4a0248c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fedfc5… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Aug 16 09:11:04 2010 -0400 modules_k:nathelper - updated examples - load rtpproxy module for rtpproxy functions --- modules_k/nathelper/examples/4to6.cfg | 1 + modules_k/nathelper/examples/alg.cfg | 1 + modules_k/nathelper/nathelper_rtpp.cfg | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/nathelper/examples/4to6.cfg b/modules_k/nathelper/examples/4to6.cfg index 4c1e4a6..5dd5ba9 100644 --- a/modules_k/nathelper/examples/4to6.cfg +++ b/modules_k/nathelper/examples/4to6.cfg @@ -26,6 +26,7 @@ loadmodule "/usr/local/lib/ser/modules/maxfwd.so" loadmodule "/usr/local/lib/ser/modules/usrloc.so" loadmodule "/usr/local/lib/ser/modules/registrar.so" loadmodule "/usr/local/lib/ser/modules/nathelper.so" +loadmodule "/usr/local/lib/ser/modules/rtpproxy.so" # ----------------- setting module-specific parameters --------------- diff --git a/modules_k/nathelper/examples/alg.cfg b/modules_k/nathelper/examples/alg.cfg index 24f028e..d2678a5 100644 --- a/modules_k/nathelper/examples/alg.cfg +++ b/modules_k/nathelper/examples/alg.cfg @@ -23,6 +23,7 @@ loadmodule "/usr/local/lib/ser/modules/maxfwd.so" loadmodule "/usr/local/lib/ser/modules/usrloc.so" loadmodule "/usr/local/lib/ser/modules/registrar.so" loadmodule "/usr/local/lib/ser/modules/nathelper.so" +loadmodule "/usr/local/lib/ser/modules/rtpproxy.so" # ----------------- setting module-specific parameters --------------- diff --git a/modules_k/nathelper/nathelper_rtpp.cfg b/modules_k/nathelper/nathelper_rtpp.cfg index 9e12c73..381d798 100644 --- a/modules_k/nathelper/nathelper_rtpp.cfg +++ b/modules_k/nathelper/nathelper_rtpp.cfg @@ -15,6 +15,7 @@ log_stderror=yes # ------------------ module loading ---------------------------------- loadmodule "modules/nathelper/nathelper.so" +loadmodule "modules/rtpproxy/rtpproxy.so" loadmodule "modules/textops/textops.so" loadmodule "modules/tm/tm.so" loadmodule "modules/rr/rr.so"

14 years, 4 months

fixup crash

by Juha Heinanen

i build sip proxy from latest master and got this kind of crash during startup: (gdb) where #0 0x00297265 in ?? () #1 0x080961fd in fixup_free_pvar_all (param=0x297265, param_no=1) at mod_fix.c:307 #2 0x080bb035 in fix_actions (a=0x82d4de8) at route.c:956 #3 0x080d0f8b in fix_rval_expr (p=0x82d7608) at rvalue.c:3719 #4 0x080bb1b6 in fix_actions (a=0x82d1520) at route.c:750 #5 0x080bb635 in fix_actions (a=0x8274870) at route.c:754 #6 0x080bd869 in fix_rl (rt=0x82541f8) at route.c:2096 #7 0x080bd890 in fix_rls () at route.c:2112 #8 0x08092839 in main (argc=15, argv=0xbfd731b4) at main.c:2430 -- juha

14 years, 4 months

git:master: core: fix fixup_pvar_pvar bug

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: eba919ffd1d3f56b29d5d4b34ac043d8b690a6b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eba919f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 16 14:13:17 2010 +0200 core: fix fixup_pvar_pvar bug Fix typo-bug introduced in d756b6bfb: fixup_pvar_pvar() called fixup_free_pvar_all() instead of fixup_pvar_all(). Reported-by: Juha Heinanen jh tutpro com --- mod_fix.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 9e02511..0ff29d9 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -317,7 +317,7 @@ int fixup_pvar_pvar(void** param, int param_no) { if (param_no > 2) return E_UNSPEC; - return fixup_free_pvar_all(param, param_no); + return fixup_pvar_all(param, param_no); }

14 years, 4 months

git:master: sms(s): move to common modules directory

by Henning Westerholt

Module: sip-router Branch: master Commit: 56ccad10bb60d1eb98111542449deb56a14ee5c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56ccad1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 13 18:03:31 2010 +0200 sms(s): move to common modules directory --- modules/sms/Makefile | 15 + modules/sms/README | 413 ++++++++++++++++++ modules/sms/doc/Makefile | 4 + modules/sms/doc/functions.xml | 88 ++++ modules/sms/doc/params.xml | 304 +++++++++++++ modules/sms/doc/sms.xml | 125 ++++++ modules/sms/etc/ser.cfg | 88 ++++ modules/sms/libsms_charset.c | 60 +++ modules/sms/libsms_charset.h | 22 + modules/sms/libsms_getsms.c | 545 ++++++++++++++++++++++++ modules/sms/libsms_modem.c | 413 ++++++++++++++++++ modules/sms/libsms_modem.h | 55 +++ modules/sms/libsms_putsms.c | 250 +++++++++++ modules/sms/libsms_sms.h | 49 +++ modules/sms/sms.c | 702 ++++++++++++++++++++++++++++++ modules/sms/sms_funcs.c | 937 +++++++++++++++++++++++++++++++++++++++++ modules/sms/sms_funcs.h | 128 ++++++ modules/sms/sms_report.c | 382 +++++++++++++++++ modules/sms/sms_report.h | 49 +++ 19 files changed, 4629 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=56c…

14 years, 4 months

tm compiler warning

by Juha Heinanen

i built latest sip router from master on debian squeeze and got warning CC (cc) [M tm.so] tm_load.o tm_load.c: In function ‘load_tm’: tm_load.c:112: warning: assignment from incompatible pointer type -- juha

14 years, 4 months

git:master: Makefile: enable rtpproxy

by Ovidiu Sas

Module: sip-router Branch: master Commit: 6e917dffacbd8002e69c53511cb55eda9ae7db8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e917df… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Aug 16 00:17:35 2010 -0400 Makefile: enable rtpproxy --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7de18f7..1a3650f 100644 --- a/Makefile +++ b/Makefile @@ -134,8 +134,8 @@ endif module_group_standard=acc_syslog auth avp ctl dispatcher diversion enum\ eval exec fifo db_flatstore gflags maxfwd mediaproxy \ nathelper options pdt permissions pike print ratelimit \ - registrar rr sanity sl textops timer tm uac unixsock uri \ - usrloc xlog cfg_rpc + registrar rr rtpproxy sanity sl textops timer tm uac \ + unixsock uri usrloc xlog cfg_rpc # Modules in this group are considered a standard part of SER (due to # widespread usage) but they have dependencies that must be satisfied for @@ -201,9 +201,9 @@ module_group_kstandard=acc alias_db auth auth_db benchmark call_control \ cfgutils db_text dialog dispatcher diversion domain drouting \ exec group htable imc kex maxfwd mi_datagram mi_fifo msilo \ nat_traversal nathelper path pdt permissions pike pv qos \ - ratelimit regex registrar rr rtimer siptrace siputils sl sms \ - speeddial sqlops sst statistics textops tmx uac uac_redirect \ - uri_db userblacklist usrloc xlog \ + ratelimit regex registrar rr rtimer rtpproxy siptrace siputils \ + sl sms speeddial sqlops sst statistics textops tmx uac \ + uac_redirect uri_db userblacklist usrloc xlog \ avpops cfg_db cfg_rpc ctl db_flatstore dialplan enum \ iptrtpproxy lcr mediaproxy mi_rpc pdb sanity tm topoh

14 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010