sr-dev

sr-dev@lists.kamailio.org

44307 discussions

SF.net SVN: openser:[6007] branches/1.5/trie/dtrie.c

by Marius Zbihlei

Revision: 6007 http://openser.svn.sourceforge.net/openser/?rev=6007&view=rev Author: mariuszbihlei Date: 2010-06-16 11:09:33 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Always set data pointer to NULL to prevent problems when root node has data associated to it. Modified Paths: -------------- branches/1.5/trie/dtrie.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 7 months

git:andrei/tcp_tls_changes: tls: SSL_shutdown() only fully established connections

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 3b5c6550ba6a308b6ac0da245dd594a65317d6a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b5c655… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 16 10:05:07 2010 +0200 tls: SSL_shutdown() only fully established connections - do SSL_shutdown() only on established TLS connections (established here is from the SSL point of view and not from the tcp one) - minor warning fixes --- modules/tls/tls_server.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 9028c5f..c99e6b3 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -233,7 +233,7 @@ static void tls_dump_cert_info(char* s, X509* cert) */ int tls_accept(struct tcp_connection *c, int* error) { - int ret, ssl_err; + int ret; SSL *ssl; X509* cert; struct tls_extra_data* tls_c; @@ -300,7 +300,7 @@ err: int tls_connect(struct tcp_connection *c, int* error) { SSL *ssl; - int ret, ssl_err; + int ret; X509* cert; struct tls_extra_data* tls_c; int tls_log; @@ -362,14 +362,20 @@ err: static int tls_shutdown(struct tcp_connection *c) { int ret, err, ssl_err; + struct tls_extra_data* tls_c; SSL *ssl; - ssl = ((struct tls_extra_data*)c->extra_data)->ssl; - if (ssl == 0) { + tls_c=(struct tls_extra_data*)c->extra_data; + if (unlikely(tls_c == 0 || tls_c->ssl == 0)) { ERR("No SSL data to perform tls_shutdown\n"); return -1; } - if (LOW_MEM_CONNECTED_TEST()){ + ssl = tls_c->ssl; + /* it doesn't make sense to try a TLS level shutdown + if the connection is not fully initialized */ + if (unlikely(tls_c->state != S_TLS_ESTABLISHED)) + return 0; + if (unlikely(LOW_MEM_CONNECTED_TEST())){ ERR("tls: ssl bug #1491 workaround: not enough memory for safe" " operation: %lu\n", shm_available()); goto err; @@ -1036,8 +1042,8 @@ ssl_read_skipped: rd.used - rd.pos); if (unlikely(enc_rd_buf == 0)) { ERR("memory allocation error (%d bytes requested)\n", - sizeof(*enc_rd_buf) + sizeof(enc_rd_buf->buf) + - rd.used - rd.pos); + (int)(sizeof(*enc_rd_buf) + sizeof(enc_rd_buf->buf) + + rd.used - rd.pos)); goto error; } enc_rd_buf->pos = 0;

14 years, 7 months

git:master: makefile: quiet output support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e37e8d6a6158d49aa5fa1092d91b595cf0d91e2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e37e8d6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 15:30:02 2009 +0200 makefile: quiet output support Support for quiet output (without all the flags and compile options): make Q=1 or make QUIET=1. It can be saved in the config (e.g. make config Q=1) and it can be overridden any time (e.g. make utils Q=0). Compilation is a little faster in quiet mode and the same speed as before in normal mode. Example module output: CC (gcc) [M tm.so] uac.o LD (gcc) [M tm.so] tm.so Lib example: LD (gcc) [L libbinrpc.so.0.1] libbinrpc.so.0.1 --- Makefile.defs | 3 ++- Makefile.rules | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f883a0b..a9bd307 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1901,7 +1901,8 @@ saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME \ PREFIX LOCALBASE \ TAR \ INSTALL INSTALL_CFG INSTALL_BIN INSTALL_MODULES INSTALL_DOC \ - INSTALL_MAN INSTALL_LIB INSTALL_TOUCH INSTALL_SHARE + INSTALL_MAN INSTALL_LIB INSTALL_TOUCH INSTALL_SHARE \ + Q # variable changeable at compile time # extra: prefix DESTDIR BASEDIR basedirt diff --git a/Makefile.rules b/Makefile.rules index 99042c3..55c7897 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -52,9 +52,33 @@ endif ALLDEP+=makecfg.lst +# returns current type: "" core/unknown, "M" module, "L" libray, "U" util +crt_type=$(if $(MOD_NAME),M,$(if $(LIB_NAME),L,$(if $(UTIL_NAME),U))) + +cmd_CC=$(CC) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) -c $< -o $@ +cmd_LD=$(LD) $(LDFLAGS) $(objs) $(extra_objs) $(ALL_LIBS) $(SER_RPATH) \ + -o $(NAME) + +# what will be displayed if quiet==silent +silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@ +silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ + +ifneq (,$(filter 1 yes on, $(Q) $(QUIET))) +quiet=silent +Q=1 +else +Q=0 +quiet=verbose +endif + +quote:= " +escall= $(subst $$,$$$$,$(subst $(quote),\$(quote),$1)) +exec_cmd= $(if $($(quiet)_cmd_$(1)),\ + @echo "$(call escall,$($(quiet)_cmd_$(1)))" ;) $(cmd_$(1)) + #implicit rules %.o:%.c $(ALLDEP) - $(CC) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) -c $< -o $@ + $(call exec_cmd,CC) %.d: %.c $(ALLDEP) @set -e; $(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $<\ @@ -149,7 +173,7 @@ endif # normal rules $(NAME): $(objs) $(ALLDEP) - $(LD) $(LDFLAGS) $(objs) $(extra_objs) $(ALL_LIBS) $(SER_RPATH) -o $(NAME) + $(call exec_cmd,LD) librpath.lst: $(ALLDEP)

14 years, 7 months

git:master: makefile: quiet output by default

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9f264d53c19edf8658bd0ebaa2f82a291676c3ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f264d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 17:26:07 2010 +0200 makefile: quiet output by default Quiet output is used now by default. For verbose output one can either add Q=0 /Q=no/ Q=verbose to the make command line (e.g. make Q=verbose all) or for a more permanent solution one can run make config with Q set (e.g. make config Q=0). --- Makefile.defs | 4 +++- Makefile.rules | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1eb19f5..e34f305 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -78,7 +78,9 @@ # needed to generate dependencies on-the-fly while compiling # or is empty if the compiler doesn't support it (andrei) -quiet?=$(if $(filter 1 yes on,$(Q)),silent,verbose) + +# default silent, unless Q= 0|no|off|verbose|noisy +quiet?=$(if $(filter 0 no off verbose noisy,$(Q)),verbose,silent) # check if already included/exported diff --git a/Makefile.rules b/Makefile.rules index f816f8b..9870a77 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -81,17 +81,17 @@ endif # CC_MKDEP_OPTS silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@ silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ -ifneq (,$(filter 1 yes on, $(Q) $(QUIET))) +ifneq (,$(filter 0 no off verbose noisy, $(Q) $(QUIET))) +override Q:= +quiet=verbose +#shell optional print +oecho=echo $(1) +else quiet=silent Q=1 MAKE+= --no-print-directory #shell optional print oecho= -else -override Q:= -quiet=verbose -#shell optional print -oecho=echo $(1) endif module_make= if [ -n "$(1)" -a -r "$(1)/Makefile" ]; then \

14 years, 7 months

git:master: cfg parsing: disable non constant rval in ip comparison warning

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bd55f84d2c815eed907bf197430e00e5b4d99378 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd55f84… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 17:00:51 2010 +0200 cfg parsing: disable non constant rval in ip comparison warning Reported-by: Steven C. Blair blairs isc upenn edu --- cfg.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 5052078..ae214f2 100644 --- a/cfg.y +++ b/cfg.y @@ -2062,7 +2062,7 @@ exp_elem: yyerror("BUG: unexpected dynamic type"); } }else{ - warn("non constant rvalue in ip comparison"); + /* warn("non constant rvalue in ip comparison") */; } if (s_tmp.s){ ip_tmp=str2ip(&s_tmp);

14 years, 7 months

git:master: core: futexlock compilation workaround for OpenSuse 10.2

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 291166681c62ca42c05d3b501482311aa51f8d0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2911666… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 19:11:59 2010 +0200 core: futexlock compilation workaround for OpenSuse 10.2 In some older linux distributions /usr/include/futex.h uses a __user attribute, which is defined in linux/compiler.h. However linux/compiler.h is not part of the kernel headers package in most recent distributions. Instead they ship a modified linux/futex.h that does not include <linux/compile.h> and does not use __user. "__user" is used only for checking pointer address space in the kernel (using the sparse tool and make C=1 or make C=2) so it's safe to define it as null/empty. Reported-by: Alexandr Dubovikov shurik start4 info --- futexlock.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/futexlock.h b/futexlock.h index df93b81..0f39d83 100644 --- a/futexlock.h +++ b/futexlock.h @@ -55,6 +55,16 @@ typedef __u32 u32; struct task_struct; /* end of the hack */ +/* another hack this time for OpenSuse 10.2: + futex.h uses a __user attribute, which is defined in linux/compiler.h + However linux/compiler.h is not part of the kernel headers package in + most distributions. Instead they ship a modified linux/futex.h that does + not include <linux/compile.h> and does not user __user. +*/ +#ifndef __user +#define __user +#endif /* __user__*/ +/* end of hack */ #include <linux/futex.h> #include <sys/syscall.h> #include <unistd.h>

14 years, 7 months

git:andrei/raw_sock: raw sockets: config file support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: e92fe8b41e30abc92b5a8e2b4baff0d4aab95e61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e92fe8b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 16:46:04 2010 +0200 raw sockets: config file support Raw socket usage for udp ipv4 send, can now be turned on/off/auto from the config file, via udp4_raw. The mtu used can be set via udp4_raw_mtu. --- cfg.lex | 4 ++++ cfg.y | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index e4b5486..de88891 100644 --- a/cfg.lex +++ b/cfg.lex @@ -213,6 +213,8 @@ ADD_LOCAL_RPORT "add_local_rport" FORCE_TCP_ALIAS "force_tcp_alias"|"add_tcp_alias" UDP_MTU "udp_mtu" UDP_MTU_TRY_PROTO "udp_mtu_try_proto" +UDP4_RAW "udp4_raw" +UDP4_RAW_MTU "udp4_raw_mtu" SETFLAG setflag RESETFLAG resetflag ISFLAGSET isflagset @@ -607,6 +609,8 @@ SUBST subst <INITIAL>{UDP_MTU} { count(); yylval.strval=yytext; return UDP_MTU; } <INITIAL>{UDP_MTU_TRY_PROTO} { count(); yylval.strval=yytext; 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>{IF} { count(); yylval.strval=yytext; return IF; } <INITIAL>{ELSE} { count(); yylval.strval=yytext; return ELSE; } diff --git a/cfg.y b/cfg.y index 5052078..3c52e69 100644 --- a/cfg.y +++ b/cfg.y @@ -200,6 +200,12 @@ #define IF_SCTP(x) warn("sctp support not compiled in") #endif +#ifdef USE_RAW_SOCKS + #define IF_RAW_SOCKS(x) x +#else + #define IF_RAW_SOCKS(x) warn("raw socket support not compiled in") +#endif + extern int yylex(); /* safer then using yytext which can be array or pointer */ @@ -323,6 +329,8 @@ extern char *finame; %token FORCE_TCP_ALIAS %token UDP_MTU %token UDP_MTU_TRY_PROTO +%token UDP4_RAW +%token UDP4_RAW_MTU %token IF %token ELSE %token SET_ADV_ADDRESS @@ -1579,6 +1587,12 @@ assign_stm: { default_core_cfg.udp_mtu_try_proto=$3; fix_global_req_flags(0, 0); } | UDP_MTU_TRY_PROTO EQUAL error { yyerror("TCP, TLS, SCTP or UDP expected"); } + | UDP4_RAW EQUAL intno { IF_RAW_SOCKS(default_core_cfg.udp4_raw=$3); } + | UDP4_RAW EQUAL error { yyerror("number expected"); } + | UDP4_RAW_MTU EQUAL NUMBER { + IF_RAW_SOCKS(default_core_cfg.udp4_raw_mtu=$3); + } + | UDP4_RAW_MTU EQUAL error { yyerror("number expected"); } | cfg_var | error EQUAL { yyerror("unknown config variable"); } ;

14 years, 7 months

git:andrei/raw_sock: raw sockets: runtime config support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 1db67b92772ffbdfe2320774f91b75e87414c462 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1db67b9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 16:31:16 2010 +0200 raw sockets: runtime config support Usage of raw sockets for send and the used mtu can now be set at runtime via the 2 new added core config variables: udp4_raw and udp4_raw_mtu. udp4_raw can have 3 values: disabled (0), on (1) and auto (-1). If set to auto raw sockets will be used if possible. E.g.: sercmd cfg.set_now_int core udp4_raw_mtu 576 --- cfg_core.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- cfg_core.h | 11 +++++---- globals.h | 4 +++ 3 files changed, 62 insertions(+), 15 deletions(-) diff --git a/cfg_core.c b/cfg_core.c index 101ba9f..7f2018c 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -24,16 +24,15 @@ * 2007-12-03 Initial version (Miklos) * 2008-01-31 added DNS resolver parameters (Miklos) */ -/*! - * \file - * \brief SIP-router core :: Core configuration parser - * \ingroup core - * Module: \ref core +/** core runtime config. + * @file cfg_core.c + * @ingroup core + * Module: @ref core * - * See - * - \ref ConfigCoreDoc - * - \ref ConfigEngine - * - \ref cfg_core.h + * See + * - @ref ConfigCoreDoc + * - @ref ConfigEngine + * - @ref cfg_core.h */ /*! * \page ConfigCoreDoc Documentation of configuration parser @@ -112,6 +111,8 @@ struct cfg_group_core default_core_cfg = { DEFAULT_MAX_WHILE_LOOPS, /*!< max_while_loops */ 0, /*!< udp_mtu (disabled by default) */ 0, /*!< udp_mtu_try_proto -> default disabled */ + 0, /**< udp4_raw (disabled by default) */ + 1500, /**< udp4_raw_mtu (1500 by default) */ 0, /*!< force_rport */ L_DBG, /*!< memlog */ 1 /*!< mem_summary -flags: 0 off, 1 shm/pkg_status, 2 shm/pkg_sums */ @@ -119,6 +120,39 @@ struct cfg_group_core default_core_cfg = { void *core_cfg = &default_core_cfg; + +static int check_raw_sock_support(void* cfg_h, str* gname, str* name, + void** v) +{ + int val; + + val = (int)(long)(*v); +#ifndef USE_RAW_SOCKS + if (val > 0) { + ERR("no RAW_SOCKS support, please recompile with it enabled\n"); + return -1; + } + return 0; +#else /* USE_RAW_SOCKS */ + if (raw_udp4_send_sock < 0) { + if (val > 0) { + ERR("could not intialize raw socket on startup, please " + "restart as root or with CAP_NET_RAW\n"); + return -1; + } else if (val < 0) { + /* auto and no socket => disable */ + *v = (void*)(long)0; + } + } else if (val < 0) { + /* auto and socket => enable */ + *v = (void*)(long)1; + } + return 0; +#endif /* USE_RAW_SOCKS */ +} + + + cfg_def_t core_cfg_def[] = { {"debug", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, "debug level"}, @@ -177,7 +211,8 @@ cfg_def_t core_cfg_def[] = { {"dns_search_full_match", CFG_VAR_INT, 0, 1, 0, 0, "enable/disable domain name checks against the search list " "in DNS answers"}, - {"dns_reinit", CFG_VAR_INT|CFG_INPUT_INT, 1, 1, dns_reinit_fixup, resolv_reinit, + {"dns_reinit", CFG_VAR_INT|CFG_INPUT_INT, 1, 1, dns_reinit_fixup, + resolv_reinit, "set to 1 in order to reinitialize the DNS resolver"}, /* DNS cache */ #ifdef USE_DNS_CACHE @@ -222,6 +257,13 @@ cfg_def_t core_cfg_def[] = { " exceeds udp_mtu"}, {"udp_mtu_try_proto", CFG_VAR_INT, 1, 4, 0, fix_global_req_flags, "if send size > udp_mtu use proto (1 udp, 2 tcp, 3 tls, 4 sctp)"}, + {"udp4_raw", CFG_VAR_INT | CFG_ATOMIC, -1, 1, check_raw_sock_support, 0, + "enable/disable using a raw socket for sending UDP IPV4 packets." + " Should be faster on multi-CPU linux running machines."}, + {"udp4_raw_mtu", CFG_VAR_INT | CFG_ATOMIC, 28, 65535, 0, 0, + "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."}, {"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 1e86692..1c4b3e7 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -36,12 +36,11 @@ * ------- * 2007-12-03 Initial version (Miklos) */ -/*! - * \file - * \brief SIP-router core :: Core configuration - * \ingroup core +/** core runtime config. + * @file cfg_core.h + * @ingroup core * - * Module: \ref core + * Module: @ref core */ @@ -102,6 +101,8 @@ struct cfg_group_core { int max_while_loops; int udp_mtu; /*!< maximum send size for udp, if > try another protocol*/ 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 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/globals.h b/globals.h index add1f40..40f7214 100644 --- a/globals.h +++ b/globals.h @@ -64,6 +64,10 @@ extern struct socket_info* bind_address; /* pointer to the crt. proc. extern struct socket_info* sendipv4; /* ipv4 socket to use when msg. comes from ipv6*/ extern struct socket_info* sendipv6; /* same as above for ipv6 */ +#ifdef USE_RAW_SOCKS +extern int raw_udp4_send_sock; +#endif /* USE_RAW_SOCKS */ + #ifdef USE_TCP extern struct socket_info* sendipv4_tcp; /* ipv4 socket to use when msg. comes from ipv6*/

14 years, 7 months

git:andrei/raw_sock: raw sockets: build ip header & fragmentation support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 869a731313e489254fb220ce52120b7682a2526c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=869a731… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 16:27:55 2010 +0200 raw sockets: build ip header & fragmentation support Support for sending on raw sockets with IP_HDRINCL or IPPROTO_RAW, that require building the IP header and fragmentation. --- raw_sock.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- raw_sock.h | 6 ++- 2 files changed, 164 insertions(+), 7 deletions(-) diff --git a/raw_sock.c b/raw_sock.c index e8b90b1..136f595 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -24,11 +24,12 @@ * History: * -------- * 2010-06-07 initial version (from older code) andrei + * 2010-06-15 IP_HDRINCL raw socket support, including on-send + * fragmentation (andrei) */ /* * FIXME: IP_PKTINFO & IP_HDRINCL - linux specific * FIXME: linux specific iphdr and udphdr - * FIXME: send support for IP_HDRINCL */ #ifdef USE_RAW_SOCKS @@ -37,7 +38,8 @@ #include "ip_addr.h" #include "dprint.h" #include "str.h" -#include "ut.h" +#include "rand/fastrand.h" +#include "globals.h" #include <errno.h> #include <string.h> @@ -99,7 +101,7 @@ int raw_socket(int proto, struct ip_addr* ip, str* iface, int iphdr_incl) } t=IP_PMTUDISC_DONT; if(setsockopt(sock, IPPROTO_IP, IP_MTU_DISCOVER, &t, sizeof(t)) ==-1){ - LOG(L_ERR, "raw_socket: setsockopt(IP_MTU_DISCOVER): %s\n", + ERR("raw_socket: setsockopt(IP_MTU_DISCOVER): %s\n", strerror(errno)); goto error; } @@ -275,7 +277,7 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, n=-3; goto error; }else{ - LOG(L_ERR, "udp length too small: %d/%d\n", + ERR("udp length too small: %d/%d\n", (int)udp_len, (int)(end-udph_start)); n=-3; goto error; @@ -290,7 +292,7 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, dst_ip.u.addr32[0]=iph.daddr; /* fill dst_port */ dst_port=ntohs(udph.dest); - ip_addr2su(to, &dst_ip, port); + ip_addr2su(to, &dst_ip, dst_port); /* fill src_port */ src_port=ntohs(udph.source); su_setport(from, src_port); @@ -403,6 +405,34 @@ inline static int mk_udp_hdr(struct udphdr* u, struct sockaddr_in* from, +/** fill in an ip header. + * Note: the checksum is _not_ computed + * @param iph - ip header that will be filled. + * @param from - source ip v4 address (network byte order). + * @param to - destination ip v4 address (network byte order). + * @param payload len - payload length (not including the ip header). + * @param proto - protocol. + * @return 0 on success, < 0 on error. + */ +inline static int mk_ip_hdr(struct iphdr* 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; + return 0; +} + + + /** send an udp packet over a raw socket. * @param rsock - raw socket * @param buf - data @@ -413,7 +443,8 @@ inline static int mk_udp_hdr(struct udphdr* u, struct sockaddr_in* from, * @return <0 on error (errno set too), number of bytes sent on success * (including the udp header => on success len + udpheader size). */ -int raw_udp4_send(int rsock, char* buf, int len, union sockaddr_union* from, +int raw_udp4_send(int rsock, char* buf, unsigned int len, + union sockaddr_union* from, union sockaddr_union* to) { struct msghdr snd_msg; @@ -453,4 +484,126 @@ int raw_udp4_send(int rsock, char* buf, int len, union sockaddr_union* from, +/** send an udp packet over an IP_HDRINCL raw socket. + * If needed, send several fragments. + * @param rsock - raw socket + * @param buf - data + * @param len - data len + * @param from - source address:port (_must_ be non-null, but the ip address + * can be 0, in which case it will be filled by the kernel). + * @param to - destination address:port + * @param mtu - maximum datagram size (including the ip header, excluding + * link layer headers). Minimum allowed size is 28 + * (sizeof(ip_header + udp_header)). If mtu is lower, it will + * be ignored (the packet will be sent un-fragmented). + * 0 can be used to disable fragmentation. + * @return <0 on error (-2: datagram too big, -1: check errno), + * number of bytes sent on success + * (including the ip & udp headers => + * on success len + udpheader + ipheader size). + */ +int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, + union sockaddr_union* from, + union sockaddr_union* to, unsigned short mtu) +{ + struct msghdr snd_msg; + struct iovec iov[2]; + struct ip_udp_hdr { + struct iphdr ip; + struct udphdr udp; + } hdr; + unsigned int totlen; + unsigned int ip_frag_size; /* fragment size */ + unsigned int last_frag_extra; /* extra bytes possible in the last frag */ + unsigned int ip_payload; + unsigned int last_frag_offs; + void* last_frag_start; + int frg_no; + int ret; + + totlen = len + sizeof(hdr); + if (unlikely(totlen) > 65535) + return -2; + memset(&snd_msg, 0, sizeof(snd_msg)); + snd_msg.msg_name=&to->sin; + snd_msg.msg_namelen=sockaddru_len(*to); + snd_msg.msg_iov=&iov[0]; + /* prepare the udp & ip headers */ + mk_udp_hdr(&hdr.udp, &from->sin, &to->sin, (unsigned char*)buf, len, 1); + mk_ip_hdr(&hdr.ip, &from->sin.sin_addr, &to->sin.sin_addr, + len + sizeof(hdr.udp), IPPROTO_UDP); + iov[0].iov_base=(char*)&hdr; + iov[0].iov_len=sizeof(hdr); + snd_msg.msg_iovlen=2; + snd_msg.msg_control=0; + snd_msg.msg_controllen=0; + snd_msg.msg_flags=0; + /* this part changes for different fragments */ + /* packets are fragmented if mtu has a valid value (at least an + IP header + UDP header fit in it) and if the total length is greater + then the mtu */ + if (likely(totlen <= mtu || mtu <= sizeof(hdr))) { + iov[1].iov_base=buf; + iov[1].iov_len=len; + ret=sendmsg(rsock, &snd_msg, 0); + } else { + ip_payload = len + sizeof(hdr.udp); + /* a fragment offset must be a multiple of 8 => its size must + also be a multiple of 8, except for the last fragment */ + ip_frag_size = (mtu -sizeof(hdr.ip)) & (~7); + last_frag_extra = (mtu - sizeof(hdr.ip)) & 7; /* rest */ + frg_no = ip_payload / ip_frag_size + + ((ip_payload % ip_frag_size) > last_frag_extra); + /*ip_last_frag_size = ip_payload % frag_size + + ((ip_payload % frag_size) <= last_frag_extra) * + ip_frag_size; */ + last_frag_offs = (frg_no - 1) * ip_frag_size; + /* 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 + (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 */ + ret=sendmsg(rsock, &snd_msg, 0); + if (unlikely(ret < 0)) + goto end; + /* all the other fragments, include only the ip header */ + iov[0].iov_len = sizeof(hdr.ip); + iov[1].iov_base = (char*)iov[1].iov_base + iov[1].iov_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); + /* set MF */ + hdr.ip.frag_off = htons( (unsigned short) + (((char*)iov[1].iov_base - (char*)buf + + sizeof(hdr.udp)) / 8) | 0x2000); + ret=sendmsg(rsock, &snd_msg, 0); + if (unlikely(ret < 0)) + goto end; + iov[1].iov_base = (char*)iov[1].iov_base + iov[1].iov_len; + } + /* last fragment */ + iov[1].iov_len = buf + len - (char*)iov[1].iov_base; + hdr.ip.tot_len = htons(iov[1].iov_len); + /* don't set MF (last fragment) */ + hdr.ip.frag_off = htons( (unsigned short) + (((char*)iov[1].iov_base - (char*)buf + + sizeof(hdr.udp)) / 8) ); + ret=sendmsg(rsock, &snd_msg, 0); + if (unlikely(ret < 0)) + goto end; + } +end: + return ret; +} + + + #endif /* USE_RAW_SOCKS */ diff --git a/raw_sock.h b/raw_sock.h index b0e5653..6be0aba 100644 --- a/raw_sock.h +++ b/raw_sock.h @@ -46,7 +46,11 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, union sockaddr_union* to); int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, union sockaddr_union* to, struct raw_filter* rf); -int raw_udp4_send(int rsock, char* buf, int len, union sockaddr_union* from, +int raw_udp4_send(int rsock, char* buf, unsigned int len, + union sockaddr_union* from, union sockaddr_union* to); +int raw_iphdr_udp4_send(int rsock, char* buf, unsigned int len, + union sockaddr_union* from, + union sockaddr_union* to, unsigned short mtu); #endif /* _raw_sock_h */

14 years, 7 months

git:andrei/raw_sock: raw socket: compilation fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: d0df7adc45ad9f7a5b253e1f4390084259b97cd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0df7ad… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jun 15 16:24:46 2010 +0200 raw socket: compilation fixes --- raw_listener.c | 9 +++------ raw_listener.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/raw_listener.c b/raw_listener.c index ef707a2..5656a74 100644 --- a/raw_listener.c +++ b/raw_listener.c @@ -26,18 +26,15 @@ #ifdef USE_RAW_SOCKS -#include "../../config.h" -#include "../../receive.h" #include "raw_listener.h" #include "raw_sock.h" -#include "tlb_send.h" -#include "tlb_cfg.h" +#include "receive.h" #include <errno.h> #include <string.h> -struct raw_listen_info* raw_sendipv4=0; +struct socket_info* raw_udp_sendipv4=0; /** creates a raw socket based on a socket_info structure. * Side-effects: sets raw_udp_sendipv4 if not already set. @@ -55,7 +52,7 @@ int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl) su2ip_addr(&ip, &si->su); sock=raw_udp4_socket(&ip, iface, iphdr_incl); if (sock>=0){ - if (raw_sendipv4==0 || iface==0 || iface->s==0) + if (raw_udp_sendipv4==0 || iface==0 || iface->s==0) raw_udp_sendipv4=si; } return sock; diff --git a/raw_listener.h b/raw_listener.h index 5bc2f58..3ac7d84 100644 --- a/raw_listener.h +++ b/raw_listener.h @@ -27,11 +27,11 @@ #ifndef _raw_listener_h #define _raw_listener_h -#include "../../ip_addr.h" +#include "ip_addr.h" /** default raw socket used for sending on udp ipv4 */ -struct struct_info* raw_udp_sendipv4; +struct socket_info* raw_udp_sendipv4; int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl); int raw_udp4_rcv_loop(int rsock, int port1, int port2);

14 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev