sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

[tracker] Comment added: ds_reload fails (MySQL backend)
by sip-router 10 Aug '10

10 Aug '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Daniel-Constantin Mierla (miconda) ---------- Is it 3.0.2 from tarball/packages or is latest git branch kamailio_30? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment107 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: ds_reload fails (MySQL backend)
by sip-router 10 Aug '10

10 Aug '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Kim Jakobsson (kjakobsson) Attached to Project - sip-router Summary - ds_reload fails (MySQL backend) Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - - Kamailio v3.0.2. - dispathcer module with mysql backend - Kamailio starts up ok and ds_select_domain() works. When trying to issue 'ds_reload' with sercmd, the reload fails. Module configuration: modparam("dispatcher", "db_url", "mysql://openser:openserrw@localhost/openser") > **> sercmd mi_fifo ds_list** >200 OK SET_NO:: 1 SET:: 1 URI:: sip:127.0.0.1:5060 flag=A > **> sercmd mi_fifo ds_reload** >500 ERROR Reloading data > **> tail -1 /var/log/kamailio.log** >ERROR: dispatcher [dispatch.c:555]: invalid DB handler More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83 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

git:andrei/raw_sock: cfg: delay cfg_shmize to just before forking
by Andrei Pelinescu-Onciul 10 Aug '10

10 Aug '10

Module: sip-router Branch: andrei/raw_sock Commit: fbf0d2e03c019e51281ce569b93843ab0577cc0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbf0d2e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:20:26 2010 +0200 cfg: delay cfg_shmize to just before forking cfg_shmize() delayed to allow late changes in the default config (any changes in the default config after cfg_shmize() are ignored). --- main.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index d157a6b..9b594a0 100644 --- a/main.c +++ b/main.c @@ -1285,6 +1285,15 @@ int main_loop() " (no fork)\n"); } + /* delay cfg_shmize to the last moment (it must be called _before_ + forking). Changes to default cfgs after this point will be + ignored. + */ + if (cfg_shmize() < 0) { + LOG(L_CRIT, "could not initialize shared configuration\n"); + goto error; + } + /* Register the children that will keep updating their * local configuration */ cfg_register_child( @@ -1503,6 +1512,14 @@ int main_loop() * sending) so we open all first*/ if (do_suid()==-1) goto error; /* try to drop privileges */ + /* delay cfg_shmize to the last moment (it must be called _before_ + forking). Changes to default cfgs after this point will be + ignored (cfg_shmize() will copy the default cfgs into shmem). + */ + if (cfg_shmize() < 0) { + LOG(L_CRIT, "could not initialize shared configuration\n"); + goto error; + } /* init childs with rank==PROC_INIT before forking any process, * this is a place for delayed (after mod_init) initializations * (e.g. shared vars that depend on the total number of processes @@ -2328,11 +2345,6 @@ try_select_again: tval.tv_usec = 0; goto error; } - if (cfg_shmize() < 0) { - LOG(L_CRIT, "could not initialize shared configuration\n"); - goto error; - } - /* initialize process_table, add core process no. (calc_proc_no()) to the * processes registered from the modules*/ if (init_pt(calc_proc_no())==-1)

1 0

git:andrei/raw_sock: core: always compile the raw sockets code on linux
by Andrei Pelinescu-Onciul 10 Aug '10

10 Aug '10

Module: sip-router Branch: andrei/raw_sock Commit: 53cc96bd61778fec14ebabd6a6182313bb778aa9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53cc96b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:16:38 2010 +0200 core: always compile the raw sockets code on linux Raw sockets support is compiled always on linux. Note that while the code is there, one still needs to explicitly enable them in ser.cfg or at runtime (e.g. setting udp4_raw = 1 at runtime will switch to using raw sockets for sending if possible). --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1eb19f5..4cc1ee6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1628,7 +1628,7 @@ ifeq ($(OS), linux) use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ - -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER + -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DUSE_RAW_SOCKS ifneq ($(found_lock_method), yes) #C_DEFS+= -DUSE_POSIX_SEM C_DEFS+=-DUSE_PTHREAD_MUTEX

1 0

git:andrei/raw_sock: raw sockets: ttl can be set from the config file
by Andrei Pelinescu-Onciul 10 Aug '10

10 Aug '10

Module: sip-router Branch: andrei/raw_sock Commit: 2556cd84fa12b25e9545535db9c766bf9cd3f354 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2556cd8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:15:06 2010 +0200 raw sockets: ttl can be set from the config file The ttl used for raw sockets can be set from the config file, using udp4_raw_ttl. -1 can be used for auto-detection. --- cfg.lex | 2 ++ cfg.y | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index de88891..6829724 100644 --- a/cfg.lex +++ b/cfg.lex @@ -215,6 +215,7 @@ UDP_MTU "udp_mtu" UDP_MTU_TRY_PROTO "udp_mtu_try_proto" UDP4_RAW "udp4_raw" UDP4_RAW_MTU "udp4_raw_mtu" +UDP4_RAW_TTL "udp4_raw_ttl" SETFLAG setflag RESETFLAG resetflag ISFLAGSET isflagset @@ -611,6 +612,7 @@ SUBST subst return UDP_MTU_TRY_PROTO; } <INITIAL>{UDP4_RAW} { count(); yylval.strval=yytext; return UDP4_RAW; } <INITIAL>{UDP4_RAW_MTU} { count(); yylval.strval=yytext; return UDP4_RAW_MTU; } +<INITIAL>{UDP4_RAW_TTL} { count(); yylval.strval=yytext; return UDP4_RAW_TTL; } <INITIAL>{IF} { count(); yylval.strval=yytext; return IF; } <INITIAL>{ELSE} { count(); yylval.strval=yytext; return ELSE; } diff --git a/cfg.y b/cfg.y index 3c52e69..78b0102 100644 --- a/cfg.y +++ b/cfg.y @@ -331,6 +331,7 @@ extern char *finame; %token UDP_MTU_TRY_PROTO %token UDP4_RAW %token UDP4_RAW_MTU +%token UDP4_RAW_TTL %token IF %token ELSE %token SET_ADV_ADDRESS @@ -1593,6 +1594,10 @@ assign_stm: IF_RAW_SOCKS(default_core_cfg.udp4_raw_mtu=$3); } | UDP4_RAW_MTU EQUAL error { yyerror("number expected"); } + | UDP4_RAW_TTL EQUAL NUMBER { + IF_RAW_SOCKS(default_core_cfg.udp4_raw_ttl=$3); + } + | UDP4_RAW_TTL EQUAL error { yyerror("number expected"); } | cfg_var | error EQUAL { yyerror("unknown config variable"); } ;

1 0

git:andrei/raw_sock: raw sockets: ttl can be set or auto-detected
by Andrei Pelinescu-Onciul 10 Aug '10

10 Aug '10

