sr-dev

sr-dev@lists.kamailio.org

15 participants
44262 discussions

git:kamailio_3.0: set branch flags before saving location

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 2a67b2533742f7e969d17b027ca7dfea77701415 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a67b25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:21:45 2009 +0100 set branch flags before saving location - enclose parameters in double-quotes --- etc/kamailio.cfg | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 29436ff..609c9fb 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -353,6 +353,11 @@ route{ if (is_method("REGISTER")) { + if(isflagset(5)) + { + setbflag("6"); + # setbflag("7"); + } if (!save("location")) sl_reply_error(); @@ -390,9 +395,9 @@ route{ route[RELAY] { #n# if (check_route_param("nat=yes")) { -#n# setbflag(6); +#n# setbflag("6"); #n# } -#n# if (isflagset(5) || isbflagset(6)) { +#n# if (isflagset(5) || isbflagset("6")) { #n# route(RTPPROXY); #n# } @@ -522,10 +527,10 @@ branch_route[BRANCH_ONE] { onreply_route[REPLY_ONE] { xdbg("incoming reply\n"); -#n# if ((isflagset(5) || isbflagset(6)) && status=~"(183)|(2[0-9][0-9])") { +#n# if ((isflagset(5) || isbflagset("6")) && status=~"(183)|(2[0-9][0-9])") { #n# force_rtp_proxy(); #n# } -#n# if (isbflagset(6)) { +#n# if (isbflagset("6")) { #n# fix_nated_contact(); #n# } } @@ -533,7 +538,7 @@ onreply_route[REPLY_ONE] { failure_route[FAIL_ONE] { #n# if (is_method("INVITE") -#n# && (isbflagset(6) || isflagset(5))) { +#n# && (isbflagset("6") || isflagset(5))) { #n# unforce_rtp_proxy(); #n# }

15 years, 2 months

git:kamailio_3.0: set default debug level to 2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 762ab0f1ce81dedaab3cc8ad20103317f06da75d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=762ab0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:46:44 2009 +0100 set default debug level to 2 - load sl after tm so it can do stateful reply via send_reply() --- etc/kamailio.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 609c9fb..b018f1a 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -57,7 +57,7 @@ ####### Global Parameters ######### -debug=3 +debug=2 memdbg=5 memlog=5 log_stderror=no @@ -114,9 +114,9 @@ mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" #m#loadmodule "db_mysql.so" loadmodule "mi_fifo.so" loadmodule "kex.so" -loadmodule "sl.so" loadmodule "tm.so" loadmodule "tmx.so" +loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so"

15 years, 2 months

git:kamailio_3.0: support for defines

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 744813329639b323e77a148aebb83112ec1039d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7448133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 30 11:05:28 2009 +0100 support for defines - applied patch from Bogdan Harjoc - support for define/ifdef/ifndef - nicer way to build config file - additions to preprocessor directives, so far was 'include' - format is: #!define ID #!ifdef ID #!ifndef ID #!else #!endif --- cfg.lex | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index 105df4b..38bc6db 100644 --- a/cfg.lex +++ b/cfg.lex @@ -106,6 +106,12 @@ #define PVAR_P_S 7 /* pvar: $(...) or $foo(...)*/ #define PVARID_S 8 /* $foo.bar...*/ #define STR_BETWEEN_S 9 + #define LINECOMMENT_S 10 + #define DEFINE_S 11 + #define DEFINE_EOL_S 12 + #define IFDEF_S 13 + #define IFDEF_EOL_S 14 + #define IFDEF_SKIP_S 15 #define STR_BUF_ALLOC_UNIT 128 struct str_buf{ @@ -153,11 +159,19 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; + static int pp_define(int len, const char * text); + static int pp_ifdef_type(int pos); + static void pp_ifdef_var(int len, const char * text); + static void pp_ifdef(); + static void pp_else(); + static void pp_endif(); + %} /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P %x PVARID INCLF +%x LINECOMMENT DEFINE_ID DEFINE_EOL IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ SER_CFG SER @@ -475,8 +489,9 @@ TLSv1 "tlsv1"|"TLSv1"|"TLSV1" LETTER [a-zA-Z] DIGIT [0-9] -ALPHANUM {LETTER}|{DIGIT}|[_] -ID {LETTER}{ALPHANUM}* +LETTER_ {LETTER}|[_] +ALPHANUM {LETTER_}|{DIGIT} +ID {LETTER_}{ALPHANUM}* NUM_ID {ALPHANUM}+ HEX [0-9a-fA-F] HEXNUMBER 0x{HEX}+ @@ -507,6 +522,12 @@ COM_LINE # COM_START "/\*" COM_END "\*/" +DEFINE define +IFDEF ifdef +IFNDEF ifndef +ENDIF endif +/* else is already defined */ + EAT_ABLE [\ \t\b\r] %% @@ -1123,7 +1144,38 @@ EAT_ABLE [\ \t\b\r] sr_cfg_compat=SR_COMPAT_KAMAILIO;} <INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_MAX;} -<INITIAL>{COM_LINE}.*{CR} { count(); } + +<INITIAL>{COM_LINE}!{DEFINE}{EAT_ABLE}+ { count(); + state = DEFINE_S; BEGIN(DEFINE_ID); } +<DEFINE_ID>{ID} { count(); + if (pp_define(yyleng, yytext)) return 1; + state = DEFINE_EOL_S; BEGIN(DEFINE_EOL); } +<DEFINE_EOL>{EAT_ABLE}*{CR} { count(); + state = INITIAL; BEGIN(INITIAL); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{IFDEF}{EAT_ABLE}+ { count(); + if (pp_ifdef_type(1)) return 1; + state = IFDEF_S; BEGIN(IFDEF_ID); } +<INITIAL,IFDEF_SKIP>{COM_LINE}!{IFNDEF}{EAT_ABLE}+ { count(); + if (pp_ifdef_type(0)) return 1; + state = IFDEF_S; BEGIN(IFDEF_ID); } +<IFDEF_ID>{ID} { count(); + pp_ifdef_var(yyleng, yytext); + state = IFDEF_EOL_S; BEGIN(IFDEF_EOL); } +<IFDEF_EOL>{EAT_ABLE}*{CR} { count(); pp_ifdef(); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{ELSE}{EAT_ABLE}*{CR} { count(); pp_else(); } + +<INITIAL,IFDEF_SKIP>{COM_LINE}!{ENDIF}{EAT_ABLE}*{CR} { count(); + pp_endif(); } + + /* we're in an ifdef that evaluated to false -- throw it away */ +<IFDEF_SKIP>.|{CR} { count(); } + + /* this is split so the shebangs match more, giving them priority */ +<INITIAL>{COM_LINE} { count(); state = LINECOMMENT_S; + BEGIN(LINECOMMENT); } +<LINECOMMENT>.*{CR} { count(); state = INITIAL_S; BEGIN(INITIAL); } <INITIAL>{ID} { count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s; @@ -1474,3 +1526,102 @@ static int sr_pop_yy_state() return 0; } +/* define/ifdef support */ + +#define MAX_DEFINES 1024 +static str pp_defines[MAX_DEFINES]; +static int pp_num_defines = 0; + +/* pp_ifdef_stack[i] is 1 if the ifdef test at depth i is either + * ifdef(defined), ifndef(undefined), or the opposite of these + * two, but in an else branch + */ +#define MAX_IFDEFS 128 +static int pp_ifdef_stack[MAX_IFDEFS]; +static int pp_sptr = 0; /* stack pointer */ + +static int pp_lookup(int len, const char * text) +{ + str var = {(char *)text, len}; + int i; + + for (i=0; i<pp_num_defines; i++) + if (STR_EQ(pp_defines[i], var)) + return i; + + return -1; +} + +static int pp_define(int len, const char * text) +{ + if (pp_num_defines == MAX_DEFINES) { + LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); + return -1; + } + + if (pp_lookup(len, text) >= 0) { + LOG(L_CRIT, "ERROR: already defined: %.*s\n", len, text); + return -1; + } + + pp_defines[pp_num_defines].len = len; + pp_defines[pp_num_defines].s = (char*)pkg_malloc(len+1); + memcpy(pp_defines[pp_num_defines].s, text, len); + pp_num_defines++; + + return 0; +} + +static int pp_ifdef_type(int type) +{ + if (pp_sptr == MAX_IFDEFS) { + LOG(L_CRIT, "ERROR: too many nested ifdefs -- adjust MAX_IFDEFS\n"); + return -1; + } + + pp_ifdef_stack[pp_sptr] = type; + return 0; +} + +/* this sets the result of the if[n]def expr: + * ifdef defined -> 1 + * ifdef undefined -> 0 + * ifndef defined -> 0 + * ifndef undefined -> 1 + */ +static void pp_ifdef_var(int len, const char * text) +{ + pp_ifdef_stack[pp_sptr] ^= (pp_lookup(len, text) < 0); +} + +static void pp_update_state() +{ + int i; + + for (i=0; i<pp_sptr; i++) + if (! pp_ifdef_stack[i]) { + state = IFDEF_SKIP_S; BEGIN(IFDEF_SKIP); + return; + } + + state = INITIAL; BEGIN(INITIAL); +} + +static void pp_ifdef() +{ + pp_sptr++; + pp_update_state(); +} + +static void pp_else() +{ + pp_ifdef_stack[pp_sptr-1] ^= 1; + pp_update_state(); +} + +static void pp_endif() +{ + pp_sptr--; + pp_update_state(); +} +

15 years, 2 months

CVS:commitlog: rtpproxy rtpp_command.c

by Maxim Sobolev

sobomax 2009/10/30 10:34:14 CET SER CVS Repository Modified files: (Branch: RELENG_1_2) . rtpp_command.c Log: MFt: fix reference to a local variable before assignment. Revision Changes Path 1.24.2.3 +2 -1 rtpproxy/rtpp_command.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_command.c.diff?…

15 years, 2 months

CVS:commitlog: rtpproxy rtpp_command.c

by Maxim Sobolev

sobomax 2009/10/30 10:32:55 CET SER CVS Repository Modified files: . rtpp_command.c Log: Fix reference to local variable before assignment. Revision Changes Path 1.32 +2 -1 rtpproxy/rtpp_command.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_command.c.diff?…

15 years, 2 months

release branches

by Andrei Pelinescu-Onciul

To prepare for the kamailio 3.0 and sip-router 3.0 releases (according to what we discussed at the sr meeting last week) I've created the sr_3.0 and also enabled kamailio_3.0 (meaning that it can be created anytime). The "main" branches will look like: master | * --- sr_3.0 | * --- kamailio_3.0 Only fixes should be committed to sr_3.0. It should become a generic stable branch, so it should not contain any specific changes (e.g. name changes only for sr_3.0 a.s.o.). When we will release 3.0, we will just create a sr_3.0_release branch and we will do any specific changes there. To minimize backporting/forwardporting work, if a bug is discovered on master or on kamailio_3.0 it should be fixed in the sr_3.0 branch and then latter sr_3.0 can be pulled (in master or kamailio_3.0): fix | | (commit) | (merge) v (merge) master <-------- sr_3.0 --------> kamailio_3.0 If by mistake a sr_3.0 relevant fix is committed first to another branch, git cherry-pick -x can (and should) be used to backport it. E.g.: git checkout sr_3.0 git cherry-pick -x <fix_commit_id> git pull origin sr_3.0:sr_3.0 If in any doubt, please create another branch (e.g. tmp/3.0_update or <username>/3.0_proposed_updates) and request a pull/merge or commit it into master. Be especially carefully not to merge by mistake master or kamailio_3.0 into sr_3.0. It's ok only to merge sr_3.0 into master and sr_3.0 into kamailio_3.0. Any other merge combination is bad. The kamailio_3.0 branch is not yet created, but it can be created any time the kamailio release managers decide it's best. It should be created from sr_3.0. E.g.: git checkout -b kamailio_3.0 origin/sr_3.0 git push origin HEAD:kamailio_3.0 # this command will create it If you think we should have some commit restrictions on this branch (IMHO to avoid mistakes is better to restrict the people who are allowed to commit on release branches) or sr_3.0, let me know. It would be better to avoid deleting files on the kamailio_3.0 branch. If a file is deleted then any merge or git cherry-pick that would involve changes to the deleted file will fail, requiring manual patching. Andrei

15 years, 2 months

git:sr_3.0: When string was in the form of 0= on\n\0 this function caused a segmentation fault(canaries where overwritten ).

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 4e49d033a49131a763b604c0d1f009d2a7c558fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e49d03… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 26 17:16:37 2009 +0200 When string was in the form of 0=on\n\0 this function caused a segmentation fault(canaries where overwritten). (cherry picked from commit e6f4dafdc43d90e9679ad4695e9729379245984d) --- modules/utils/conf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/utils/conf.c b/modules/utils/conf.c index cb4380d..0ba4feb 100644 --- a/modules/utils/conf.c +++ b/modules/utils/conf.c @@ -76,11 +76,10 @@ static void remove_spaces(char *s) { char *p, *dst; - for (p = s, dst = s; *p != '\0'; ++p, ++dst) { + for (p = s, dst = s; *dst != '\0'; ++p, ++dst) { while (isspace(*p)) ++p; *dst = *p; } - *dst = '\0'; }

15 years, 2 months

git:sr_3.0: Removed unused var (added last commit)

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 0ab9d15ba34313387af9a08fdf0e233abe04089e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ab9d15… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 26 14:23:25 2009 +0200 Removed unused var (added last commit) (cherry picked from commit 60548b6b3475d82e5d4d8c9a4be53c8dfb32df5e) --- modules/avpops/avpops_impl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index ab0ec91..3817cd8 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -660,7 +660,6 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, n =0 ; memset(&st, 0, sizeof(struct search_state)); - int counter = 1; if ((dbp->a.opd&AVPOPS_VAL_NONE)==0) { /* avp name is known ->set it and its type */

15 years, 2 months

git:sr_3.0: Declared pua_send_publish , as it was only defined (extern)

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 9cda8fa4a8d0634efc3b5933fa6eb3c18aea8e18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cda8fa… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 16:32:43 2009 +0300 Declared pua_send_publish ,as it was only defined (extern) (cherry picked from commit 981e9ba6cee17268ce761ee04d35b897a0fbd47e) --- modules_k/pua_dialoginfo/pua_dialoginfo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index c940548..eab17d1 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -75,6 +75,7 @@ int override_lifetime = DEF_OVERRIDE_LIFETIME; int caller_confirmed = DEF_CALLER_ALWAYS_CONFIRMED; +send_publish_t pua_send_publish; /** module functions */ static int mod_init(void);

15 years, 2 months

git:sr_3.0: Rewritten this small helper function

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 895e166d730efe6a975136b69171a9f097243771 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=895e166… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Oct 27 13:26:55 2009 +0200 Rewritten this small helper function (cherry picked from commit 4fed4c7b9db9ca8ad1b034d5afbd86fea4ebd6ba) --- modules/utils/conf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/utils/conf.c b/modules/utils/conf.c index 0ba4feb..5df2a16 100644 --- a/modules/utils/conf.c +++ b/modules/utils/conf.c @@ -75,11 +75,11 @@ static int fwd_max_id = 0; static void remove_spaces(char *s) { char *p, *dst; - - for (p = s, dst = s; *dst != '\0'; ++p, ++dst) { - while (isspace(*p)) ++p; - *dst = *p; + for (p = s, dst = s; *p != '\0'; ++p) { + if (!isspace(*p)) *dst++ = *p; } + *dst = '\0'; + }

15 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev