sr-dev

sr-dev@lists.kamailio.org

12 participants
45245 discussions

git:3.1: core:forward.c Fixed small error caused by unlikely usage.
by Marius Zbihlei 14 Feb '11

14 Feb '11

Module: sip-router Branch: 3.1 Commit: 9ef0a1e347abd31b352d3cb85326605fd72e6789 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ef0a1e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Nov 4 17:14:56 2010 +0200 core:forward.c Fixed small error caused by unlikely usage. (cherry picked from commit 6cfee82666b78400d5ff15c49aac1441cfbbaaf6) --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index 3d7aed1..175f54b 100644 --- a/forward.c +++ b/forward.c @@ -175,7 +175,7 @@ retry: if( !mhomed_sock_cache_disabled ){ /* some Linux kernel versions (all?) along with other UNIXes don't re-bound the sock if already bound */ /* to un-bound a socket set sin_family to AF_UNSPEC and zero out the rest*/ - if (unlikely(connect(*temp_sock, &uncon.s, sockaddru_len(uncon))) < 0) + if (unlikely(connect(*temp_sock, &uncon.s, sockaddru_len(uncon)) < 0)) mhomed_sock_cache_disabled = 1; }

1 0

git:3.1: core/forward.c Fixed mhomed behavior.
by Marius Zbihlei 14 Feb '11

14 Feb '11

