deleted file mode 100644

@@ -1,597 +0,0 @@

-/*

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * This file is part of Kamailio, a free SIP server.

- *

- * Kamailio is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * Kamailio is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- *

- */

-

-

-/** Kamailio core :: udp send and loop-receive functions.

- * @file udp_server.c

- * @ingroup core

- * Module: @ref core

- */

-

-#include <stdlib.h>

-#include <string.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>

-#ifdef __linux__

-	#include <linux/types.h>

-	#include <linux/errqueue.h>

-#endif

-

-

-#include "udp_server.h"

-#include "compiler_opt.h"

-#include "globals.h"

-#include "config.h"

-#include "dprint.h"

-#include "receive.h"

-#include "mem/mem.h"

-#include "ip_addr.h"

-#include "cfg/cfg_struct.h"

-#include "events.h"

-#include "stun.h"

-#ifdef USE_RAW_SOCKS

-#include "raw_sock.h"

-#endif /* USE_RAW_SOCKS */

-#ifdef USE_MCAST

-#include <net/if.h>

-#endif /* USE_MCAST */

-

-

-#ifdef DBG_MSG_QA

-/* message quality assurance -- frequently, bugs in ser have

-   been indicated by zero characters or long whitespaces

-   in generated messages; this debugging option aborts if

-   any such message is sighted

-*/

-static int dbg_msg_qa(char *buf, int len)

-{

-#define _DBG_WS_LEN 3

-#define _DBG_WS "   "

-

-	char *scan;

-	int my_len;

-	int space_cnt;

-	enum { QA_ANY, QA_SPACE, QA_EOL1 } state;

-

-

-	/* is there a zero character in there ? */	

-	if (memchr(buf, 0, len)) {

-		LM_CRIT("message with 0 in it\n");

-		return 0;

-	}

-

-	my_len=len;

-	scan=buf;

-	state=QA_ANY;

-	space_cnt=0;

-

-	while(my_len) {

-		switch(*scan) {

-			case ' ':	if (state==QA_SPACE) {

-							space_cnt++;

-							if (space_cnt==4) {

-								LM_CRIT("too many spaces\n");

-								return 0;

-							}

-						} else space_cnt=0;

-						state=QA_SPACE; 

-						break;

-

-			case '\r':	/* ignore */

-						space_cnt=0;

-						break;

-

-			case '\n': /* don't proceed to body on EoH */

-						if (state==QA_EOL1) goto qa_passed;

-						space_cnt=0;

-						state=QA_EOL1;

-						break;

-

-			default:	space_cnt=0;

-						state=QA_ANY;

-						break;

-		}

-		scan++;

-		my_len--;

-	}

-

-

-qa_passed:

-	return 1;

-}

-

-#endif

-

-

-int probe_max_receive_buffer( int udp_sock )

-{

-	int optval;

-	int ioptval;

-	unsigned int ioptvallen;

-	int foptval;

-	unsigned int foptvallen;

-	int voptval;

-	unsigned int voptvallen;

-	int phase=0;

-

-	/* jku: try to increase buffer size as much as we can */

-	ioptvallen=sizeof(ioptval);

-	if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &ioptval,

-		    &ioptvallen) == -1 )

-	{

-		LM_ERR("getsockopt: %s\n", strerror(errno));

-		return -1;

-	}

-	if ( ioptval==0 ) 

-	{

-		LM_DBG("SO_RCVBUF initially set to 0; resetting to %d\n",

-			BUFFER_INCREMENT );

-		ioptval=BUFFER_INCREMENT;

-	} else LM_INFO("SO_RCVBUF is initially %d\n", ioptval );

