deleted file mode 100644

@@ -1,326 +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

- */

-

-/*!

- * \file

- * \brief Kamailio core ::

- * \ingroup core

- * Module: \ref core

- */

-

-#ifdef USE_TCP

-

-#include "pass_fd.h"

-

-#include <sys/types.h>

-#include <sys/socket.h>

-#include <sys/uio.h>

-#include <stdlib.h> /* for NULL definition on openbsd */

-#include <errno.h>

-#include <string.h>

-#ifdef NO_MSG_WAITALL

-#include <poll.h>

-#endif /* NO_MSG_WAITALL */

-

-#include "dprint.h"

-

-

-

-/** receive all the data or returns error (handles EINTR etc.)

- * params: socket

- *         data     - buffer for the results

- *         data_len -

- *         flags    - recv flags for the first recv (see recv(2)), only

- *                    0, MSG_WAITALL and MSG_DONTWAIT make sense

- * if flags is set to MSG_DONWAIT (or to 0 and the socket fd is non-blocking),

- * and if no data is queued on the fd, recv_all will not wait (it will

- * return error and set errno to EAGAIN/EWOULDBLOCK). However if even 1 byte

- *  is queued, the call will block until the whole data_len was read or an

- *  error or eof occurred ("semi-nonblocking" behaviour,  some tcp code

- *   counts on it).

- * if flags is set to MSG_WAITALL it will block even if no byte is available.

- *

- * returns: bytes read or error (<0)

- * can return < data_len if EOF */

-int recv_all(int socket, void* data, int data_len, int flags)

-{

-	int b_read;

-	int n;

-#ifdef NO_MSG_WAITALL

-	struct pollfd pfd;

-#endif /* NO_MSG_WAITALL */

-

-	b_read=0;

-again:

-#ifdef NO_MSG_WAITALL

-	if (flags & MSG_WAITALL){

-		n=-1;

-		goto poll_recv; /* simulate MSG_WAITALL */

-	}

-#endif /* NO_MSG_WAITALL */

-	n=recv(socket, (char*)data, data_len, flags);

-	if (n<0){

-		/* error */

-		if (errno==EINTR) goto again; /* signal, try again */

-		/* on EAGAIN just return (let the caller know) */

-		if ((errno==EAGAIN)||(errno==EWOULDBLOCK)) return n;

-			LM_CRIT("1st recv on %d failed: %s\n",

-					socket, strerror(errno));

-			return n;

-	}

-	b_read+=n;

-	while( (b_read!=data_len) && (n)){

-#ifdef NO_MSG_WAITALL

-		/* cygwin & win do not support MSG_WAITALL => workaround using poll */

-poll_recv:

-		n=recv(socket, (char*)data+b_read, data_len-b_read, 0);

-#else /* NO_MSG_WAITALL */

-		n=recv(socket, (char*)data+b_read, data_len-b_read, MSG_WAITALL);

-#endif /* NO_MSG_WAITALL */

-		if (n<0){

-			/* error */

-			if (errno==EINTR) continue; /* signal, try again */

-#ifdef NO_MSG_WAITALL

-			if (errno==EAGAIN || errno==EWOULDBLOCK){

-				/* emulate MSG_WAITALL using poll */

-				pfd.fd=socket;

-				pfd.events=POLLIN;

-poll_retry:

-				n=poll(&pfd, 1, -1);

-				if (n<0){

-					if (errno==EINTR) goto poll_retry;

-					LM_CRIT("poll on %d failed: %s\n",

-						socket, strerror(errno));

-					return n;

-				} else continue; /* try recv again */

-			}

-#endif /* NO_MSG_WAITALL */

-			LM_CRIT("2nd recv on %d failed: %s\n",

-					socket, strerror(errno));

-			return n;

-		}

-		b_read+=n;

-	}

-	return b_read;

-}

-

-

-

-/** sends all data (takes care of signals) (assumes blocking fd)

- * returns number of bytes sent or < 0 for an error */

-int send_all(int socket, void* data, int data_len)

-{

-	int n;

-

-again:

-	n=send(socket, data, data_len, 0);

-	if (n<0){

-			/* error */

-		if (errno==EINTR) goto again; /* signal, try again */

-		if ((errno!=EAGAIN) &&(errno!=EWOULDBLOCK))

-			LM_CRIT("send on %d failed: %s\n",

-					socket, strerror(errno));

-	}

-	return n;

-}

-

-

-/** at least 1 byte must be sent! */

-int send_fd(int unix_socket, void* data, int data_len, int fd)

-{

-	struct msghdr msg;

-	struct iovec iov[1];

-	int ret;

-#ifdef HAVE_MSGHDR_MSG_CONTROL

-	int* pi;

-	struct cmsghdr* cmsg;

-	/* make sure msg_control will point to properly aligned data */

-	union {

-		struct cmsghdr cm;

-		char control[CMSG_SPACE(sizeof(fd))];

-	}control_un;

-

-	memset(&msg, 0, sizeof(struct msghdr));

-	msg.msg_control=control_un.control;

-	/* openbsd doesn't like "more space", msg_controllen must not

-	 * include the end padding */

-	msg.msg_controllen=CMSG_LEN(sizeof(fd));

-

-	cmsg=CMSG_FIRSTHDR(&msg);

-	cmsg->cmsg_level = SOL_SOCKET;

-	cmsg->cmsg_type = SCM_RIGHTS;

-	cmsg->cmsg_len = CMSG_LEN(sizeof(fd));

-	pi=(int*)CMSG_DATA(cmsg);

-	*pi=fd;

-	msg.msg_flags=0;

-#else

-	msg.msg_accrights=(caddr_t) &fd;

-	msg.msg_accrightslen=sizeof(fd);

-#endif

-

-	msg.msg_name=0;

-	msg.msg_namelen=0;

-

-	iov[0].iov_base=data;

-	iov[0].iov_len=data_len;

-	msg.msg_iov=iov;

-	msg.msg_iovlen=1;

-

-again:

-	ret=sendmsg(unix_socket, &msg, 0);

-	if (ret<0){

-		if (errno==EINTR) goto again;

-		if ((errno!=EAGAIN) && (errno!=EWOULDBLOCK))

-			LM_CRIT("sendmsg failed sending %d on %d: %s (%d)\n",

-				fd, unix_socket, strerror(errno), errno);

-	}

-

-	return ret;

-}

-

-

-

-/** receives a fd and data_len data

- * params: unix_socket

- *         data

- *         data_len

- *         fd         - will be set to the passed fd value or -1 if no fd

- *                      was passed

- *         flags      - 0, MSG_DONTWAIT, MSG_WAITALL; same as recv_all flags

- * returns: bytes read on success, -1 on error (and sets errno) */

-int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags)

