[svn-commits] russell: trunk r59655 - in /trunk: ./ main/netsock.c

[svn-commits at lists.digium.com]

Author: russell
Date: Mon Apr  2 11:08:33 2007
New Revision: 59655

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59655
Log:
Merged revisions 59654 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r59654 | russell | 2007-04-02 10:39:07 -0500 (Mon, 02 Apr 2007) | 14 lines

Merged revisions 59608 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59608 | russell | 2007-04-01 17:35:25 -0500 (Sun, 01 Apr 2007) | 6 lines

Add the SO_REUSEADDR flag to sockets handled by netsock.  This is needed by
the patch that went in for issue 7874.  chan_iax2 needs to be able to create
socket that is lisetning on INADDR_ANY, but also be able to bind sockets to
specific addresses.  (Thanks to Stevenson on the asterisk-dev mailing list
for explaining why this flag was needed.)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/netsock.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/netsock.c
URL: http://svn.digium.com/view/asterisk/trunk/main/netsock.c?view=diff&rev=59655&r1=59654&r2=59655
==============================================================================
--- trunk/main/netsock.c (original)
+++ trunk/main/netsock.c Mon Apr  2 11:08:33 2007
@@ -125,6 +125,7 @@
 	int *ioref;
 	
 	struct ast_netsock *ns;
+	const int reuseFlag = 1;
 	
 	/* Make a UDP socket */
 	netsocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
@@ -132,6 +133,9 @@
 	if (netsocket < 0) {
 		ast_log(LOG_ERROR, "Unable to create network socket: %s\n", strerror(errno));
 		return NULL;
+	}
+	if (setsockopt(netsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&reuseFlag, sizeof reuseFlag) < 0) {
+			ast_log(LOG_WARNING, "Error setting SO_REUSEADDR on sockfd '%d'\n", netsocket);
 	}
 	if (bind(netsocket,(struct sockaddr *)bindaddr, sizeof(struct sockaddr_in))) {
 		ast_log(LOG_ERROR, "Unable to bind to %s port %d: %s\n", ast_inet_ntoa(bindaddr->sin_addr), ntohs(bindaddr->sin_port), strerror(errno));