-	for (optval=ioptval; ;  ) {

-		/* increase size; double in initial phase, add linearly later */

-		if (phase==0) optval <<= 1; else optval+=BUFFER_INCREMENT;

-		if (optval > maxbuffer){

-			if (phase==1) break; 

-			else { phase=1; optval >>=1; continue; }

-		}

-		LM_DBG("trying SO_RCVBUF: %d\n", optval );

-		if (setsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF,

-			(void*)&optval, sizeof(optval)) ==-1){

-			/* Solaris returns -1 if asked size too big; Linux ignores */

-			LM_DBG("SOL_SOCKET failed for %d, phase %d: %s\n", optval, phase, strerror(errno));

-			/* if setting buffer size failed and still in the aggressive

-			   phase, try less aggressively; otherwise give up 

-			*/

-			if (phase==0) { phase=1; optval >>=1 ; continue; } 

-			else break;

-		} 

-		/* verify if change has taken effect */

-		/* Linux note -- otherwise I would never know that; funny thing: Linux

-		   doubles size for which we asked in setsockopt

-		*/

-		voptvallen=sizeof(voptval);

-		if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &voptval,

-		    &voptvallen) == -1 )

-		{

-			LM_ERR("getsockopt: %s\n", strerror(errno));

-			return -1;

-		} else {

-			LM_DBG("setting SO_RCVBUF; set=%d,verify=%d\n", 

-				optval, voptval);

-			if (voptval<optval) {

-				LM_DBG("setting SO_RCVBUF has no effect\n");

-				/* if setting buffer size failed and still in the aggressive

-				phase, try less aggressively; otherwise give up 

-				*/

-				if (phase==0) { phase=1; optval >>=1 ; continue; } 

-				else break;

-			} 

-		}

-	

-	} /* for ... */

-	foptvallen=sizeof(foptval);

-	if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &foptval,

-		    &foptvallen) == -1 )

-	{

-		LM_ERR("getsockopt: %s\n", strerror(errno));

-		return -1;

-	}

-	LM_INFO("SO_RCVBUF is finally %d\n", foptval );

-

-	return 0;

-

-	/* EoJKU */

-}

-

-

-#ifdef USE_MCAST

-

-/*

- * Setup multicast receiver

- */

-static int setup_mcast_rcvr(int sock, union sockaddr_union* addr, char* interface)

-{

-#ifdef HAVE_IP_MREQN

-	struct ip_mreqn mreq;

-#else

-	struct ip_mreq mreq;

-#endif

-	struct ipv6_mreq mreq6;

-

-	if (addr->s.sa_family==AF_INET){

-		memcpy(&mreq.imr_multiaddr, &addr->sin.sin_addr, 

-		       sizeof(struct in_addr));

-#ifdef HAVE_IP_MREQN

-		if (interface!=0) {

-			mreq.imr_ifindex = if_nametoindex(interface);

-		} else {

-			mreq.imr_ifindex = 0;

-		}

-		mreq.imr_address.s_addr = htonl(INADDR_ANY);

-#else

-		mreq.imr_interface.s_addr = htonl(INADDR_ANY);

-#endif

-		

-		if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,&mreq,

-			       sizeof(mreq))==-1){

-			LM_ERR("setsockopt: %s\n", strerror(errno));

-			return -1;

-		}

-		

-	} else if (addr->s.sa_family==AF_INET6){

-		memcpy(&mreq6.ipv6mr_multiaddr, &addr->sin6.sin6_addr, 

-		       sizeof(struct in6_addr));

-		if (interface!=0) {

-			mreq6.ipv6mr_interface = if_nametoindex(interface);

-		} else {

-			mreq6.ipv6mr_interface = 0;

-		}

-#ifdef __OS_linux

-		if (setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6,

-#else

-		if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6,

-#endif

-			       sizeof(mreq6))==-1){

-			LM_ERR("setsockopt:%s\n", strerror(errno));

-			return -1;

-		}

-		

-	} else {

-		LM_ERR("setup_mcast_rcvr: Unsupported protocol family\n");

-		return -1;

-	}

-	return 0;

-}

-

-#endif /* USE_MCAST */

-

-

-int udp_init(struct socket_info* sock_info)

