mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-19 20:16:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from slokhorst/close-sock-on-fail

Browse Source 
Reuse socket when still open, properly close on error
This commit is contained in:
Joseph Heenan
2016-09-29 13:22:39 +01:00
committed by GitHub
parent d2771ff78d 4b3bc5fc44
commit 12fdac8867
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
stream.c
View File

@@ -741,16 +741,19 @@ int http_bindsock(int port, int local, int ipv6_localhost)
addr_str = "any address";
sin.sin6_addr = in6addr_any;
}
int no = 0;
setsockopt(sd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&no, sizeof(no));
int no = 0, yes = 1;
setsockopt(sd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
setsockopt(sd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
if (bind(sd, &sin, sizeof(sin)) != 0) {
MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO, "%s: error binding on %s port %d", addr_str, port);
close(sd);
return -1;
}
if (listen(sd, DEF_MAXWEBQUEUE) != 0) {
MOTION_LOG(CRT, TYPE_STREAM, SHOW_ERRNO, "%s: error listening");
close(sd);
return -1;
}