Module: sip-router Branch: andrei/raw_sock Commit: 9eb54078fd76b53f27cb57a13ccae9e14e3b5237 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9eb5407… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:09:19 2010 +0200 raw sockets: ttl can be set or auto-detected The IP TTL used when sending on raw sockets can be set using the core.udp4_raw_ttl config variable. By default it is auto-detected on startup (the same IP TTL as the one for the first udp4 socket is used). --- cfg_core.c | 24 ++++++++++++++++++++ cfg_core.h | 1 + main.c | 16 +++++++++++++ raw_sock.c | 9 +++---- sock_ut.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sock_ut.h | 39 +++++++++++++++++++++++++++++++++ 6 files changed, 155 insertions(+), 5 deletions(-) diff --git a/cfg_core.c b/cfg_core.c index 7f2018c..88f234f 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -56,6 +56,8 @@ #include "pt.h" #endif #include "msg_translator.h" /* fix_global_req_flags() */ +#include "globals.h" +#include "sock_ut.h" #include "cfg/cfg.h" #include "cfg_core.h" @@ -113,6 +115,7 @@ struct cfg_group_core default_core_cfg = { 0, /*!< udp_mtu_try_proto -> default disabled */ 0, /**< udp4_raw (disabled by default) */ 1500, /**< udp4_raw_mtu (1500 by default) */ + -1, /**< udp4_raw_ttl (auto detect by default) */ 0, /*!< force_rport */ L_DBG, /*!< memlog */ 1 /*!< mem_summary -flags: 0 off, 1 shm/pkg_status, 2 shm/pkg_sums */ @@ -153,6 +156,24 @@ static int check_raw_sock_support(void* cfg_h, str* gname, str* name, +static int udp4_raw_ttl_fixup(void* cfg_h, str* gname, str* name, void** val) +{ + int v; + v = (int)(long)(*val); + if (v < 0) { + if (sendipv4) + v = sock_get_ttl(sendipv4->socket); + } + if (v < 0) { + /* some error => use a reasonable default */ + v = 63; + } + *val = (void*)(long)v; + return 0; +} + + + cfg_def_t core_cfg_def[] = { {"debug", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "debug level"}, @@ -264,6 +285,9 @@ cfg_def_t core_cfg_def[] = { "set the MTU used when using raw sockets for udp sending." " This value will be used when deciding whether or not to fragment" " the packets."}, + {"udp4_raw_ttl", CFG_VAR_INT | CFG_ATOMIC, -1, 255, udp4_raw_ttl_fixup, 0, + "set the IP TTL used when using raw sockets for udp sending." + " -1 will use the same value as for normal udp sockets."}, {"force_rport", CFG_VAR_INT, 0, 1, 0, fix_global_req_flags, "force rport for all the received messages" }, {"memlog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, diff --git a/cfg_core.h b/cfg_core.h index 1c4b3e7..df15c05 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -103,6 +103,7 @@ struct cfg_group_core { int udp_mtu_try_proto; /*!< if packet> udp_mtu, try proto (e.g. TCP) */ int udp4_raw; /* use raw sockets for sending on udp ipv 4 */ int udp4_raw_mtu; /* mtu used when using udp raw socket */ + int udp4_raw_ttl; /* ttl used when using udp raw sockets */ int force_rport; /*!< if set rport will always be forced*/ int memlog; /*!< log level for memory status/summary info */ int mem_summary; /*!< display memory status/summary info on exit */ diff --git a/main.c b/main.c index a90e855..d157a6b 100644 --- a/main.c +++ b/main.c @@ -188,6 +188,7 @@ #include "basex.h" /* init */ #include "pvapi_init.h" /* init */ #include "pv_core.h" /* register core pvars */ +#include "sock_ut.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h> @@ -1266,6 +1267,13 @@ int main_loop() default_core_cfg.udp4_raw = 1; /* enabled */ DBG("raw socket possible => turning it on\n"); } + if (default_core_cfg.udp4_raw_ttl < 0) { + /* auto-detect */ + default_core_cfg.udp4_raw_ttl = sock_get_ttl(sendipv4->socket); + if (default_core_cfg.udp4_raw_ttl < 0) + /* error, use some default value */ + default_core_cfg.udp4_raw_ttl = 63; + } } #else default_core.cfg.udp4_raw = 0; @@ -1417,6 +1425,14 @@ int main_loop() default_core_cfg.udp4_raw = 1; /* enabled */ DBG("raw socket possible => turning it on\n"); } + if (default_core_cfg.udp4_raw_ttl < 0) { + /* auto-detect */ + default_core_cfg.udp4_raw_ttl = + sock_get_ttl(sendipv4->socket); + if (default_core_cfg.udp4_raw_ttl < 0) + /* error, use some default value */ + default_core_cfg.udp4_raw_ttl = 63; + } } } #else diff --git a/raw_sock.c b/raw_sock.c index 37ac6e5..5c56e18 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -56,6 +56,8 @@ #include <netinet/udp.h> #include "raw_sock.h" +#include "cfg/cfg.h" +#include "cfg_core.h" /** create and return a raw socket. @@ -79,11 +81,8 @@ int raw_socket(int proto, struct ip_addr* ip, str* iface, int iphdr_incl) char* ifname; sock = socket(PF_INET, SOCK_RAW, proto); - if (sock==-1){ - ERR("raw_socket: socket() failed: %s [%d]\n", - strerror(errno), errno); + if (sock==-1) goto error; - } /* set socket options */ if (iphdr_incl) { t=1; @@ -426,7 +425,7 @@ inline static int mk_ip_hdr(struct ip* iph, struct in_addr* from, iph->ip_len = htons(payload_len); iph->ip_id = 0; iph->ip_off = 0; /* frag.: first 3 bits=flags=0, last 13 bits=offset */ - iph->ip_ttl = 63; /* FIXME: use some configured value */ + iph->ip_ttl = cfg_get(core, core_cfg, udp4_raw_ttl); iph->ip_p = proto; iph->ip_sum = 0; iph->ip_src = *from; diff --git a/sock_ut.c b/sock_ut.c new file mode 100644 index 0000000..3aee2cd --- /dev/null +++ b/sock_ut.c @@ -0,0 +1,71 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** various socket related functions. + * @file sock_ut.c + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-08-09 initial version (andrei) +*/ + +#include "sock_ut.h" + +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <errno.h> +#include <arpa/inet.h> + + +/** get the IP TTL. + * @return ttl on success, < 0 on error + */ +int sock_get_ttl(int sock) +{ + int ioptval; + unsigned int ioptvallen; + + ioptvallen=sizeof(ioptval); + if (getsockopt( sock, IPPROTO_IP, IP_TTL, (void*) &ioptval, + &ioptvallen) == -1 ) + { + return -1; + } + return ioptval; +} + + + +/** set the IP TTL on a socket. + * @return ttl on success, < 0 on error + */ +int sock_set_ttl(int sock, int ttl) +{ + int ioptval; + + if (setsockopt( sock, IPPROTO_IP, IP_TTL, (void*) &ioptval, + sizeof(ioptval)) == -1 ) + return -1; + return ioptval; +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/sock_ut.h b/sock_ut.h new file mode 100644 index 0000000..e9613d1 --- /dev/null +++ b/sock_ut.h @@ -0,0 +1,39 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** various socket related functions. + * @file sock_ut.h + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-08-09 initial version (andrei) +*/ + +#ifndef __sock_ut_h +#define __sock_ut_h + + + +int sock_get_ttl(int sock); +int sock_set_ttl(int sock, int ttl); + + +#endif /*__sock_ut_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