-{

-	union sockaddr_union* addr;

-	int optval;

-#ifdef USE_MCAST

-	unsigned char m_ttl, m_loop;

-#endif

-	addr=&sock_info->su;

-/*

-	addr=(union sockaddr_union*)pkg_malloc(sizeof(union sockaddr_union));

-	if (addr==0){

-		LM_ERR("out of memory\n");

-		goto error;

-	}

-*/

-	sock_info->proto=PROTO_UDP;

-	if (init_su(addr, &sock_info->address, sock_info->port_no)<0){

-		LM_ERR("could not init sockaddr_union\n");

-		goto error;

-	}

-	

-	sock_info->socket = socket(AF2PF(addr->s.sa_family), SOCK_DGRAM, 0);

-	if (sock_info->socket==-1){

-		LM_ERR("socket: %s\n", strerror(errno));

-		goto error;

-	}

-	/* set sock opts? */

-	optval=1;

-	if (setsockopt(sock_info->socket, SOL_SOCKET, SO_REUSEADDR ,

-					(void*)&optval, sizeof(optval)) ==-1){

-		LM_ERR("setsockopt: %s\n", strerror(errno));

-		goto error;

-	}

-	/* tos */

-	optval = tos;

-	if (addr->s.sa_family==AF_INET){

-		if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, 

-				sizeof(optval)) ==-1){

-			LM_WARN("setsockopt tos: %s\n", strerror(errno));

-			/* continue since this is not critical */

-		}

-	} else if (addr->s.sa_family==AF_INET6){

-		if (setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_TCLASS,

-					(void*)&optval, sizeof(optval)) ==-1) {

-			LM_WARN("setsockopt v6 tos: %s\n", strerror(errno));

-			/* continue since this is not critical */

-		}

-	}

-

-#if defined (__OS_linux) && defined(UDP_ERRORS)

-	optval=1;

-	/* enable error receiving on unconnected sockets */

-	if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR,

-					(void*)&optval, sizeof(optval)) ==-1){

-		LM_ERR("setsockopt: %s\n", strerror(errno));

-		goto error;

-	}

-#endif

-#if defined (__OS_linux)

-	/* if pmtu_discovery=1 then set DF bit and do Path MTU discovery

-	 * disabled by default */

-	optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;

-	if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER,

-			(void*)&optval, sizeof(optval)) ==-1){

-		LM_ERR("setsockopt: %s\n", strerror(errno));

-		goto error;

-	}

-#endif

-

-#ifdef USE_MCAST

-	if ((sock_info->flags & SI_IS_MCAST) 

-	    && (setup_mcast_rcvr(sock_info->socket, addr, sock_info->mcast.s)<0)){

-			goto error;

-	}

-	/* set the multicast options */

-	if (addr->s.sa_family==AF_INET){

-		m_loop=mcast_loopback;

-		if (setsockopt(sock_info->socket, IPPROTO_IP, IP_MULTICAST_LOOP, 

-						&m_loop, sizeof(m_loop))==-1){

-			LM_WARN("setsockopt(IP_MULTICAST_LOOP): %s\n", strerror(errno));

-			/* it's only a warning because we might get this error if the

-			  network interface doesn't support multicasting -- andrei */

-		}

-		if (mcast_ttl>=0){

-			m_ttl=mcast_ttl;

-			if (setsockopt(sock_info->socket, IPPROTO_IP, IP_MULTICAST_TTL,

-						&m_ttl, sizeof(m_ttl))==-1){

-				LM_WARN("setsockopt (IP_MULTICAST_TTL): %s\n", strerror(errno));

-			}

-		}

-	} else if (addr->s.sa_family==AF_INET6){

-		if (setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, 

-						&mcast_loopback, sizeof(mcast_loopback))==-1){

-			LM_WARN("setsockopt (IPV6_MULTICAST_LOOP): %s\n", strerror(errno));

-		}

-		if (mcast_ttl>=0){

-			if (setsockopt(sock_info->socket, IPPROTO_IP, IPV6_MULTICAST_HOPS,

-							&mcast_ttl, sizeof(mcast_ttl))==-1){

-				LM_WARN("setssckopt (IPV6_MULTICAST_HOPS): %s\n", strerror(errno));

-			}

-		}

