diff options
| author | TingPing <tingping@tingping.se> | 2014-12-28 13:38:47 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-12-28 22:29:06 -0500 |
| commit | 1b2bee37e43baca9b0ec58061561fdb60c31cef8 (patch) | |
| tree | 7caf7da8be07701c2c1147c14a75149e5bb48575 /src/common/server.c | |
| parent | 9cb73f839ffddb1479f0ee1c8a89acebafd31045 (diff) | |
Remove option to disable ipv6
It has been default for a while, is the only tested option, and will only get more common.
Diffstat (limited to 'src/common/server.c')
| -rw-r--r-- | src/common/server.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/common/server.c b/src/common/server.c index 2f92a431..f3633ce5 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -914,12 +914,10 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv) closesocket (serv->sok4); if (serv->proxy_sok4 != -1) closesocket (serv->proxy_sok4); -#ifdef USE_IPV6 if (serv->sok6 != -1) closesocket (serv->sok6); if (serv->proxy_sok6 != -1) closesocket (serv->proxy_sok6); -#endif EMIT_SIGNAL (XP_TE_UKNHOST, sess, NULL, NULL, NULL, NULL, 0); if (!servlist_cycle (serv)) if (prefs.hex_net_auto_reconnectonfail) @@ -931,12 +929,10 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv) closesocket (serv->sok4); if (serv->proxy_sok4 != -1) closesocket (serv->proxy_sok4); -#ifdef USE_IPV6 if (serv->sok6 != -1) closesocket (serv->sok6); if (serv->proxy_sok6 != -1) closesocket (serv->proxy_sok6); -#endif EMIT_SIGNAL (XP_TE_CONNFAIL, sess, errorstring (atoi (tbuf)), NULL, NULL, NULL, 0); if (!servlist_cycle (serv)) @@ -974,7 +970,6 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv) case '4': /* success */ waitline2 (source, tbuf, sizeof (tbuf)); serv->sok = atoi (tbuf); -#ifdef USE_IPV6 /* close the one we didn't end up using */ if (serv->sok == serv->sok4) closesocket (serv->sok6); @@ -987,7 +982,6 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv) else closesocket (serv->proxy_sok4); } -#endif server_connect_success (serv); break; case '5': /* prefs ip discovered */ @@ -1612,12 +1606,10 @@ server_child (server * serv) xit: -#if defined (USE_IPV6) || defined (WIN32) /* this is probably not needed */ net_store_destroy (ns_server); if (ns_proxy) net_store_destroy (ns_proxy); -#endif /* no need to free ip/real_hostname, this process is exiting */ #ifdef WIN32 |