-{

-	struct msghdr msg;

-	struct iovec iov[1];

-	int new_fd;

-	int ret;

-	int n;

-#ifdef NO_MSG_WAITALL

-	struct pollfd pfd;

-	int f;

-#endif /*NO_MSG_WAITALL */

-#ifdef HAVE_MSGHDR_MSG_CONTROL

-	int* pi;

-	struct cmsghdr* cmsg;

-	union{

-		struct cmsghdr cm;

-		char control[CMSG_SPACE(sizeof(new_fd))];

-	}control_un;

-

-	memset(&msg, 0, sizeof(struct msghdr));

-	msg.msg_control=control_un.control;

-	msg.msg_controllen=sizeof(control_un.control);

-#else

-	msg.msg_accrights=(caddr_t) &new_fd;

-	msg.msg_accrightslen=sizeof(int);

-#endif

-

-	msg.msg_name=0;

-	msg.msg_namelen=0;

-

-	iov[0].iov_base=data;

-	iov[0].iov_len=data_len;

-	msg.msg_iov=iov;

-	msg.msg_iovlen=1;

-

-#ifdef NO_MSG_WAITALL

-	f=flags & ~MSG_WAITALL;

-#endif /* NO_MSG_WAITALL */

-

-again:

-#ifdef NO_MSG_WAITALL

-		ret=recvmsg(unix_socket, &msg, f);

-#else /* NO_MSG_WAITALL */

-		ret=recvmsg(unix_socket, &msg, flags);

-#endif /* NO_MSG_WAITALL */

-	if (ret<0){

-		if (errno==EINTR) goto again;

-		if ((errno==EAGAIN)||(errno==EWOULDBLOCK)){

-#ifdef NO_MSG_WAITALL

-			if (flags & MSG_WAITALL){

-				/* emulate MSG_WAITALL using poll */

-				pfd.fd=unix_socket;

-				pfd.events=POLLIN;

-poll_again:

-				ret=poll(&pfd, 1, -1);

-				if (ret>=0) goto again;

-				else if (errno==EINTR) goto poll_again;

-				LM_CRIT("poll on %d failed: %s\n",

-					unix_socket, strerror(errno));

-			}

-#endif /* NO_MSG_WAITALL */

-			goto error;

-		}

-		LM_CRIT("recvmsg on %d failed: %s\n",

-				unix_socket, strerror(errno));

-		goto error;

-	}

-	if (ret==0){

-		/* EOF */

-		LM_CRIT("EOF on %d\n", unix_socket);

-		goto error;

-	}

-	if (ret<data_len){

-		LM_WARN("too few bytes read (%d from %d) trying to fix...\n",

-				ret, data_len);

-		/* blocking recv_all */

-		n=recv_all(unix_socket, (char*)data+ret, data_len-ret, MSG_WAITALL);

-		if (n>=0) ret+=n;

-		else{

-			ret=n;

-			goto error;

-		}

-	}

-

-#ifdef HAVE_MSGHDR_MSG_CONTROL

-	cmsg=CMSG_FIRSTHDR(&msg);

-	if ((cmsg!=0) && (cmsg->cmsg_len==CMSG_LEN(sizeof(new_fd)))){

-		if (cmsg->cmsg_type!= SCM_RIGHTS){

-			LM_ERR("msg control type != SCM_RIGHTS\n");

-			ret=-1;

-			goto error;

-		}

-		if (cmsg->cmsg_level!= SOL_SOCKET){

-			LM_ERR("msg level != SOL_SOCKET\n");

-			ret=-1;

-			goto error;

-		}

-		pi=(int*) CMSG_DATA(cmsg);

-		*fd=*pi;

-	}else{

-		/*LM_ERR("no descriptor passed, cmsg=%p, len=%d\n",

-			cmsg, (unsigned)cmsg->cmsg_len); */

-		*fd=-1;

-		/* it's not really an error */

-	}

-#else

-	if (msg.msg_accrightslen==sizeof(int)){

-		*fd=new_fd;

-	}else{

-		/*LM_ERR("no descriptor passed, accrightslen=%d\n",

-			msg.msg_accrightslen); */

-		*fd=-1;

-	}

-#endif

-

-error:

-	return ret;

-}

-#endif

@@ -20,7 +20,7 @@

 /*!

  * \file

- * \brief Kamailio core :: 

+ * \brief Kamailio core ::

  * \ingroup core

  * Module: \ref core

  */

@@ -46,17 +46,17 @@

 /** receive all the data or returns error (handles EINTR etc.)

  * params: socket

  *         data     - buffer for the results

- *         data_len - 

+ *         data_len -

  *         flags    - recv flags for the first recv (see recv(2)), only

  *                    0, MSG_WAITALL and MSG_DONTWAIT make sense

  * if flags is set to MSG_DONWAIT (or to 0 and the socket fd is non-blocking),

- * and if no data is queued on the fd, recv_all will not wait (it will 

+ * and if no data is queued on the fd, recv_all will not wait (it will

  * return error and set errno to EAGAIN/EWOULDBLOCK). However if even 1 byte

  *  is queued, the call will block until the whole data_len was read or an

  *  error or eof occurred ("semi-nonblocking" behaviour,  some tcp code

  *   counts on it).

  * if flags is set to MSG_WAITALL it will block even if no byte is available.

- *  

+ *

  * returns: bytes read or error (<0)

  * can return < data_len if EOF */

 int recv_all(int socket, void* data, int data_len, int flags)

@@ -66,7 +66,7 @@ int recv_all(int socket, void* data, int data_len, int flags)

 #ifdef NO_MSG_WAITALL

 	struct pollfd pfd;

 #endif /* NO_MSG_WAITALL */

-	

+

 	b_read=0;

 again:

 #ifdef NO_MSG_WAITALL

@@ -104,7 +104,7 @@ poll_recv:

 				pfd.events=POLLIN;

 poll_retry:

 				n=poll(&pfd, 1, -1);

-				if (n<0){ 

+				if (n<0){

 					if (errno==EINTR) goto poll_retry;

 					LM_CRIT("poll on %d failed: %s\n",

 						socket, strerror(errno));

@@ -128,7 +128,7 @@ poll_retry:

 int send_all(int socket, void* data, int data_len)

 {

 	int n;

-	

+

 again:

 	n=send(socket, data, data_len, 0);

 	if (n<0){

@@ -156,12 +156,13 @@ int send_fd(int unix_socket, void* data, int data_len, int fd)

 		struct cmsghdr cm;

 		char control[CMSG_SPACE(sizeof(fd))];

 	}control_un;

-	

+

+	memset(&msg, 0, sizeof(struct msghdr));

 	msg.msg_control=control_un.control;

 	/* openbsd doesn't like "more space", msg_controllen must not

 	 * include the end padding */

 	msg.msg_controllen=CMSG_LEN(sizeof(fd));

-	

+

 	cmsg=CMSG_FIRSTHDR(&msg);

 	cmsg->cmsg_level = SOL_SOCKET;

 	cmsg->cmsg_type = SCM_RIGHTS;

@@ -173,15 +174,15 @@ int send_fd(int unix_socket, void* data, int data_len, int fd)

 	msg.msg_accrights=(caddr_t) &fd;

 	msg.msg_accrightslen=sizeof(fd);

 #endif

-	

+

 	msg.msg_name=0;

 	msg.msg_namelen=0;

-	

+

 	iov[0].iov_base=data;

 	iov[0].iov_len=data_len;

 	msg.msg_iov=iov;

 	msg.msg_iovlen=1;

-	

+

 again:

 	ret=sendmsg(unix_socket, &msg, 0);

 	if (ret<0){

@@ -190,14 +191,14 @@ again:

 			LM_CRIT("sendmsg failed sending %d on %d: %s (%d)\n",

 				fd, unix_socket, strerror(errno), errno);

 	}

-	

+

 	return ret;

 }

 /** receives a fd and data_len data

- * params: unix_socket 

+ * params: unix_socket

  *         data

  *         data_len

  *         fd         - will be set to the passed fd value or -1 if no fd

@@ -222,22 +223,23 @@ int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags)

 		struct cmsghdr cm;

 		char control[CMSG_SPACE(sizeof(new_fd))];

 	}control_un;

-	

+

+	memset(&msg, 0, sizeof(struct msghdr));

 	msg.msg_control=control_un.control;

 	msg.msg_controllen=sizeof(control_un.control);

 #else

 	msg.msg_accrights=(caddr_t) &new_fd;

 	msg.msg_accrightslen=sizeof(int);

 #endif

-	

+

 	msg.msg_name=0;

 	msg.msg_namelen=0;

-	

+

 	iov[0].iov_base=data;

 	iov[0].iov_len=data_len;

 	msg.msg_iov=iov;

 	msg.msg_iovlen=1;

-	

+

 #ifdef NO_MSG_WAITALL

 	f=flags & ~MSG_WAITALL;

 #endif /* NO_MSG_WAITALL */

@@ -286,7 +288,7 @@ poll_again:

 			goto error;

 		}

 	}

-	

+

 #ifdef HAVE_MSGHDR_MSG_CONTROL

 	cmsg=CMSG_FIRSTHDR(&msg);

 	if ((cmsg!=0) && (cmsg->cmsg_len==CMSG_LEN(sizeof(new_fd)))){

@@ -317,7 +319,7 @@ poll_again:

 		*fd=-1;

 	}

 #endif

-	

+

 error:

 	return ret;

 }

@@ -53,7 +53,7 @@

  * and if no data is queued on the fd, recv_all will not wait (it will 

  * return error and set errno to EAGAIN/EWOULDBLOCK). However if even 1 byte

  *  is queued, the call will block until the whole data_len was read or an