-	} else {

-		LM_ERR("Unsupported protocol family %d\n", addr->s.sa_family);

-		goto error;

-	}

-#endif /* USE_MCAST */

-

-	if ( probe_max_receive_buffer(sock_info->socket)==-1) goto error;

-	

-	if (bind(sock_info->socket,  &addr->s, sockaddru_len(*addr))==-1){

-		LM_ERR("bind(%x, %p, %d) on %s: %s\n",

-				sock_info->socket, &addr->s, 

-				(unsigned)sockaddru_len(*addr),

-				sock_info->address_str.s,

-				strerror(errno));

-		if (addr->s.sa_family==AF_INET6)

-			LM_ERR("might be caused by using a link local address, try site local or global\n");

-		goto error;

-	}

-

-/*	pkg_free(addr);*/

-	return 0;

-

-error:

-/*	if (addr) pkg_free(addr);*/

-	return -1;

-}

-

-

-

-int udp_rcv_loop()

-{

-	unsigned len;

-#ifdef DYN_BUF

-	char* buf;

-#else

-	static char buf [BUF_SIZE+1];

-#endif

-	char *tmp;

-	union sockaddr_union* from;

-	unsigned int fromlen;

-	struct receive_info ri;

-

-

-	from=(union sockaddr_union*) pkg_malloc(sizeof(union sockaddr_union));

-	if (from==0){

-		LM_ERR("out of memory\n");

-		goto error;

-	}

-	memset(from, 0 , sizeof(union sockaddr_union));

-	ri.bind_address=bind_address; /* this will not change, we do it only once*/

-	ri.dst_port=bind_address->port_no;

-	ri.dst_ip=bind_address->address;

-	ri.proto=PROTO_UDP;

-	ri.proto_reserved1=ri.proto_reserved2=0;

-

-	/* initialize the config framework */

-	if (cfg_child_init()) goto error;

-

-	for(;;){

-#ifdef DYN_BUF

-		buf=pkg_malloc(BUF_SIZE+1);

-		if (buf==0){

-			LM_ERR("could not allocate receive buffer\n");

-			goto error;

-		}

-#endif

-		fromlen=sockaddru_len(bind_address->su);

-		len=recvfrom(bind_address->socket, buf, BUF_SIZE, 0, &from->s,

-											&fromlen);

-		if (len==-1){

-			if (errno==EAGAIN){

-				LM_DBG("packet with bad checksum received\n");

-				continue;

-			}

-			LM_ERR("recvfrom:[%d] %s\n", errno, strerror(errno));

-			if ((errno==EINTR)||(errno==EWOULDBLOCK)|| (errno==ECONNREFUSED))

-				continue; /* goto skip;*/

-			else goto error;

-		}

-		/* we must 0-term the messages, receive_msg expects it */

-		buf[len]=0; /* no need to save the previous char */

-

-		ri.src_su=*from;

-		su2ip_addr(&ri.src_ip, from);

-		ri.src_port=su_getport(from);

-

-		if(unlikely(sr_event_enabled(SREV_NET_DGRAM_IN)))

-		{

-			void *sredp[3];

-			sredp[0] = (void*)buf;

-			sredp[1] = (void*)(&len);

-			sredp[2] = (void*)(&ri);

-			if(sr_event_exec(SREV_NET_DGRAM_IN, (void*)sredp)<0) {

-				/* data handled by callback - continue to next packet */

-				continue;

-			}

-		}

-#ifndef NO_ZERO_CHECKS

-		if (!unlikely(sr_event_enabled(SREV_STUN_IN)) || (unsigned char)*buf != 0x00) {

-			if (len<MIN_UDP_PACKET) {

-				tmp=ip_addr2a(&ri.src_ip);

-				LM_DBG("probing packet received from %s %d\n", tmp, htons(ri.src_port));

-				continue;

-			}

-		}

-/* historically, zero-terminated packets indicated a bug in clients

- * that calculated wrongly packet length and included string-terminating

- * zero; today clients exist with legitimate binary payloads and we

- * shall not check for zero-terminated payloads

- */

-#ifdef TRASH_ZEROTERMINATED_PACKETS

-		if (buf[len-1]==0) {

-			tmp=ip_addr2a(&ri.src_ip);

-			LM_WARN("upstream bug - 0-terminated packet from %s %d\n",

-					tmp, htons(ri.src_port));

-			len--;

-		}

-#endif

-#endif

-#ifdef DBG_MSG_QA

-		if (!dbg_msg_qa(buf, len)) {

-			LM_WARN("an incoming message didn't pass test,"

-						"  drop it: %.*s\n", len, buf );

-			continue;

-		}

-#endif

-		if (ri.src_port==0){

-			tmp=ip_addr2a(&ri.src_ip);

-			LM_INFO("dropping 0 port packet from %s\n", tmp);

-			continue;

-		}

-		

-		/* update the local config */

-		cfg_update();

-		if (unlikely(sr_event_enabled(SREV_STUN_IN)) && (unsigned char)*buf == 0x00) {

-			/* stun_process_msg releases buf memory if necessary */

-			if ((stun_process_msg(buf, len, &ri)) != 0) {

-				continue; /* some error occurred */

-			}

-		} else {

-			/* receive_msg must free buf too!*/

-			receive_msg(buf, len, &ri);

-		}

-		

-	/* skip: do other stuff */

-		

-	}

-	/*

-	if (from) pkg_free(from);

-	return 0;

-	*/

-	

-error:

-	if (from) pkg_free(from);

-	return -1;

-}

