summaryrefslogtreecommitdiff
path: root/toxcore/network.c
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2014-07-03 17:08:38 +0200
committermannol <eniz_vukovic@hotmail.com>2014-07-03 17:08:38 +0200
commitf8a2a865dc32bfa626cc150a509d30d897e1181b (patch)
tree5bb6b234149cdf2a79422815dc59a0c53cb3cb0e /toxcore/network.c
parenta9a7f6a5952d0385904ec9df078ac065a3f5887f (diff)
parentc4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff)
Resolved conflicts when merging upstream
Diffstat (limited to 'toxcore/network.c')
-rw-r--r--toxcore/network.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/network.c b/toxcore/network.c
index 05b2ce2e..0009a558 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -181,13 +181,13 @@ int set_socket_dualstack(sock_t sock)
181{ 181{
182 int ipv6only = 0; 182 int ipv6only = 0;
183 socklen_t optsize = sizeof(ipv6only); 183 socklen_t optsize = sizeof(ipv6only);
184 int res = getsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&ipv6only, &optsize); 184 int res = getsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&ipv6only, &optsize);
185 185
186 if ((res == 0) && (ipv6only == 0)) 186 if ((res == 0) && (ipv6only == 0))
187 return 1; 187 return 1;
188 188
189 ipv6only = 0; 189 ipv6only = 0;
190 return (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&ipv6only, sizeof(ipv6only)) == 0); 190 return (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&ipv6only, sizeof(ipv6only)) == 0);
191} 191}
192 192
193 193