sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:master: core:forward.c Small typo regarding tested socket

by Marius Zbihlei

Module: sip-router Branch: master Commit: cd94c13eb696096cb7ac021720cb11b0696488c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd94c13… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Feb 2 11:23:59 2010 +0200 core:forward.c Small typo regarding tested socket --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index 17094dd..96d5ca1 100644 --- a/forward.c +++ b/forward.c @@ -173,7 +173,7 @@ retry: sock_inet=-1; } #ifdef USE_IPV6 - if (sock_inet>=0){ + if (sock_inet6>=0){ close(sock_inet6); sock_inet6=-1; }

14 years, 9 months

SF.net SVN: openser:[5972] branches/1.5/forward.c

by Marius Zbihlei

Revision: 5972 http://openser.svn.sourceforge.net/openser/?rev=5972&view=rev Author: mariuszbihlei Date: 2010-02-02 10:03:07 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Fixes based on Andrei Pelinescu-Onciul's patch for sip-router Added ifdefs for USE_IPV6, error handling in case of EISCONN Modified Paths: -------------- branches/1.5/forward.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 9 months

git:master: core: fix missing close() in get_out_socket()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ced07a1fe1ce07c13aff2d65b303fa7bba04f6d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ced07a1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Feb 2 10:09:15 2010 +0100 core: fix missing close() in get_out_socket() - errorpath for EISCONN missed close()-ing the sockets - added unlikely() on all the error checks --- forward.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/forward.c b/forward.c index 2e6f05e..17094dd 100644 --- a/forward.c +++ b/forward.c @@ -129,14 +129,14 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto) struct socket_info* si; struct ip_addr ip; - if (proto!=PROTO_UDP) { + if (unlikely(proto!=PROTO_UDP)) { LOG(L_CRIT, "BUG: get_out_socket can only be called for UDP\n"); return 0; } retry: switch(to->s.sa_family){ case AF_INET : { - if(sock_inet < 0){ + if(unlikely(sock_inet < 0)){ sock_inet = socket(AF_INET, SOCK_DGRAM, 0); if (sock_inet==-1) { LM_ERR("socket() failed: %s\n", strerror(errno)); @@ -148,7 +148,7 @@ retry: } #ifdef USE_IPV6 case AF_INET6 : { - if(sock_inet6 < 0){ + if(unlikely(sock_inet6 < 0)){ sock_inet6 = socket(AF_INET6, SOCK_DGRAM, 0); if (sock_inet6==-1) { LM_ERR("socket() failed: %s\n", strerror(errno)); @@ -164,13 +164,19 @@ retry: return 0; } } - if (connect(*temp_sock, &to->s, sockaddru_len(*to))==-1) { - if (errno==EISCONN && !mhomed_sock_cache_disabled){ + 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 */ mhomed_sock_cache_disabled=1; - sock_inet=-1; + if (sock_inet>=0){ + close(sock_inet); + sock_inet=-1; + } #ifdef USE_IPV6 - sock_inet6=-1; + if (sock_inet>=0){ + close(sock_inet6); + sock_inet6=-1; + } #endif /* USE_IPV6 */ goto retry; } @@ -179,7 +185,7 @@ retry: goto error; } len=sizeof(from); - if (getsockname(*temp_sock, &from.s, &len)==-1) { + if (unlikely(getsockname(*temp_sock, &from.s, &len)==-1)) { LOG(L_ERR, "ERROR: get_out_socket: getsockname failed: %s\n", strerror(errno)); goto error; @@ -195,7 +201,7 @@ retry: return si; error: LOG(L_ERR, "ERROR: get_out_socket: no socket found\n"); - if (unlikely(*temp_sock >=0 && mhomed_sock_cache_disabled)){ + if (unlikely(mhomed_sock_cache_disabled && *temp_sock >=0)){ close(*temp_sock); *temp_sock=-1; }

14 years, 9 months

Shell Problems in Debian Squeeze

by Jan Janak

Hello, It appears that Debian Squeeze does not use Bash as interpreter for system scripts and for scripts executed via /bash/sh anymore. It uses dash by default which claims to be POSIX compliant, but does not support "bashisms" typically found in more complex scripts. As result it can happen that some of our shell scripts won't work on recent installations of Debian and Ubunty. There are two easy remedies: * Switch back to bash with sudo dpkg-reconfigure dash for the entire system. * Replace /bin/sh with /bin/bash if you find a broken script See also: https://wiki.ubuntu.com/DashAsBinSh -Jan

14 years, 9 months

current runnin action

by Andreea Ancuta Onofrei

Dear all, Is it possible to retrieve the current action that the script is running? Best regards, Ancuta

14 years, 9 months

git:master: modules/mediaproxy: take boundary string from Content-Type header.

by Juha Heinanen

Module: sip-router Branch: master Commit: c8fe06404d7c0e5a4bdcca517c8815d6cd8df059 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8fe064… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Feb 2 10:09:32 2010 +0200 modules/mediaproxy: take boundary string from Content-Type header. (cherry picked from commit 2031721948bfa6b444d9b18f7e3f195cfd7e1427) --- modules/mediaproxy/mediaproxy.c | 53 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index acedf5b..3f44595 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -45,6 +45,7 @@ #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" +#include "../../parser/parse_param.h" #include "../../msg_translator.h" #include "../../modules_k/dialog/dlg_load.h" #include "../../modules_k/dialog/dlg_hash.h" @@ -658,10 +659,12 @@ get_media_relay(struct sip_msg* msg) static int find_content_type_application_sdp(struct sip_msg *msg, str *sdp) { - str type; + str type, params, boundary; char *start, *s; unsigned int len; Bool done; + param_hooks_t hooks; + param_t *p, *list; if (!msg->content_type) { LM_WARN("the Content-Type header is missing! Assume the content type is text/plain\n"); @@ -688,6 +691,44 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) if (done) return 1; // Hack to find application/sdp bodypart + params.s = memchr(msg->content_type->body.s, ';', + msg->content_type->body.len); + if (params.s == NULL) { + LM_ERR("Content-Type hdr has no params\n"); + return -1; + } + params.len = msg->content_type->body.len - + (params.s - msg->content_type->body.s); + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { + LM_ERR("while parsing Content-Type params\n"); + return -1; + } + boundary.s = NULL; + boundary.len = 0; + for (p = list; p; p = p->next) { + if ((p->name.len == 8) + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { + boundary.s = pkg_malloc(p->body.len + 2 + 1); + if (boundary.s == NULL) { + free_params(list); + LM_ERR("no memory for boundary string\n"); + return -1; + } + *(boundary.s) = '-'; + *(boundary.s + 1) = '-'; + memcpy(boundary.s + 2, p->body.s, p->body.len); + boundary.len = 2 + p->body.len; + *(boundary.s + boundary.len) = 0; + LM_DBG("boundary is <%.*s>\n", boundary.len, boundary.s); + break; + } + } + free_params(list); + if (boundary.s == NULL) { + LM_ERR("no mandatory param \";boundary\"\n"); + return -1; + } + while ((s = find_line_starting_with(sdp, "Content-Type: ", True))) { start = s + 14; len = sdp->len - (s - sdp->s) - 14; @@ -696,7 +737,7 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) start = start + 15; if ((*start != 13) || (*(start + 1) != 10)) { LM_ERR("no CRLF found after content type\n"); - return -1; + goto err; } start = start + 2; len = len - 15 - 2; @@ -706,17 +747,21 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) } sdp->s = start; sdp->len = len; - s = find_line_starting_with(sdp, "--Boundary", False); + s = find_line_starting_with(sdp, boundary.s, False); if (s == NULL) { LM_ERR("boundary not found after bodypart\n"); - return -1; + goto err; } sdp->len = s - start - 2; + pkg_free(boundary.s); return 1; } } } LM_ERR("no application/sdp bodypart found\n"); + + err: + pkg_free(boundary.s); return -1; }

14 years, 9 months

git:sr_3.0: modules/mediaproxy: take boundary string from Content-Type header.

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 2031721948bfa6b444d9b18f7e3f195cfd7e1427 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2031721… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Feb 2 10:09:32 2010 +0200 modules/mediaproxy: take boundary string from Content-Type header. --- modules/mediaproxy/mediaproxy.c | 53 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index acedf5b..3f44595 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -45,6 +45,7 @@ #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" +#include "../../parser/parse_param.h" #include "../../msg_translator.h" #include "../../modules_k/dialog/dlg_load.h" #include "../../modules_k/dialog/dlg_hash.h" @@ -658,10 +659,12 @@ get_media_relay(struct sip_msg* msg) static int find_content_type_application_sdp(struct sip_msg *msg, str *sdp) { - str type; + str type, params, boundary; char *start, *s; unsigned int len; Bool done; + param_hooks_t hooks; + param_t *p, *list; if (!msg->content_type) { LM_WARN("the Content-Type header is missing! Assume the content type is text/plain\n"); @@ -688,6 +691,44 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) if (done) return 1; // Hack to find application/sdp bodypart + params.s = memchr(msg->content_type->body.s, ';', + msg->content_type->body.len); + if (params.s == NULL) { + LM_ERR("Content-Type hdr has no params\n"); + return -1; + } + params.len = msg->content_type->body.len - + (params.s - msg->content_type->body.s); + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { + LM_ERR("while parsing Content-Type params\n"); + return -1; + } + boundary.s = NULL; + boundary.len = 0; + for (p = list; p; p = p->next) { + if ((p->name.len == 8) + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { + boundary.s = pkg_malloc(p->body.len + 2 + 1); + if (boundary.s == NULL) { + free_params(list); + LM_ERR("no memory for boundary string\n"); + return -1; + } + *(boundary.s) = '-'; + *(boundary.s + 1) = '-'; + memcpy(boundary.s + 2, p->body.s, p->body.len); + boundary.len = 2 + p->body.len; + *(boundary.s + boundary.len) = 0; + LM_DBG("boundary is <%.*s>\n", boundary.len, boundary.s); + break; + } + } + free_params(list); + if (boundary.s == NULL) { + LM_ERR("no mandatory param \";boundary\"\n"); + return -1; + } + while ((s = find_line_starting_with(sdp, "Content-Type: ", True))) { start = s + 14; len = sdp->len - (s - sdp->s) - 14; @@ -696,7 +737,7 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) start = start + 15; if ((*start != 13) || (*(start + 1) != 10)) { LM_ERR("no CRLF found after content type\n"); - return -1; + goto err; } start = start + 2; len = len - 15 - 2; @@ -706,17 +747,21 @@ find_content_type_application_sdp(struct sip_msg *msg, str *sdp) } sdp->s = start; sdp->len = len; - s = find_line_starting_with(sdp, "--Boundary", False); + s = find_line_starting_with(sdp, boundary.s, False); if (s == NULL) { LM_ERR("boundary not found after bodypart\n"); - return -1; + goto err; } sdp->len = s - start - 2; + pkg_free(boundary.s); return 1; } } } LM_ERR("no application/sdp bodypart found\n"); + + err: + pkg_free(boundary.s); return -1; }

14 years, 9 months

git:master: ser_mysql.sh: Switch to /bin/bash

by Jan Janak

Module: sip-router Branch: master Commit: 2022176637c54f4727e1e57942978b876072a614 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2022176… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Mon Feb 1 19:24:47 2010 -0500 ser_mysql.sh: Switch to /bin/bash The ser_mysql.sh script is probably not POSIX clean and currently does not work with dash (the new default interpreter for /bin/sh in debian). Switch back to /bin/bash, this makes the script work again across distributions. --- scripts/mysql/sip-router_mysql.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/mysql/sip-router_mysql.sh b/scripts/mysql/sip-router_mysql.sh index 63b656a..3b40132 100755 --- a/scripts/mysql/sip-router_mysql.sh +++ b/scripts/mysql/sip-router_mysql.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # $Id$ #

14 years, 9 months

git:master: packaging: Make postinst scripts dash compatible

by Jan Janak

Module: sip-router Branch: master Commit: 641e5b958b3a81242745203f9bef2654f8787e37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=641e5b9… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Mon Feb 1 19:04:19 2010 -0500 packaging: Make postinst scripts dash compatible Debian Squeeze uses dash as the shell for systems scripts by default and dash does not support the keyword "function" like bash does. --- pkg/debian/postinst | 2 +- pkg/debian/ser-oob.postinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/debian/postinst b/pkg/debian/postinst index 71ecbe1..de0f5d1 100644 --- a/pkg/debian/postinst +++ b/pkg/debian/postinst @@ -36,7 +36,7 @@ fi # ---------------------------------------------------------------------- -function fn_config_replace +fn_config_replace () { if test $# -ne 2; then echo "Error - bad number of input parameters" diff --git a/pkg/debian/ser-oob.postinst b/pkg/debian/ser-oob.postinst index 71c7e09..d86a107 100644 --- a/pkg/debian/ser-oob.postinst +++ b/pkg/debian/ser-oob.postinst @@ -35,7 +35,7 @@ if ! test -e $DEFAULTFILE; then fi -function fn_config_replace +fn_config_replace () { if test $# -ne 2; then echo "Error - bad number of input parameters"

14 years, 9 months

new feature: remote user registration

by Daniel-Constantin Mierla

Hello, if you follow the sr-dev mailing list, you may have noticed some new features added in master branch (for the 3.1.0). I will send more details about each, now: remote user registration. The uac module can register in behalf of users to remote servers. The user details (credentials, local and remote username/domain) are loaded from database. The module sends registration at start-up and then refreshes just before expiration time. If the REGISTER is challenged for authentication, uac will re-send the REGISTER with proper credentials. A typical scenario is when users have accounts to many voip providers and they want to receive calls to those accounts via your sip server (inbound traffic). Of course, the user has to give details such as username/password to you. Other use case can be dynamic interconnection/peering. you can imagine a scalable solution where you have a traffic dispatcher and worker servers. When an worker becomes active, it registers to traffic dispatcher for receiving traffic... and examples can continue. Hope will help you in various cases! Readme at: http://sip-router.org/docbook/sip-router/branch/master/modules_k/uac/uac.ht… SQL to create the mysql table is in utils/kamctl/mysql/uac-create.sql Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010