Module: sip-router Branch: 3.1 Commit: 3ec1e92fcb3ce8c673e6762c0a35a9bc8ade3a22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ec1e92… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Nov 4 16:11:41 2010 +0200 core/forward.c Fixed mhomed behavior. As connect() dones't re-bound a UDP sock if the socket is already bound to an interface, first unbind the socket by connecting to AF_UNSPEC (cherry picked from commit ef0dd4e3f0837753ac18d58606078d8595f24dc6) --- forward.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index 25bc11d..3d7aed1 100644 --- a/forward.c +++ b/forward.c @@ -131,6 +131,10 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto) union sockaddr_union from; struct socket_info* si; struct ip_addr ip; + union sockaddr_union uncon; + + memset(&uncon, 0, sizeof(union sockaddr_union)); + uncon.sin.sin_family = AF_UNSPEC; if (unlikely(proto!=PROTO_UDP)) { LOG(L_CRIT, "BUG: get_out_socket can only be called for UDP\n"); @@ -167,6 +171,14 @@ retry: return 0; } } + + if( !mhomed_sock_cache_disabled ){ + /* some Linux kernel versions (all?) along with other UNIXes don't re-bound the sock if already bound */ + /* to un-bound a socket set sin_family to AF_UNSPEC and zero out the rest*/ + if (unlikely(connect(*temp_sock, &uncon.s, sockaddru_len(uncon))) < 0) + mhomed_sock_cache_disabled = 1; + } + if (unlikely(connect(*temp_sock, &to->s, sockaddru_len(*to))==-1)) { if (unlikely(errno==EISCONN && !mhomed_sock_cache_disabled)){ /* no multiple connects support on the same socket */

1 0

sctp info parameter value zeo
by Asif Iqbal syed 13 Feb '11

13 Feb '11

Hi, My sctp info value shows all zero. Is there any explanation?Is my setup correct? $sercmd core.sctp_info { opened_connections: 0 tracked_connections: 0 total_connections: 0 } Thanking you. Asif On Mon, Feb 7, 2011 at 3:14 PM, Klaus Darilion <klaus.mailinglists(a)pernau.at > wrote: > Make sure you have the sctp libraries installed. > > regards > klaus > > Am 06.02.2011 06:21, schrieb Asif Iqbal syed: > > Hi, > > > > I have been trying to compile kamailio with sctp support enabled by > > following the installation instruction from > > > http://www.kamailio.org/dokuwiki/doku.php/install:kamailio-3.1.x-from-git. > > Still no success. Here is what I am doing. > > > > 1. git clone --depth 1 git://git.sip-router.org/sip-router kamailio > > 2. cd kamailio > > 3. git checkout -b 3.1 origin/3.1 > > 4. make FLAVOUR=kamailio cfg > > 5. nano -w modules.lst > > 6. make FLAVOUR=kamailio include_modules="db_mysql dialplan" cfg > > 7. make PREFIX="/usr/local/kamailio-3.1" FLAVOUR=kamailio > > include_modules="db_mysql dialplan" cfg > > 8. SCTP=1 make all > > 9. SCTP=1 make install > > > > Then run kamailio and execute sercmd. Do core.sctp_info. It shows error > 500: > > sctp support not compiled. > > > > I would appreciate if someone help me what I am missing. > > > > Thanking you. > > > > Asif > > > > > > > > > > _______________________________________________ > > sr-dev mailing list > > sr-dev(a)lists.sip-router.org > > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >

2 1

[tracker] Comment added: Kamailio init script reports falsely "Kamailio already running" (Attachment added)
by sip-router 11 Feb '11

11 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#113 - Kamailio init script reports falsely "Kamailio already running" User who did this - Klaus Darilion (klaus3000) ---------- patched the patch :-) ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=113#comment157 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.

1 0

[tracker] Task changed: Kamailio init script reports falsely "Kamailio already running"
by sip-router 11 Feb '11

11 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#113 - Kamailio init script reports falsely "Kamailio already running" User who did this: Klaus Darilion (klaus3000) Task details edited: ------- Hi! The init script for Debian always reports "Kamailio already running" if Kamailio does not start although the config is correct (e.g. can not bind to socket). IMO we could improve it a bit by checking if Kamailio is really running (at least check for PID file and process). Attached is a patch which solves this, feel free to make it nicer. ------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=113 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.

1 0

[tracker] Comment added: Kamailio init script reports falsely "Kamailio already running" (Attachment added)
by sip-router 11 Feb '11

11 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#113 - Kamailio init script reports falsely "Kamailio already running" User who did this - Klaus Darilion (klaus3000) ---------- uploaded patch as file (whitespaces) ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=113#comment156 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.

1 0

[tracker] Task opened: Kamailio init script reports falsely "Kamailio already running"
by sip-router 11 Feb '11

11 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Klaus Darilion (klaus3000) Attached to Project - sip-router Summary - Kamailio init script reports falsely "Kamailio already running" Task Type - Bug Report Category - tools/scripts Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi! The init script for Debian always reports "Kamailio already running" if Kamailio does not start although the config is correct (e.g. can not bind to socket). IMO we could improve it a bit by checking if Kamailio is really running (at least check for PID file and process). This is a patch which solves this, feel free to make it nicer. --- kamailio.orig 2011-02-11 18:55:28.000000000 +0100 +++ kamailio 2011-02-11 19:20:43.000000000 +0100 @@ -124,8 +124,16 @@ echo -n "Starting $DESC: $NAME" start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $OPTIONS || echo -n " already running" - echo "." + --exec $DAEMON -- $OPTIONS || if [ ! -r "$PIDFILE" ]; then + echo " error, failed to start." + exit 3 + elif read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then + echo -n " already running" + echo "." + else + echo " error, failed to start ($PIDFILE exists)." + exit 1 + fi ;; stop) echo -n "Stopping $DESC: $NAME" More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=113 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.

1 0

Crash bug if Via header removed + changes applied
by Alex Balashov 10 Feb '11

10 Feb '11

Don't ask me why anyone would want to do this, but, for simple stateful relay scenario: UAC --> Kamailio --> UAS This: remove_hf("Via"); msg_apply_changes(); will crash Kamailio: Feb 10 18:54:22 diminuendo-1 /usr/local/sbin/kamailio[30982]: ERROR: tm [t_lookup.c:540]: ERROR: t_lookup_request: no via Feb 10 18:54:22 diminuendo-1 /usr/local/sbin/kamailio[30981]: ALERT: <core> [main.c:741]: child process 30982 exited by a signal 11 -- Alex Balashov - Principal Evariste Systems LLC 260 Peachtree Street NW Suite 2200 Atlanta, GA 30303 Tel: +1-678-954-0670 Fax: +1-404-961-1892 Web: http://www.evaristesys.com/

1 0

git:master: - Updated patch and example config after testing.
by Carsten Bock 10 Feb '11

10 Feb '11

Module: sip-router Branch: master Commit: 7dfe7c223f779b039e86ef0b5ab0c8cc1785613a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dfe7c2… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Feb 10 23:46:58 2011 +0100 - Updated patch and example config after testing. --- modules/rtpproxy/test/kamailio.cfg | 10 +++--- modules/rtpproxy/test/rtpproxy.patch | 58 +++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/modules/rtpproxy/test/kamailio.cfg b/modules/rtpproxy/test/kamailio.cfg index 5c36c3b..0d5c73f 100644 --- a/modules/rtpproxy/test/kamailio.cfg +++ b/modules/rtpproxy/test/kamailio.cfg @@ -28,7 +28,7 @@ auto_aliases=no tos=0x80 # ------------------ module loading ---------------------------------- -mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" +mpath="sip-router/modules_k:sip-router/modules" # To Check/modufy the maximum forwards loadmodule "maxfwd.so" # Transaction-Module @@ -70,7 +70,7 @@ loadmodule "registrar.so" modparam("rtpproxy", "rtpproxy_sock", "udp:localhost:22222") # Nathelper: RTP-Proxy Timeout modparam("rtpproxy", "rtpproxy_tout", 3) -modparam("rtpproxy", "timeout_socket", "http://localhost:8000/RPC2") +modparam("rtpproxy", "timeout_socket", "xmlrpc:http://localhost:8000/RPC2") # ----------------- Settings for max-fwd --------------- # Max-Forward-Module: Set the maximum to 20 @@ -122,7 +122,7 @@ modparam("dialog", "db_mode", 0) # The number of dialogs to be fetched per loop #modparam("dialog", "db_fetch_rows", 120) -modparam("registrar", "max_expires", 60); +modparam("registrar", "max_expires", 10); modparam("registrar", "received_avp", "$avp(i:100)"); modparam("nathelper", "received_avp", "$avp(i:100)"); @@ -197,7 +197,7 @@ route { ################################################################################################################## # Use RTP-Proxy ############################################################################################################### - if (!force_rtp_proxy("arf")) { + if (!rtpproxy_offer("arf")) { sl_send_reply("503", "No RTP-Relay available"); exit; } @@ -346,7 +346,7 @@ onreply_route[1] { fix_nated_contact(); # Content-Length prüfen if (!search("^Content-Length:[ ]*0")) { - force_rtp_proxy("arf"); + rtpproxy_answer("arf"); } } } diff --git a/modules/rtpproxy/test/rtpproxy.patch b/modules/rtpproxy/test/rtpproxy.patch index 3fc23b8..3d2e8b4 100644 --- a/modules/rtpproxy/test/rtpproxy.patch +++ b/modules/rtpproxy/test/rtpproxy.patch @@ -7589,7 +7589,7 @@ index 54c1a60..1c88b99 100644 +AC_SUBST(LIBS_XMLRPC) AC_OUTPUT diff --git a/rtpp_command.c b/rtpp_command.c -index c5734ae..1afae6a 100644 +index c5734ae..d6072de 100644 --- a/rtpp_command.c +++ b/rtpp_command.c @@ -69,6 +69,9 @@ struct proto_cap proto_caps[] = { @@ -7610,22 +7610,51 @@ index c5734ae..1afae6a 100644 requested_nsamples = -1; ia[0] = ia[1] = NULL; -@@ -965,17 +969,30 @@ handle_command(struct cfg *cf, int controlfd, double dtime) +@@ -468,7 +472,7 @@ handle_command(struct cfg *cf, int controlfd, double dtime) + } + call_id = argv[1]; + if (op == UPDATE || op == LOOKUP || op == PLAY) { +- max_argc = (op == UPDATE ? 8 : 6); ++ max_argc = (op == PLAY ? 6 : 8); + if (argc < 5 || argc > max_argc) { + rtpp_log_write(RTPP_LOG_ERR, cf->stable.glog, "command syntax error"); + reply_error(&cf->stable, controlfd, &raddr, rlen, cookie, 4); +@@ -478,7 +482,7 @@ handle_command(struct cfg *cf, int controlfd, double dtime) + to_tag = argv[5]; + if (op == PLAY && argv[0][1] != '\0') + playcount = atoi(argv[0] + 1); +- if (op == UPDATE && argc > 6) { ++ if (op != PLAY && argc > 6) { + socket_name_u = argv[6]; + if (strncmp("unix:", socket_name_u, 5) == 0) + socket_name_u += 5; +@@ -965,25 +969,39 @@ handle_command(struct cfg *cf, int controlfd, double dtime) } pthread_mutex_lock(&cf->glock); -+ - if (op == UPDATE) { +- if (op == UPDATE) { - if (cf->timeout_handler->socket_name == NULL && socket_name_u != NULL) - rtpp_log_write(RTPP_LOG_ERR, spa->log, "must permit notification socket with -n"); ++ ++ if ((op == UPDATE) || (op == LOOKUP)){ if (spa->timeout_data.notify_tag != NULL) { free(spa->timeout_data.notify_tag); spa->timeout_data.notify_tag = NULL; } - if (cf->timeout_handler->socket_name != NULL && socket_name_u != NULL) { - if (strcmp(cf->timeout_handler->socket_name, socket_name_u) != 0) { +- if (cf->timeout_handler->socket_name != NULL && socket_name_u != NULL) { +- if (strcmp(cf->timeout_handler->socket_name, socket_name_u) != 0) { - rtpp_log_write(RTPP_LOG_ERR, spa->log, "invalid socket name %s", socket_name_u); - socket_name_u = NULL; +- } else { ++ spa->timeout_data.handler = NULL; ++ if (socket_name_u != NULL) { ++ if (cf->timeout_handler != NULL && cf->timeout_handler->socket_name != NULL ++ && strlen(cf->timeout_handler->socket_name) == strlen(socket_name_u) ++ && strcmp(cf->timeout_handler->socket_name, socket_name_u) != 0) { + rtpp_log_write(RTPP_LOG_INFO, spa->log, "setting timeout handler"); + spa->timeout_data.handler = cf->timeout_handler; + spa->timeout_data.notify_tag = strdup(notify_tag); ++ } else { + rtpp_log_write(RTPP_LOG_INFO, spa->log, "setting custom timeout handler (%s)", socket_name_u); + my_timeout_h = malloc(sizeof(struct rtpp_timeout_handler)); + if (my_timeout_h == NULL) { @@ -7636,15 +7665,20 @@ index c5734ae..1afae6a 100644 + if(my_timeout_h->socket_name != NULL) { + strcpy(my_timeout_h->socket_name, socket_name_u); + spa->timeout_data.handler = my_timeout_h; -+ spa->timeout_data.notify_tag = strdup(notify_tag); ++ if (notify_tag != NULL) spa->timeout_data.notify_tag = strdup(notify_tag); ++ else spa->timeout_data.notify_tag = NULL; + } else { + rtpp_log_write(RTPP_LOG_ERR, spa->log, "Unable to allocate memory"); + free(my_timeout_h); + } + } - } else { - rtpp_log_write(RTPP_LOG_INFO, spa->log, "setting timeout handler"); - spa->timeout_data.handler = cf->timeout_handler; + } +- } else if (socket_name_u == NULL && spa->timeout_data.handler != NULL) { +- spa->timeout_data.handler = NULL; +- rtpp_log_write(RTPP_LOG_INFO, spa->log, "disabling timeout handler"); + } + } + diff --git a/rtpp_notify.c b/rtpp_notify.c index e92c9ec..35982bf 100644 --- a/rtpp_notify.c @@ -7798,7 +7832,7 @@ index e92c9ec..35982bf 100644 wi->th->connected = 0; rtpp_log_ewrite(RTPP_LOG_ERR, wi->glog, "failed to send timeout notification"); diff --git a/rtpp_session.c b/rtpp_session.c -index 03e3d8a..78b2135 100644 +index 03e3d8a..44a34fa 100644 --- a/rtpp_session.c +++ b/rtpp_session.c @@ -41,6 +41,7 @@ @@ -7815,7 +7849,7 @@ index 03e3d8a..78b2135 100644 free(sp->timeout_data.notify_tag); +#ifdef ENABLE_XMLRPC + // In case we use a custom timeout handler, we have to free it. -+ if (sp->timeout_data.handler != &cf->timeout_handler) { ++ if (sp->timeout_data.handler && (sp->timeout_data.handler != &cf->timeout_handler)) { + free(sp->timeout_data.handler->socket_name); + free(sp->timeout_data.handler); + }

1 0

git:master: - Just a note: Need to define the timeout socket in order to activate the timeout-timer
by Carsten Bock 10 Feb '11

10 Feb '11

Module: sip-router Branch: master Commit: a8f17732a193eae57e8a9b0647d4fa6fdc0719ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8f1773… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Feb 10 23:48:52 2011 +0100 - Just a note: Need to define the timeout socket in order to activate the timeout-timer --- modules/rtpproxy/test/exec_rtpproxy.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/test/exec_rtpproxy.txt b/modules/rtpproxy/test/exec_rtpproxy.txt index 1d9601b..a117a3f 100644 --- a/modules/rtpproxy/test/exec_rtpproxy.txt +++ b/modules/rtpproxy/test/exec_rtpproxy.txt @@ -1 +1 @@ -./rtpproxy -T 10 -f -F -i -l 195.71.4.179 -s udp:*:22222 -d DBUG +./rtpproxy -T 10 -f -F -i -l 127.0.0.1 -s udp:*:22222 -d DBUG -n tcp:127.0.0.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev