summaryrefslogtreecommitdiff
path: root/main/netsock.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-04-02 16:08:33 +0000
committerRussell Bryant <russell@russellbryant.com>2007-04-02 16:08:33 +0000
commitc7e3eee1e7cf457e77100496c58bdf91ac920246 (patch)
tree1f9056c9c5c15358e3985943a3a80acbbc98bb48 /main/netsock.c
parent90b75256d9981b0e7661fcec2bf8d272e7d34fdc (diff)
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.) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock.c')
-rw-r--r--main/netsock.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/netsock.c b/main/netsock.c
index 46b306074..9fa842ec3 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -125,6 +125,7 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i
int *ioref;
struct ast_netsock *ns;
+ const int reuseFlag = 1;
/* Make a UDP socket */
netsocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
@@ -133,6 +134,9 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i
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));
close(netsocket);