1 0

git:andrei/raw_sock: core: include raw socket support in version info
by Andrei Pelinescu-Onciul 10 Aug '10

10 Aug '10

Module: sip-router Branch: andrei/raw_sock Commit: 83a82189aa73b2175939e496b707588a94d669d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83a8218… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:04:33 2010 +0200 core: include raw socket support in version info --- version.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/version.h b/version.h index 1c60539..3c3783f 100644 --- a/version.h +++ b/version.h @@ -79,6 +79,13 @@ #endif +#ifdef USE_RAW_SOCKS +#define USE_RAW_SOCKS_STR ", USE_RAW_SOCKS" +#else +#define USE_RAW_SOCKS_STR "" +#endif + + #ifdef DISABLE_NAGLE #define DISABLE_NAGLE_STR ", DISABLE_NAGLE" #else @@ -337,7 +344,7 @@ #define SER_COMPILE_FLAGS \ STATS_STR EXTRA_DEBUG_STR USE_IPV6_STR USE_TCP_STR USE_TLS_STR \ - USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR \ + USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ USE_STUN_STR DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \ NO_SIG_DEBUG_STR DNS_IP_HACK_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR \

1 0

git:andrei/raw_sock: raw sockets: use BSD ip & udp structure versions
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/raw_sock Commit: ce63e6365ef3c9e9fa4914a90e71aaf599b02275 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce63e63… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jul 8 17:28:46 2010 +0200 raw sockets: use BSD ip & udp structure versions Use the BSD versions for the ip header structure (struct ip instead of struct iphdr) and the udp header structure (struct udphdr). Since the BSD versions are used in most Unixes, this change would make the code more portable. --- raw_sock.c | 79 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 41 insertions(+), 38 deletions(-) diff --git a/raw_sock.c b/raw_sock.c index 136f595..37ac6e5 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -29,7 +29,6 @@ */ /* * FIXME: IP_PKTINFO & IP_HDRINCL - linux specific - * FIXME: linux specific iphdr and udphdr */ #ifdef USE_RAW_SOCKS @@ -48,9 +47,13 @@ #include <fcntl.h> #include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> +#ifndef __USE_BSD +#define __USE_BSD /* on linux use bsd version of iphdr (more portable) */ +#endif /* __USE_BSD */ #include <netinet/ip.h> +#define __FAVOR_BSD /* on linux use bsd version of udphdr (more portable) */ #include <netinet/udp.h> -#include <arpa/inet.h> #include "raw_sock.h" @@ -249,7 +252,7 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, char* end; char* udph_start; char* udp_payload; - struct iphdr iph; + struct ip iph; struct udphdr udph; unsigned short udp_len; @@ -257,21 +260,21 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, if (unlikely(n<0)) goto error; end=*buf+n; - if (unlikely(n<(sizeof(struct iphdr)+sizeof(struct udphdr)))) { + if (unlikely(n<(sizeof(struct ip)+sizeof(struct udphdr)))) { n=-3; goto error; } /* FIXME: if initial buffer is aligned, one could skip the memcpy - and directly cast iphdr and udphdr pointer to the memory */ - memcpy(&iph, *buf, sizeof(struct iphdr)); - udph_start=*buf+iph.ihl*4; + and directly cast ip and udphdr pointer to the memory */ + memcpy(&iph, *buf, sizeof(struct ip)); + udph_start=*buf+iph.ip_hl*4; udp_payload=udph_start+sizeof(struct udphdr); if (unlikely(udp_payload>end)){ n=-3; goto error; } memcpy(&udph, udph_start, sizeof(struct udphdr)); - udp_len=ntohs(udph.len); + udp_len=ntohs(udph.uh_ulen); if (unlikely((udph_start+udp_len)!=end)){ if ((udph_start+udp_len)>end){ n=-3; @@ -289,12 +292,12 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, /* fill ip from the packet (needed if no PKT_INFO is used) */ dst_ip.af=AF_INET; dst_ip.len=4; - dst_ip.u.addr32[0]=iph.daddr; + dst_ip.u.addr32[0]=iph.ip_dst.s_addr; /* fill dst_port */ - dst_port=ntohs(udph.dest); + dst_port=ntohs(udph.uh_dport); ip_addr2su(to, &dst_ip, dst_port); /* fill src_port */ - src_port=ntohs(udph.source); + src_port=ntohs(udph.uh_sport); su_setport(from, src_port); if (likely(rf)) { su2ip_addr(&dst_ip, to); @@ -333,9 +336,9 @@ inline unsigned short udpv4_vhdr_sum( struct udphdr* uh, /* pseudo header */ sum=(src->s_addr>>16)+(src->s_addr&0xffff)+ (dst->s_addr>>16)+(dst->s_addr&0xffff)+ - htons(IPPROTO_UDP)+(uh->len); + htons(IPPROTO_UDP)+(uh->uh_ulen); /* udp header */ - sum+=(uh->dest)+(uh->source)+(uh->len) + 0 /*chksum*/; + sum+=(uh->uh_dport)+(uh->uh_sport)+(uh->uh_ulen) + 0 /*chksum*/; /* fold it */ sum=(sum>>16)+(sum&0xffff); sum+=(sum>>16); @@ -392,14 +395,14 @@ inline static int mk_udp_hdr(struct udphdr* u, struct sockaddr_in* from, struct sockaddr_in* to, unsigned char* buf, int len, int do_chk) { - u->len=htons((unsigned short)len+sizeof(struct udphdr)); - u->source=from->sin_port; - u->dest=to->sin_port; + u->uh_ulen=htons((unsigned short)len+sizeof(struct udphdr)); + u->uh_sport=from->sin_port; + u->uh_dport=to->sin_port; if (do_chk) - u->check=htons( + u->uh_sum=htons( udpv4_chksum(u, &from->sin_addr, &to->sin_addr, buf, len)); else - u->check=0; /* no checksum */ + u->uh_sum=0; /* no checksum */ return 0; } @@ -414,20 +417,20 @@ inline static int mk_udp_hdr(struct udphdr* u, struct sockaddr_in* from, * @param proto - protocol. * @return 0 on success, < 0 on error. */ -inline static int mk_ip_hdr(struct iphdr* iph, struct in_addr* from, +inline static int mk_ip_hdr(struct ip* iph, struct in_addr* from, struct in_addr* to, int payload_len, unsigned char proto) { - iph->ihl = sizeof(struct iphdr)/4; - iph->version = 4; - iph->tos = tos; - iph->tot_len = htons(payload_len); - iph->id = 0; - iph->frag_off = 0; /* first 3 bits = flags = 0, last 13 bits = offset */ - iph->ttl = 63; /* FIXME: use some configured value */ - iph->protocol = proto; - iph->check = 0; - iph->saddr = from->s_addr; - iph->daddr = to->s_addr; + iph->ip_hl = sizeof(struct ip)/4; + iph->ip_v = 4; + iph->ip_tos = tos; + iph->ip_len = htons(payload_len); + iph->ip_id = 0; + iph->ip_off = 0; /* frag.: first 3 bits=flags=0, last 13 bits=offset */ + iph->ip_ttl = 63; /* FIXME: use some configured value */ + iph->ip_p = proto; + iph->ip_sum = 0; + iph->ip_src = *from; + iph->ip_dst = *to; return 0; } @@ -509,7 +512,7 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, struct msghdr snd_msg; struct iovec iov[2]; struct ip_udp_hdr { - struct iphdr ip; + struct ip ip; struct udphdr udp; } hdr; unsigned int totlen; @@ -561,15 +564,15 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, /* if we are here mtu => sizeof(ip_h+udp_h) && payload > mtu => last_frag_offs >= sizeof(hdr.udp) */ last_frag_start = buf + last_frag_offs - sizeof(hdr.udp); - hdr.ip.id = fastrand_max(65534) + 1; /* random id, should be != 0 + hdr.ip.ip_id = fastrand_max(65534) + 1; /* random id, should be != 0 (if 0 the kernel will fill it) */ /* send the first fragment */ iov[1].iov_base=buf; /* ip_frag_size >= sizeof(hdr.udp) because we are here only if mtu >= sizeof(hdr.ip) + sizeof(hdr.udp) */ iov[1].iov_len=ip_frag_size - sizeof(hdr.udp); - hdr.ip.tot_len = htons(ip_frag_size); - hdr.ip.frag_off = htons(0x2000); /* set MF */ + hdr.ip.ip_len = htons(ip_frag_size); + hdr.ip.ip_off = htons(0x2000); /* set MF */ ret=sendmsg(rsock, &snd_msg, 0); if (unlikely(ret < 0)) goto end; @@ -579,9 +582,9 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, /* fragments between the first and the last */ while(unlikely(iov[1].iov_base < last_frag_start)) { iov[1].iov_len = ip_frag_size; - hdr.ip.tot_len = htons(iov[1].iov_len); + hdr.ip.ip_len = htons(iov[1].iov_len); /* set MF */ - hdr.ip.frag_off = htons( (unsigned short) + hdr.ip.ip_off = htons( (unsigned short) (((char*)iov[1].iov_base - (char*)buf + sizeof(hdr.udp)) / 8) | 0x2000); ret=sendmsg(rsock, &snd_msg, 0); @@ -591,9 +594,9 @@ int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, } /* last fragment */ iov[1].iov_len = buf + len - (char*)iov[1].iov_base; - hdr.ip.tot_len = htons(iov[1].iov_len); + hdr.ip.ip_len = htons(iov[1].iov_len); /* don't set MF (last fragment) */ - hdr.ip.frag_off = htons( (unsigned short) + hdr.ip.ip_off = htons( (unsigned short) (((char*)iov[1].iov_base - (char*)buf + sizeof(hdr.udp)) / 8) ); ret=sendmsg(rsock, &snd_msg, 0);