-

-

-

-

-/* send buf:len over udp to dst (uses only the to and send_sock dst members)

- * returns the numbers of bytes sent on success (>=0) and -1 on error

- */

-int udp_send(struct dest_info* dst, char *buf, unsigned len)

-{

-

-	int n;

-	int tolen;

-	struct ip_addr ip; /* used only on error, for debugging */

-#ifdef USE_RAW_SOCKS

-	int mtu;

-#endif /* USE_RAW_SOCKS */

-

-#ifdef DBG_MSG_QA

-	/* aborts on error, does nothing otherwise */

-	if (!dbg_msg_qa( buf, len )) {

-		LM_ERR("dbg_msg_qa failed\n");

-		abort();

-	}

-#endif

-#ifdef USE_RAW_SOCKS

-	if (likely( ! (raw_udp4_send_sock >= 0 &&

-					cfg_get(core, core_cfg, udp4_raw) &&

-					dst->send_sock->address.af == AF_INET) )) {

-#endif /* USE_RAW_SOCKS */

-		/* normal send over udp socket */

-		tolen=sockaddru_len(dst->to);

-again:

-		n=sendto(dst->send_sock->socket, buf, len, 0, &dst->to.s, tolen);

-#ifdef XL_DEBUG

-		LM_INFO("send status: %d\n", n);

-#endif

-		if (unlikely(n==-1)){

-			su2ip_addr(&ip, &dst->to);

-			LM_ERR("sendto(sock,%p,%u,0,%s:%d,%d): %s(%d)\n",

-					buf,len, ip_addr2a(&ip),

-					su_getport(&dst->to), tolen, strerror(errno), errno);

-			if (errno==EINTR) goto again;

-			if (errno==EINVAL) {

-				LM_CRIT("invalid sendtoparameters\n"

-				"one possible reason is the server is bound to localhost and\n"

-				"attempts to send to the net\n");

-			}

-		}

-#ifdef USE_RAW_SOCKS

-	} else {

-		/* send over a raw socket */

-		mtu = cfg_get(core, core_cfg, udp4_raw_mtu);

-raw_again:

-		n=raw_iphdr_udp4_send(raw_udp4_send_sock, buf, len,

-								&dst->send_sock->su,

-								&dst->to,

-								mtu);

-		if (unlikely(n==-1)){

-			su2ip_addr(&ip, &dst->to);

-			LM_ERR("raw_iphdr_udp4_send(%d,%p,%u,...,%s:%d,%d): %s(%d)\n",

-					raw_udp4_send_sock, buf,len, ip_addr2a(&ip),

-					su_getport(&dst->to), mtu, strerror(errno), errno);

-			if (errno==EINTR) goto raw_again;

-		}

-	}

-#endif /* USE_RAW_SOCKS */

-	return n;

-}

