sr-dev

sr-dev@lists.kamailio.org

15 participants
44254 discussions

git:kamailio_3.0: kamailio.cfg: do sanity check by default

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: aa569991b9c184003ccfd805978930f6cf9ccf2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa56999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 28 23:38:58 2009 +0100 kamailio.cfg: do sanity check by default - use sanity module to catch parsing errors early in config - replaces error_route from kamailio 1.5 --- etc/kamailio.cfg | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index bfadc3a..0d3397e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -126,6 +126,7 @@ loadmodule "textops.so" loadmodule "uri_db.so" loadmodule "siputils.so" loadmodule "xlog.so" +loadmodule "sanity.so" loadmodule "acc.so" /* uncomment next lines for MySQL based authentication support NOTE: a DB (like db_mysql) module must be also loaded */ @@ -265,6 +266,12 @@ route{ exit; } + if(!sanity_check("1511", "7")) + { + xlog("Malformed SIP message from $si:$sp\n"); + exit; + } + # NAT detection route(NAT);

15 years, 2 months

git:kamailio_3.0: sanity: moved module from modules_s to modules

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 011cc3ffacfbc6faf65a879d3558cd789f101237 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=011cc3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 28 23:07:45 2009 +0100 sanity: moved module from modules_s to modules - modules_k/sanity removed (it was an adapted version for k 1.5) --- {modules_s => modules}/sanity/Makefile | 0 {modules_s => modules}/sanity/README | 0 {modules_s => modules}/sanity/doc/Makefile | 0 {modules_s => modules}/sanity/doc/functions.xml | 0 {modules_s => modules}/sanity/doc/params.xml | 0 {modules_s => modules}/sanity/doc/sanity.xml | 0 {modules_s => modules}/sanity/mod_sanity.c | 0 {modules_s => modules}/sanity/mod_sanity.h | 0 {modules_s => modules}/sanity/sanity.c | 0 {modules_s => modules}/sanity/sanity.h | 0 modules_k/sanity/Makefile | 16 - modules_k/sanity/README | 196 ------ modules_k/sanity/doc/Makefile | 4 - modules_k/sanity/doc/sanity.xml | 41 -- modules_k/sanity/doc/sanity_admin.xml | 271 -------- modules_k/sanity/mod_sanity.c | 221 ------- modules_k/sanity/mod_sanity.h | 85 --- modules_k/sanity/sanity.c | 749 ----------------------- modules_k/sanity/sanity.h | 79 --- 19 files changed, 0 insertions(+), 1662 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=011…

15 years, 2 months