- *  error or eof occured ("semi-nonblocking" behaviour,  some tcp code

+ *  error or eof occurred ("semi-nonblocking" behaviour,  some tcp code

  *   counts on it).

  * if flags is set to MSG_WAITALL it will block even if no byte is available.

  *  

@@ -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,21 +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:

-  * --------

-  *  2002-11-29  created by andrei

-  *  2003-02-20  added solaris support (! HAVE_MSGHDR_MSG_CONTROL) (andrei)

-  *  2003-11-03  added send_all, recv_all  and updated send/get_fd

-  *               to handle signals  (andrei)

-  *  2005-06-13  added flags to recv_all & receive_fd, to allow full blocking

-  *              or semi-nonblocking mode (andrei)

-  *  2008-04-30  added MSG_WAITALL emulation for cygwin (andrei)

-  */

 /*!

  * \file

- * \brief SIP-router core :: 

+ * \brief Kamailio core :: 

  * \ingroup core

  * Module: \ref core

  */

@@ -61,7 +48,7 @@

-/* receive all the data or returns error (handles EINTR etc.)

+/** receive all the data or returns error (handles EINTR etc.)

  * params: socket

  *         data     - buffer for the results

  *         data_len - 

@@ -141,7 +128,7 @@ poll_retry:

-/* sends all data (takes care of signals) (assumes blocking fd)

+/** sends all data (takes care of signals) (assumes blocking fd)

  * returns number of bytes sent or < 0 for an error */

 int send_all(int socket, void* data, int data_len)

 {

@@ -160,7 +147,7 @@ again:

 }

-/* at least 1 byte must be sent! */

+/** at least 1 byte must be sent! */

 int send_fd(int unix_socket, void* data, int data_len, int fd)

 {

 	struct msghdr msg;

@@ -214,7 +201,7 @@ again:

-/* receives a fd and data_len data

+/** receives a fd and data_len data

  * params: unix_socket 

  *         data

  *         data_len

@@ -99,7 +99,7 @@ again:

 		if (errno==EINTR) goto again; /* signal, try again */

 		/* on EAGAIN just return (let the caller know) */

 		if ((errno==EAGAIN)||(errno==EWOULDBLOCK)) return n;

-			LOG(L_CRIT, "ERROR: recv_all: 1st recv on %d failed: %s\n",

+			LM_CRIT("1st recv on %d failed: %s\n",

 					socket, strerror(errno));

 			return n;

 	}

@@ -124,13 +124,13 @@ poll_retry:

 				n=poll(&pfd, 1, -1);

 				if (n<0){ 

 					if (errno==EINTR) goto poll_retry;

-					LOG(L_CRIT, "ERROR: recv_all: poll on %d failed: %s\n",

-								socket, strerror(errno));

+					LM_CRIT("poll on %d failed: %s\n",

+						socket, strerror(errno));

 					return n;

 				} else continue; /* try recv again */

 			}

 #endif /* NO_MSG_WAITALL */

-			LOG(L_CRIT, "ERROR: recv_all: 2nd recv on %d failed: %s\n",

+			LM_CRIT("2nd recv on %d failed: %s\n",

 					socket, strerror(errno));

 			return n;

 		}

@@ -153,7 +153,7 @@ again:

 			/* error */

 		if (errno==EINTR) goto again; /* signal, try again */

 		if ((errno!=EAGAIN) &&(errno!=EWOULDBLOCK))

-			LOG(L_CRIT, "ERROR: send_all: send on %d failed: %s\n",

+			LM_CRIT("send on %d failed: %s\n",

 					socket, strerror(errno));

 	}

 	return n;

@@ -205,8 +205,8 @@ again:

 	if (ret<0){

 		if (errno==EINTR) goto again;

 		if ((errno!=EAGAIN) && (errno!=EWOULDBLOCK))

-			LOG(L_CRIT, "ERROR: send_fd: sendmsg failed sending %d on %d:"

-						" %s (%d)\n", fd, unix_socket, strerror(errno), errno);

+			LM_CRIT("sendmsg failed sending %d on %d: %s (%d)\n",

+				fd, unix_socket, strerror(errno), errno);

 	}

 	return ret;

@@ -278,24 +278,24 @@ poll_again:

 				ret=poll(&pfd, 1, -1);

 				if (ret>=0) goto again;

 				else if (errno==EINTR) goto poll_again;

-				LOG(L_CRIT, "ERROR: receive_fd: poll on %d failed: %s\n",

-							unix_socket, strerror(errno));

+				LM_CRIT("poll on %d failed: %s\n",

+					unix_socket, strerror(errno));

 			}

 #endif /* NO_MSG_WAITALL */

 			goto error;

 		}