@@ -215,18 +215,26 @@ int probe_max_receive_buffer( int udp_sock )

  */

 static int setup_mcast_rcvr(int sock, union sockaddr_union* addr, char* interface)

 {

+#ifdef HAVE_IP_MREQN

 	struct ip_mreqn mreq;

+#else

+	struct ip_mreq mreq;

+#endif

 	struct ipv6_mreq mreq6;

 	if (addr->s.sa_family==AF_INET){

 		memcpy(&mreq.imr_multiaddr, &addr->sin.sin_addr, 

 		       sizeof(struct in_addr));

+#ifdef HAVE_IP_MREQN

 		if (interface!=0) {

 			mreq.imr_ifindex = if_nametoindex(interface);

 		} else {

 			mreq.imr_ifindex = 0;

 		}

 		mreq.imr_address.s_addr = htonl(INADDR_ANY);

+#else

+		mreq.imr_interface.s_addr = htonl(INADDR_ANY);

+#endif

 		if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,&mreq,

 			       sizeof(mreq))==-1){

@@ -55,6 +55,9 @@

 #ifdef USE_RAW_SOCKS

 #include "raw_sock.h"

 #endif /* USE_RAW_SOCKS */

+#ifdef USE_MCAST

+#include <net/if.h>

+#endif /* USE_MCAST */

 #ifdef DBG_MSG_QA

@@ -210,15 +213,20 @@ int probe_max_receive_buffer( int udp_sock )

 /*

  * Setup multicast receiver

  */

-static int setup_mcast_rcvr(int sock, union sockaddr_union* addr)

+static int setup_mcast_rcvr(int sock, union sockaddr_union* addr, char* interface)

 {

-	struct ip_mreq mreq;

+	struct ip_mreqn mreq;

 	struct ipv6_mreq mreq6;

-	

+

 	if (addr->s.sa_family==AF_INET){

 		memcpy(&mreq.imr_multiaddr, &addr->sin.sin_addr, 

 		       sizeof(struct in_addr));

-		mreq.imr_interface.s_addr = htonl(INADDR_ANY);

+		if (interface!=0) {

+			mreq.imr_ifindex = if_nametoindex(interface);

+		} else {

+			mreq.imr_ifindex = 0;

+		}

+		mreq.imr_address.s_addr = htonl(INADDR_ANY);

 		if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,&mreq,

 			       sizeof(mreq))==-1){

@@ -229,7 +237,11 @@ static int setup_mcast_rcvr(int sock, union sockaddr_union* addr)

 	} else if (addr->s.sa_family==AF_INET6){

 		memcpy(&mreq6.ipv6mr_multiaddr, &addr->sin6.sin6_addr, 

 		       sizeof(struct in6_addr));

-		mreq6.ipv6mr_interface = 0;

+		if (interface!=0) {

+			mreq6.ipv6mr_interface = if_nametoindex(interface);

+		} else {

+			mreq6.ipv6mr_interface = 0;

+		}

 #ifdef __OS_linux

 		if (setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6,

 #else

@@ -321,7 +333,7 @@ int udp_init(struct socket_info* sock_info)

 #ifdef USE_MCAST

 	if ((sock_info->flags & SI_IS_MCAST) 

-	    && (setup_mcast_rcvr(sock_info->socket, addr)<0)){

+	    && (setup_mcast_rcvr(sock_info->socket, addr, sock_info->mcast.s)<0)){

 			goto error;

 	}

 	/* set the multicast options */

@@ -90,7 +90,7 @@ static int dbg_msg_qa(char *buf, int len)

 			case ' ':	if (state==QA_SPACE) {

 							space_cnt++;

 							if (space_cnt==4) {

-								LM_CRIT("DBG_MSG_QA: too many spaces\n");

+								LM_CRIT("too many spaces\n");

 								return 0;

 							}

 						} else space_cnt=0;

@@ -422,7 +422,7 @@ int udp_rcv_loop()

 											&fromlen);

 		if (len==-1){

 			if (errno==EAGAIN){

-				DBG("udp_rcv_loop: packet with bad checksum received\n");

+				LM_DBG("packet with bad checksum received\n");

 				continue;

 			}

 			LM_ERR("recvfrom:[%d] %s\n", errno, strerror(errno));

@@ -452,8 +452,7 @@ int udp_rcv_loop()

 		if (!unlikely(sr_event_enabled(SREV_STUN_IN)) || (unsigned char)*buf != 0x00) {

 			if (len<MIN_UDP_PACKET) {

 				tmp=ip_addr2a(&ri.src_ip);

-				DBG("udp_rcv_loop: probing packet received from %s %d\n",

-					tmp, htons(ri.src_port));

+				LM_DBG("probing packet received from %s %d\n", tmp, htons(ri.src_port));

 				continue;

 			}

 		}

@@ -8,11 +8,6 @@

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

  * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

@@ -1,11 +1,9 @@

 /*

- * $Id$

- *

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * This file is part of Kamailio, a free SIP server.

  *

- * ser is free software; you can redistribute it and/or modify

+ * Kamailio is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

@@ -15,7 +13,7 @@

  * software, please contact iptel.org by e-mail at the following addresses:

  *    info@iptel.org

  *

- * ser is distributed in the hope that it will be useful,

+ * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

@@ -24,28 +22,10 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  *

- * History

- * --------

- *  2003-01-28  packet zero-termination moved to receive_msg (jiri)

- *  2003-02-10  undoed the above changes (andrei)

- *  2003-03-19  replaced all the mallocs/frees w/ pkg_malloc/pkg_free (andrei)

- *  2003-04-14  set sockopts to TOS low delay (andrei)

- *  2004-05-03  applied multicast support patch from janakj

- *              added set multicast ttl support (andrei)

- *  2004-07-05  udp_rcv_loop: drop packets with 0 src port + error msg.

- *              cleanups (andrei)

- *  2005-03-10  multicast options are now set for all the udp sockets (andrei)

- *  2005-06-26  failure to set mcast options is not an error anymore (andrei)

- *  2006-04-12  udp_send() switched to struct dest_info (andrei)

- *  2006-10-13  added STUN support (vlada)

- *  2007-08-28  disable/set MTU discover option for the udp sockets

- *               (in linux it's enabled by default which produces udp packets

- *                with the DF flag ser) (patch from hscholz)

- *  2010-06-15  support for using raw sockets for sending (andrei)

  */

-/** udp send and loop-receive functions.

+/** Kamailio core :: udp send and loop-receive functions.

  * @file udp_server.c

  * @ingroup core

  * Module: @ref core

@@ -101,7 +101,7 @@ static int dbg_msg_qa(char *buf, int len)

 	/* is there a zero character in there ? */	

 	if (memchr(buf, 0, len)) {

-		LOG(L_CRIT, "BUG: message with 0 in it\n");

+		LM_CRIT("message with 0 in it\n");

 		return 0;

 	}

@@ -115,8 +115,7 @@ static int dbg_msg_qa(char *buf, int len)

 			case ' ':	if (state==QA_SPACE) {

 							space_cnt++;

 							if (space_cnt==4) {

-								LOG(L_CRIT, "BUG(probably): DBG_MSG_QA: "

-									"too many spaces\n");

+								LM_CRIT("DBG_MSG_QA: too many spaces\n");

 								return 0;

 							}

 						} else space_cnt=0;

@@ -165,15 +164,15 @@ int probe_max_receive_buffer( int udp_sock )

 	if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &ioptval,

 		    &ioptvallen) == -1 )

 	{

-		LOG(L_ERR, "ERROR: udp_init: getsockopt: %s\n", strerror(errno));

+		LM_ERR("getsockopt: %s\n", strerror(errno));

 		return -1;

 	}

 	if ( ioptval==0 ) 

 	{

-		LOG(L_DBG, "DEBUG: udp_init: SO_RCVBUF initially set to 0; resetting to %d\n",

+		LM_DBG("SO_RCVBUF initially set to 0; resetting to %d\n",

 			BUFFER_INCREMENT );

 		ioptval=BUFFER_INCREMENT;

-	} else LOG(L_INFO, "INFO: udp_init: SO_RCVBUF is initially %d\n", ioptval );

+	} else LM_INFO("SO_RCVBUF is initially %d\n", ioptval );

 	for (optval=ioptval; ;  ) {

 		/* increase size; double in initial phase, add linearly later */

 		if (phase==0) optval <<= 1; else optval+=BUFFER_INCREMENT;

@@ -181,12 +180,11 @@ int probe_max_receive_buffer( int udp_sock )

 			if (phase==1) break; 

 			else { phase=1; optval >>=1; continue; }

 		}

-		LOG(L_DBG, "DEBUG: udp_init: trying SO_RCVBUF: %d\n", optval );

+		LM_DBG("trying SO_RCVBUF: %d\n", optval );

 		if (setsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF,

 			(void*)&optval, sizeof(optval)) ==-1){

 			/* Solaris returns -1 if asked size too big; Linux ignores */

-			LOG(L_DBG, "DEBUG: udp_init: SOL_SOCKET failed"

-					" for %d, phase %d: %s\n", optval, phase, strerror(errno));

+			LM_DBG("SOL_SOCKET failed for %d, phase %d: %s\n", optval, phase, strerror(errno));

 			/* if setting buffer size failed and still in the aggressive

 			   phase, try less aggressively; otherwise give up 

 			*/

@@ -201,13 +199,13 @@ int probe_max_receive_buffer( int udp_sock )

 		if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &voptval,

 		    &voptvallen) == -1 )

 		{

-			LOG(L_ERR, "ERROR: udp_init: getsockopt: %s\n", strerror(errno));

+			LM_ERR("getsockopt: %s\n", strerror(errno));

 			return -1;

 		} else {

-			LOG(L_DBG, "DEBUG: setting SO_RCVBUF; set=%d,verify=%d\n", 

+			LM_DBG("setting SO_RCVBUF; set=%d,verify=%d\n", 

 				optval, voptval);

 			if (voptval<optval) {

-				LOG(L_DBG, "DEBUG: setting SO_RCVBUF has no effect\n");

+				LM_DBG("setting SO_RCVBUF has no effect\n");

 				/* if setting buffer size failed and still in the aggressive

 				phase, try less aggressively; otherwise give up 

 				*/

@@ -221,10 +219,10 @@ int probe_max_receive_buffer( int udp_sock )

 	if (getsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*) &foptval,

 		    &foptvallen) == -1 )

 	{

-		LOG(L_ERR, "ERROR: udp_init: getsockopt: %s\n", strerror(errno));

+		LM_ERR("getsockopt: %s\n", strerror(errno));

 		return -1;

 	}

-	LOG(L_INFO, "INFO: udp_init: SO_RCVBUF is finally %d\n", foptval );

+	LM_INFO("SO_RCVBUF is finally %d\n", foptval );

 	return 0;

@@ -249,8 +247,7 @@ static int setup_mcast_rcvr(int sock, union sockaddr_union* addr)

 		if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,&mreq,

 			       sizeof(mreq))==-1){

-			LOG(L_ERR, "ERROR: setup_mcast_rcvr: setsockopt: %s\n",

-			    strerror(errno));

+			LM_ERR("setsockopt: %s\n", strerror(errno));

 			return -1;

 		}

@@ -264,13 +261,12 @@ static int setup_mcast_rcvr(int sock, union sockaddr_union* addr)

 		if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6,

 #endif