git:kamailio_3.0: Makefile: introducing SRC_NAME var

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 3a7b050c9f9d71a6ab8d44eca1c50f52153d22e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a7b050… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 28 22:43:14 2009 +0100 Makefile: introducing SRC_NAME var - store the name as it is in source tree, updated by installation to MAIN_NAME (used for man pages install) --- Makefile | 6 ++++-- Makefile.defs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 95115a5..5841f5d 100644 --- a/Makefile +++ b/Makefile @@ -944,7 +944,8 @@ install-sr-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 $(foreach m,$(modules_dirs),\ -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ - < $(CFG_NAME).8 > \ + -e "s#$(SRC_NAME)#$(MAIN_NAME)#g" \ + < $(SRC_NAME).8 > \ $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 @chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 @sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ @@ -952,7 +953,8 @@ install-sr-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 $(foreach m,$(modules_dirs),\ -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ - < $(CFG_NAME).cfg.5 > \ + -e "s#$(SRC_NAME)#$(MAIN_NAME)#g" \ + < $(SRC_NAME).cfg.5 > \ $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 @chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 diff --git a/Makefile.defs b/Makefile.defs index d623b9b..f6be32c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -120,6 +120,8 @@ FLAVOUR=kamailio CFG_NAME=sip-router #config name/name-prefix for distributed scripts SCR_NAME=sip-router +#name in source tree +SRC_NAME=sip-router ifeq ($(FLAVOUR),sip-router) # main binary name @@ -1920,7 +1922,7 @@ export exported_vars # cannot be overwritten from environment or command line, unless make cfg # is run) saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ - RELEASE OS ARCH \ + SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \

15 years, 2 months

git:kamailio_3.0: kamailio.cfg: use name for routes

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 489ddd1336d3bd703ea0b393226631469883b4f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=489ddd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 28 22:07:00 2009 +0100 kamailio.cfg: use name for routes - switched from index to names for routes - 1 => RELAY - 2 => PRESENCE - 3 => AUTH - 4 => NAT - 5 => RTPPROXY - failure route: 1 = > FAIL_ONE - onreply route: 1 = > REPLY_ONE - branch route: 1 = > BRANCH_ONE --- etc/kamailio.cfg | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 256645c..bfadc3a 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -266,7 +266,7 @@ route{ } # NAT detection - route(4); + route(NAT); if (has_totag()) { # sequential request withing a dialog should @@ -280,7 +280,7 @@ route{ } else { if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests - route(2); + route(PRESENCE); exit; } if ( is_method("ACK") ) { @@ -311,7 +311,7 @@ route{ t_check_trans(); # authentication - route(3); + route(AUTH); # record routing for dialog forming requests (in case they are routed) if (is_method("INVITE|SUBSCRIBE")) @@ -334,13 +334,13 @@ route{ ## t_relay("tls:domain2.net"); ## exit; ##} - route(1); + route(RELAY); } # requests for my domain if( is_method("PUBLISH|SUBSCRIBE")) - route(2); + route(PRESENCE); if (is_method("REGISTER")) { @@ -375,23 +375,23 @@ route{ # when routing via usrloc, log the missed calls also setflag(2); - route(1); + route(RELAY); } -route[1] { +route[RELAY] { #n# if (check_route_param("nat=yes")) { #n# setbflag(6); #n# } #n# if (isflagset(5) || isbflagset(6)) { -#n# route(5); +#n# route(RTPPROXY); #n# } /* example how to enable some additional event routes */ if (is_method("INVITE")) { - #t_on_branch("1"); - t_on_reply("1"); - t_on_failure("1"); + #t_on_branch("BRANCH_ONE"); + t_on_reply("REPLY_ONE"); + t_on_failure("FAIL_ONE"); } if (!t_relay()) { @@ -403,7 +403,7 @@ route[1] { # Presence route /* uncomment the whole following route for enabling presence server */ -route[2] +route[PRESENCE] { #p# if (!t_newtran()) #p# { @@ -435,7 +435,7 @@ route[2] # Authentication route /* uncomment the whole following route for enabling authentication */ -route[3] { +route[AUTH] { #a# if (is_method("REGISTER")) #a# { #a# # authenticate the REGISTER requests (uncomment to enable auth) @@ -480,7 +480,7 @@ route[3] { # Caller NAT detection route /* uncomment the whole following route for enabling Caller NAT Detection */ -route[4]{ +route[NAT]{ #n# force_rport(); #n# if (nat_uac_test("19")) { #n# if (method=="REGISTER") { @@ -495,7 +495,7 @@ route[4]{ # RTPProxy control /* uncomment the whole following route for enabling RTPProxy Control */ -route[5] { +route[RTPPROXY] { #n# if (is_method("BYE")) { #n# unforce_rtp_proxy(); #n# } else if (is_method("INVITE")){ @@ -505,12 +505,12 @@ route[5] { return; } -branch_route[1] { +branch_route[BRANCH_ONE] { xdbg("new branch at $ru\n"); } -onreply_route[1] { +onreply_route[REPLY_ONE] { xdbg("incoming reply\n"); #n# if ((isflagset(5) || isbflagset(6)) && status=~"(183)|(2[0-9][0-9])") { @@ -522,7 +522,7 @@ onreply_route[1] { } -failure_route[1] { +failure_route[FAIL_ONE] { #n# if (is_method("INVITE") #n# && (isbflagset(6) || isflagset(5))) { #n# unforce_rtp_proxy();

15 years, 2 months

git:kamailio_3.0: kamaili.cfg: basic updates to make it work with SR core

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5adb83ef2c7e6f1e07a2df1f7f26e6933f7f34ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5adb83e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 28 21:53:27 2009 +0100 kamaili.cfg: basic updates to make it work with SR core --- etc/kamailio.cfg | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index fc90e95..256645c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -4,6 +4,7 @@ # Kamailio (OpenSER) SIP Server - basic configuration script # - web: http://www.kamailio.org # - svn: http://openser.svn.sourceforge.net/viewvc/openser/ +# - git: http://sip-router.org # # Direct your questions about this file to: <users(a)lists.kamailio.org> # @@ -57,6 +58,8 @@ ####### Global Parameters ######### debug=3 +memdbg=5 +memlog=5 log_stderror=no log_facility=LOG_LOCAL0 @@ -110,8 +113,10 @@ mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" /* uncomment next line for MySQL DB support */ #m#loadmodule "db_mysql.so" loadmodule "mi_fifo.so" +loadmodule "kex.so" loadmodule "sl.so" loadmodule "tm.so" +loadmodule "tmx.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" @@ -345,7 +350,7 @@ route{ exit; } - if ($rU==NULL) { + if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; @@ -355,7 +360,7 @@ route{ ##alias_db_lookup("dbaliases"); if (!lookup("location")) { - switch ($retcode) { + switch ($rc) { case -1: case -3: t_newtran(); @@ -420,7 +425,7 @@ route[2] #p# exit; # if presence enabled, this part will not be executed - if (is_method("PUBLISH") || $rU==null) + if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; @@ -523,7 +528,7 @@ failure_route[1] { #n# unforce_rtp_proxy(); #n# } - if (t_was_cancelled()) { + if (t_is_canceled()) { exit; }

15 years, 2 months

pseudo variable $ad is not working

by jh＠tutpro.com

i have this kind of test in my config: if (lookup_domain("$fd", "$ad")) { $var(lcr_id) = $fd.lcr_id; } else { xlog("L_WARN", "Domain $ad of authorized user $aU is not local!\n"); send_reply("404", "Not found"); exit; }; the problem is that when request that has header Proxy-Authorization: Digest username="test(a)test.fi" arrives, sr prints to syslog Oct 28 20:01:09 localhost /usr/sbin/sip-proxy[7248]: WARNING: Domain of authorized user test is not local! i.e., $ad does not have test.fi as its value. according to wiki it should work: Auth username domain $ad - domain part of username from Authorization or Proxy-Authorization header so this looks like a bug to me. -- juha

15 years, 2 months

git:master: Merge remote branch 'origin/sr_3.0'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8b9ccd17e24054d734c12be2c2ae79bc864bf59f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b9ccd1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 16:41:39 2009 +0100 Merge remote branch 'origin/sr_3.0' * origin/sr_3.0: htable(k): fix non-init act. ctx in event route execution tm: fix/support changing r-uris and path in branch routes tm: support for changing dst_uri in branch routes registrar: Fix handling of cases where contacts > max_contacts domain: Do not report errors when domain cannot be extracted from URI. parse_sip_msg_uri: Log broken URIs only when debugging is enabled. modules/lcr: documentation improvement sctp: count rejects sent to the remote peer (stats) avp_db: Removes a spurious error message. ctl: missing ifdef (minor) event parser: Add missing string boundary checks to event_parser func. tm: Number of fixes in code and documentation for serial forking. Implements function reset_path_vector. ---

15 years, 2 months

git:sr_3.0: tm: fix/support changing r-uris and path in branch routes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 610cb930bee937c744468c6781aeed8b17b4b7d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=610cb93… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 15:50:45 2009 +0100 tm: fix/support changing r-uris and path in branch routes - changing the r-uri in a branch route is now safe and the change will propagate to branches created due to dns failover. - changing path in a branch route is now allowed and it will propagate to possible dns failover branches. - optimize the no branch route & no callback case. - build the branch buffer directly into shm mem. - s/prepare_uac_request/prepare_new_uac/ - prepare_new_uac() takes care now also of setting the branch retr. buffer, uri and path (functionality moved from add_uac()) --- modules/tm/t_fwd.c | 417 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 247 insertions(+), 170 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=610…

15 years, 2 months

git:sr_3.0: tm: support for changing dst_uri in branch routes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 44f7bf621476b18e5df5e45161305a3bce22d498 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44f7bf6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 08:36:47 2009 +0100 tm: support for changing dst_uri in branch routes - dst_uri can now be changed in branch routes, if the branch route is not called during dns failover (which never happens, but might be enabled in the future). - dst_uri can now be checked in branch routes. The dst_uri on branch route entry will be the branch next hop (initial next hop and not the dns resolved one) if a t_relay() based on uri was used, or empty if a destination was forced (e.g. t_relay_to_udp(127.0.0.1, 9)). - s/print_uac_request/prepare_uac_request to better reflect what is actually doing - prepare_uac_request() will now perform the DNS lookups and directly update the branch dst inside the transaction. - add_uac() must now be called with a special flag during DNS failover (UAC_DNS_FAILOVER). --- modules/tm/t_fwd.c | 176 ++++++++++++++++++++++++++++++++++++---------------- modules/tm/t_fwd.h | 2 + 2 files changed, 125 insertions(+), 53 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=44f…

15 years, 2 months

git:sr_3.0: htable(k): fix non-init act. ctx in event route execution

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 4ac8656cb483f64e88a2a70996178ffdef85e097 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ac8656… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 28 16:11:22 2009 +0100 htable(k): fix non-init act. ctx in event route execution - the event route was executed with an uninitialized run_act_ctx. --- modules_k/htable/htable.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 6291c2b..2d49864 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -185,6 +185,7 @@ static int child_init(int rank) fmsg = faked_msg_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, &ctx); if(ctx.run_flags&DROP_R_F) {

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