-		LOG(L_CRIT, "ERROR: receive_fd: recvmsg on %d failed: %s\n",

+		LM_CRIT("recvmsg on %d failed: %s\n",

 				unix_socket, strerror(errno));

 		goto error;

 	}

 	if (ret==0){

 		/* EOF */

-		LOG(L_CRIT, "ERROR: receive_fd: EOF on %d\n", unix_socket);

+		LM_CRIT("EOF on %d\n", unix_socket);

 		goto error;

 	}

 	if (ret<data_len){

-		LOG(L_WARN, "WARNING: receive_fd: too few bytes read (%d from %d)"

-				    "trying to fix...\n", ret, data_len);

+		LM_WARN("too few bytes read (%d from %d) trying to fix...\n",

+				ret, data_len);

 		/* blocking recv_all */

 		n=recv_all(unix_socket, (char*)data+ret, data_len-ret, MSG_WAITALL);

 		if (n>=0) ret+=n;

@@ -309,21 +309,20 @@ poll_again:

 	cmsg=CMSG_FIRSTHDR(&msg);

 	if ((cmsg!=0) && (cmsg->cmsg_len==CMSG_LEN(sizeof(new_fd)))){

 		if (cmsg->cmsg_type!= SCM_RIGHTS){

-			LOG(L_ERR, "ERROR: receive_fd: msg control type != SCM_RIGHTS\n");

+			LM_ERR("msg control type != SCM_RIGHTS\n");

 			ret=-1;

 			goto error;

 		}

 		if (cmsg->cmsg_level!= SOL_SOCKET){

-			LOG(L_ERR, "ERROR: receive_fd: msg level != SOL_SOCKET\n");

+			LM_ERR("msg level != SOL_SOCKET\n");

 			ret=-1;

 			goto error;

 		}

 		pi=(int*) CMSG_DATA(cmsg);

 		*fd=*pi;

 	}else{

-		/*

-		LOG(L_ERR, "ERROR: receive_fd: no descriptor passed, cmsg=%p,"

-				"len=%d\n", cmsg, (unsigned)cmsg->cmsg_len); */

+		/*LM_ERR("no descriptor passed, cmsg=%p, len=%d\n",

+			cmsg, (unsigned)cmsg->cmsg_len); */

 		*fd=-1;

 		/* it's not really an error */

 	}

@@ -331,8 +330,8 @@ poll_again:

 	if (msg.msg_accrightslen==sizeof(int)){

 		*fd=new_fd;

 	}else{

-		/*LOG(L_ERR, "ERROR: receive_fd: no descriptor passed,"

-				" accrightslen=%d\n", msg.msg_accrightslen); */

+		/*LM_ERR("no descriptor passed, accrightslen=%d\n",

+			msg.msg_accrightslen); */

 		*fd=-1;

 	}

 #endif

@@ -22,7 +22,7 @@

  *

  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

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

  */

  /*

   * History:

@@ -205,8 +205,8 @@ again:

 	if (ret<0){

 		if (errno==EINTR) goto again;

 		if ((errno!=EAGAIN) && (errno!=EWOULDBLOCK))

-			LOG(L_CRIT, "ERROR: send_fd: sendmsg failed on %d: %s\n",

-					unix_socket, strerror(errno));

+			LOG(L_CRIT, "ERROR: send_fd: sendmsg failed sending %d on %d:"

+						" %s (%d)\n", fd, unix_socket, strerror(errno), errno);

 	}

 	return ret;

@@ -160,6 +160,7 @@ int send_fd(int unix_socket, void* data, int data_len, int fd)

 	struct iovec iov[1];

 	int ret;

 #ifdef HAVE_MSGHDR_MSG_CONTROL

+	int* pi;

 	struct cmsghdr* cmsg;

 	/* make sure msg_control will point to properly aligned data */

 	union {

@@ -176,7 +177,8 @@ int send_fd(int unix_socket, void* data, int data_len, int fd)

 	cmsg->cmsg_level = SOL_SOCKET;

 	cmsg->cmsg_type = SCM_RIGHTS;

 	cmsg->cmsg_len = CMSG_LEN(sizeof(fd));

-	*(int*)CMSG_DATA(cmsg)=fd;

+	pi=(int*)CMSG_DATA(cmsg);

+	*pi=fd;

 	msg.msg_flags=0;

 #else

 	msg.msg_accrights=(caddr_t) &fd;

@@ -225,6 +227,7 @@ int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags)

 	int f;

 #endif /*NO_MSG_WAITALL */

 #ifdef HAVE_MSGHDR_MSG_CONTROL

+	int* pi;

 	struct cmsghdr* cmsg;

 	union{

 		struct cmsghdr cm;

@@ -308,7 +311,8 @@ poll_again:

 			ret=-1;

 			goto error;

 		}

-		*fd=*((int*) CMSG_DATA(cmsg));

+		pi=(int*) CMSG_DATA(cmsg);

+		*fd=*pi;

 	}else{

 		/*

 		LOG(L_ERR, "ERROR: receive_fd: no descriptor passed, cmsg=%p,"

@@ -36,6 +36,13 @@

   *  2008-04-30  added MSG_WAITALL emulation for cygwin (andrei)

   */

+/*!

+ * \file

+ * \brief SIP-router core :: 

+ * \ingroup core

+ * Module: \ref core

+ */

+

 #ifdef USE_TCP

 #include "pass_fd.h"

@@ -33,16 +33,22 @@

   *               to handle signals  (andrei)

   *  2005-06-13  added flags to recv_all & receive_fd, to allow full blocking

   *              or semi-nonblocking mode (andrei)

+  *  2008-04-30  added MSG_WAITALL emulation for cygwin (andrei)

   */

 #ifdef USE_TCP

+#include "pass_fd.h"

+

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <sys/uio.h>

 #include <stdlib.h> /* for NULL definition on openbsd */

 #include <errno.h>

 #include <string.h>

+#ifdef NO_MSG_WAITALL

+#include <poll.h>

+#endif /* NO_MSG_WAITALL */

 #include "dprint.h"

@@ -68,9 +74,18 @@ int recv_all(int socket, void* data, int data_len, int flags)

 {

 	int b_read;

 	int n;

+#ifdef NO_MSG_WAITALL

+	struct pollfd pfd;

+#endif /* NO_MSG_WAITALL */

 	b_read=0;

 again:

+#ifdef NO_MSG_WAITALL

+	if (flags & MSG_WAITALL){

+		n=-1;

+		goto poll_recv; /* simulate MSG_WAITALL */

+	}

+#endif /* NO_MSG_WAITALL */

 	n=recv(socket, (char*)data, data_len, flags);

 	if (n<0){

 		/* error */

@@ -83,10 +98,31 @@ again:

 	}

 	b_read+=n;

 	while( (b_read!=data_len) && (n)){

+#ifdef NO_MSG_WAITALL

+		/* cygwin & win do not support MSG_WAITALL => workaround using poll */

+poll_recv:

+		n=recv(socket, (char*)data+b_read, data_len-b_read, 0);

+#else /* NO_MSG_WAITALL */

 		n=recv(socket, (char*)data+b_read, data_len-b_read, MSG_WAITALL);

+#endif /* NO_MSG_WAITALL */

 		if (n<0){

 			/* error */

 			if (errno==EINTR) continue; /* signal, try again */

+#ifdef NO_MSG_WAITALL

+			if (errno==EAGAIN || errno==EWOULDBLOCK){

+				/* emulate MSG_WAITALL using poll */

+				pfd.fd=socket;

+				pfd.events=POLLIN;

+poll_retry:

+				n=poll(&pfd, 1, -1);

+				if (n<0){ 

+					if (errno==EINTR) goto poll_retry;

+					LOG(L_CRIT, "ERROR: recv_all: poll on %d failed: %s\n",

+								socket, strerror(errno));

+					return n;

+				} else continue; /* try recv again */

+			}

+#endif /* NO_MSG_WAITALL */

 			LOG(L_CRIT, "ERROR: recv_all: 2nd recv on %d failed: %s\n",

 					socket, strerror(errno));

 			return n;

@@ -184,6 +220,10 @@ int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags)

 	int new_fd;

 	int ret;

 	int n;

+#ifdef NO_MSG_WAITALL

+	struct pollfd pfd;

+	int f;

+#endif /*NO_MSG_WAITALL */

 #ifdef HAVE_MSGHDR_MSG_CONTROL

 	struct cmsghdr* cmsg;

 	union{

@@ -206,11 +246,34 @@ int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags)

 	msg.msg_iov=iov;

 	msg.msg_iovlen=1;

+#ifdef NO_MSG_WAITALL

+	f=flags & ~MSG_WAITALL;

+#endif /* NO_MSG_WAITALL */

+

 again:

-	ret=recvmsg(unix_socket, &msg, flags);

+#ifdef NO_MSG_WAITALL

+		ret=recvmsg(unix_socket, &msg, f);