1 0

git:master: core: sdp parser - cosmetic fixes (replacing 0 with NULL)
by Ovidiu Sas 09 Aug '10

09 Aug '10

Module: sip-router Branch: master Commit: cfedffe13336bfdaba6e1dca1fed718858cdaea5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfedffe… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Aug 9 17:58:22 2010 -0400 core: sdp parser - cosmetic fixes (replacing 0 with NULL) --- parser/sdp/sdp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 0025c03..55b3b79 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -47,7 +47,7 @@ static inline int new_sdp(struct sip_msg* _m) sdp_info_t* sdp; sdp = (sdp_info_t*)pkg_malloc(sizeof(sdp_info_t)); - if (sdp == 0) { + if (sdp == NULL) { LM_ERR("No memory left\n"); return -1; } @@ -1005,7 +1005,7 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) clone_stream->payloads_num = stream->payloads_num; if (clone_stream->payloads_num) { - if (0 == init_p_payload_attr(clone_stream, USE_SHM_MEM)) { + if (NULL == init_p_payload_attr(clone_stream, USE_SHM_MEM)) { goto error; } }

1 0

git:master: core: sdp parser - added suport for fmtp attributes
by Ovidiu Sas 09 Aug '10

09 Aug '10

Module: sip-router Branch: master Commit: 12a33bc8d08cabefb2a0205d4f3c1140b4355707 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12a33bc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Aug 9 16:38:09 2010 -0400 core: sdp parser - added suport for fmtp attributes --- parser/sdp/sdp.c | 69 ++++++++++++++++++++++++++++------------- parser/sdp/sdp.h | 1 + parser/sdp/sdp_helpr_funcs.c | 42 +++++++++++++++++++++++++ parser/sdp/sdp_helpr_funcs.h | 1 + 4 files changed, 91 insertions(+), 22 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index d3e6f85..0025c03 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -69,9 +69,9 @@ static inline sdp_session_cell_t *add_sdp_session(sdp_info_t* _sdp, int session_ len = sizeof(sdp_session_cell_t); session = (sdp_session_cell_t*)pkg_malloc(len); - if (session == 0) { + if (session == NULL) { LM_ERR("No memory left\n"); - return 0; + return NULL; } memset( session, 0, len); @@ -100,9 +100,9 @@ static inline sdp_stream_cell_t *add_sdp_stream(sdp_session_cell_t* _session, in len = sizeof(sdp_stream_cell_t); stream = (sdp_stream_cell_t*)pkg_malloc(len); - if (stream == 0) { + if (stream == NULL) { LM_ERR("No memory left\n"); - return 0; + return NULL; } memset( stream, 0, len); @@ -141,9 +141,9 @@ static inline sdp_payload_attr_t *add_sdp_payload(sdp_stream_cell_t* _stream, in len = sizeof(sdp_payload_attr_t); payload_attr = (sdp_payload_attr_t*)pkg_malloc(len); - if (payload_attr == 0) { + if (payload_attr == NULL) { LM_ERR("No memory left\n"); - return 0; + return NULL; } memset( payload_attr, 0, len); @@ -167,14 +167,14 @@ static inline sdp_payload_attr_t** init_p_payload_attr(sdp_stream_cell_t* _strea int payloads_num, i; sdp_payload_attr_t *payload; - if (_stream == 0) { + if (_stream == NULL) { LM_ERR("Invalid stream\n"); - return 0; + return NULL; } payloads_num = _stream->payloads_num; if (payloads_num == 0) { LM_ERR("Invalid number of payloads\n"); - return 0; + return NULL; } if (pkg == USE_PKG_MEM) { _stream->p_payload_attr = (sdp_payload_attr_t**)pkg_malloc(payloads_num * sizeof(sdp_payload_attr_t*)); @@ -182,11 +182,11 @@ static inline sdp_payload_attr_t** init_p_payload_attr(sdp_stream_cell_t* _strea _stream->p_payload_attr = (sdp_payload_attr_t**)shm_malloc(payloads_num * sizeof(sdp_payload_attr_t*)); } else { LM_ERR("undefined memory type\n"); - return 0; + return NULL; } - if (_stream->p_payload_attr == 0) { + if (_stream->p_payload_attr == NULL) { LM_ERR("No memory left\n"); - return 0; + return NULL; } --payloads_num; @@ -205,7 +205,7 @@ static inline sdp_payload_attr_t** init_p_payload_attr(sdp_stream_cell_t* _strea void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, str *rtp_clock, str *rtp_params) { - if (payload_attr == 0) { + if (payload_attr == NULL) { LM_ERR("Invalid payload location\n"); return; } @@ -219,6 +219,18 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, str *r return; } +void set_sdp_payload_fmtp(sdp_payload_attr_t *payload_attr, str *fmtp_string ) +{ + if (payload_attr == NULL) { + LM_ERR("Invalid payload location\n"); + return; + } + payload_attr->fmtp_string.s = fmtp_string->s; + payload_attr->fmtp_string.len = fmtp_string->len; + + return; +} + /* * Getters .... */ @@ -353,6 +365,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ sdp_stream_cell_t *stream; sdp_payload_attr_t *payload_attr; int parse_payload_attr; + str fmtp_string; /* * Parsing of SDP body. @@ -478,7 +491,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ payload.s = tmpstr1.s; payload.len = a1p - tmpstr1.s; payload_attr = add_sdp_payload(stream, payloadnum, &payload); - if (payload_attr == 0) return -1; + if (payload_attr == NULL) return -1; tmpstr1.len -= payload.len; tmpstr1.s = a1p; a2p = eat_space_end(tmpstr1.s, tmpstr1.s + tmpstr1.len); @@ -490,7 +503,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ } /* Initialize fast access pointers */ - if (0 == init_p_payload_attr(stream, USE_PKG_MEM)) { + if (NULL == init_p_payload_attr(stream, USE_PKG_MEM)) { return -1; } parse_payload_attr = 1; @@ -523,6 +536,10 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ set_sdp_payload_attr(payload_attr, &rtp_enc, &rtp_clock, &rtp_params); } else if (extract_rtcp(&tmpstr1, &stream->rtcp_port) == 0) { a1p = stream->rtcp_port.s + stream->rtcp_port.len; + } else if (parse_payload_attr && extract_fmtp(&tmpstr1,&rtp_payload,&fmtp_string) == 0){ + a1p = fmtp_string.s + fmtp_string.len; + payload_attr = (sdp_payload_attr_t*)get_sdp_payload4payload(stream, &rtp_payload); + set_sdp_payload_fmtp(payload_attr, &fmtp_string); } else if (extract_accept_types(&tmpstr1, &stream->accept_types) == 0) { a1p = stream->accept_types.s + stream->accept_types.len; } else if (extract_accept_wrapped_types(&tmpstr1, &stream->accept_wrapped_types) == 0) { @@ -649,7 +666,7 @@ int parse_sdp(struct sip_msg* _m) } body.s = get_body(_m); - if (body.s==0) { + if (body.s==NULL) { LM_ERR("failed to get the message body\n"); return -1; } @@ -732,7 +749,7 @@ void free_sdp(sdp_info_t** _sdp) sdp_payload_attr_t *payload, *l_payload; LM_DBG("_sdp = %p\n", _sdp); - if (sdp == 0) return; + if (sdp == NULL) return; LM_DBG("sdp = %p\n", sdp); session = sdp->sessions; LM_DBG("session = %p\n", session); @@ -783,13 +800,14 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level) stream->accept_wrapped_types.len, stream->accept_wrapped_types.s); payload = stream->payload_attr; while (payload) { - LOG(log_level, "......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s'\n", + LOG(log_level, "......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n", payload->payload_num, payload, payload->next, payload->payload_num, stream->p_payload_attr[payload->payload_num], payload->rtp_payload.len, payload->rtp_payload.s, payload->rtp_enc.len, payload->rtp_enc.s, payload->rtp_clock.len, payload->rtp_clock.s, - payload->rtp_params.len, payload->rtp_params.s); + payload->rtp_params.len, payload->rtp_params.s, + payload->fmtp_string.len, payload->fmtp_string.s); payload=payload->next; } } @@ -891,7 +909,8 @@ sdp_payload_attr_t * clone_sdp_payload_attr(sdp_payload_attr_t *attr) attr->rtp_payload.len + attr->rtp_enc.len + attr->rtp_clock.len + - attr->rtp_params.len; + attr->rtp_params.len + + attr->fmtp_string.len; clone_attr = (sdp_payload_attr_t*)shm_malloc(len); if (clone_attr == NULL) { LM_ERR("no more shm mem (%d)\n",len); @@ -930,6 +949,13 @@ sdp_payload_attr_t * clone_sdp_payload_attr(sdp_payload_attr_t *attr) p += attr->rtp_params.len; } + if (attr->fmtp_string.len) { + clone_attr->fmtp_string.s = p; + clone_attr->fmtp_string.len = attr->fmtp_string.len; + memcpy( p, attr->fmtp_string.s, attr->fmtp_string.len); + p += attr->fmtp_string.len; + } + return clone_attr; } @@ -1163,8 +1189,7 @@ error: sdp_info_t * clone_sdp_info(struct sip_msg* _m) { - sdp_info_t *clone_sdp_info, *sdp_info=(sdp_info_t*)_m->body -; + sdp_info_t *clone_sdp_info, *sdp_info=(sdp_info_t*)_m->body; sdp_session_cell_t *clone_session, *prev_clone_session, *session; int i, len; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index c7cc866..bdbf593 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -41,6 +41,7 @@ typedef struct sdp_payload_attr { str rtp_enc; str rtp_clock; str rtp_params; + str fmtp_string; } sdp_payload_attr_t; typedef struct sdp_stream_cell { diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 90a19fe..8b521f9 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -224,6 +224,48 @@ int extract_rtpmap(str *body, return 0; } +int extract_fmtp( str *body, str *fmtp_payload, str *fmtp_string ) +{ + char *cp, *cp1; + int len; + + if (strncasecmp(body->s, "a=fmtp:", 7) !=0) { + /*LM_DBG("We are not pointing to an a=fmtp: attribute =>`%.*s'\n", body->len, body->s); */ + return -1; + } + + cp1 = body->s; + + fmtp_payload->s = cp1 + 7; /* skip `a=fmtp:' */ + fmtp_payload->len = eat_line(fmtp_payload->s, body->s + body->len - + fmtp_payload->s) - fmtp_payload->s; + trim_len(fmtp_payload->len, fmtp_payload->s, *fmtp_payload); + len = fmtp_payload->len; + + /* */ + cp = eat_token_end(fmtp_payload->s, fmtp_payload->s + fmtp_payload->len); + fmtp_payload->len = cp - fmtp_payload->s; + if (fmtp_payload->len <= 0 || cp == fmtp_payload->s) { + LM_ERR("no encoding in `a=fmtp:'\n"); + return -1; + } + len -= fmtp_payload->len; + fmtp_string->s = cp; + cp = eat_space_end(fmtp_string->s, fmtp_string->s + len); + len -= cp - fmtp_string->s; + if (len <= 0 || cp == fmtp_string->s) { + LM_ERR("no encoding in `a=fmtp:'\n"); + return -1; + } + + fmtp_string->s = cp; + + fmtp_string->len = eat_line(fmtp_string->s, body->s + body->len - + fmtp_string->s) - fmtp_string->s; + trim_len(fmtp_string->len, fmtp_string->s, *fmtp_string); + + return 0; +} /* generic method for attribute extraction * field must has format "a=attrname:" */ diff --git a/parser/sdp/sdp_helpr_funcs.h b/parser/sdp/sdp_helpr_funcs.h index 0456993..21512e6 100644 --- a/parser/sdp/sdp_helpr_funcs.h +++ b/parser/sdp/sdp_helpr_funcs.h @@ -45,6 +45,7 @@ int get_mixed_part_delimiter(str * body, str * mp_delimiter); int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding, str *rtpmap_clockrate, str *rtpmap_parmas); +int extract_fmtp( str *body, str *fmtp_payload, str *fmtp_string ); int extract_ptime(str *body, str *ptime); int extract_sendrecv_mode(str *body, str *sendrecv_mode); int extract_mediaip(str *body, str *mediaip, int *pf, char *line);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010