[GNUnet-SVN] r34415 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2014-11-22 21:34:13 +0100 (Sat, 22 Nov 2014)
New Revision: 34415

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/plugin_transport_http_server.c
   gnunet/src/transport/plugin_transport_tcp.c
Log:
-rename constants

Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2014-11-22 20:28:16 UTC 
(rev 34414)
+++ gnunet/src/transport/plugin_transport_http_client.c 2014-11-22 20:34:13 UTC 
(rev 34415)
@@ -1452,7 +1452,7 @@
 }
 
 
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
 /**
  * Open TCP socket with TCP STEALTH enabled.
  *
@@ -1483,7 +1483,7 @@
       return (curl_socket_t) ret;
     if ( (0 != setsockopt (ret,
                            IPPROTO_TCP,
-                           SO_TCPSTEALTH,
+                           TCP_STEALTH,
                            &s->address->peer,
                            sizeof (struct GNUNET_PeerIdentity))) )
     {
@@ -1528,7 +1528,7 @@
   s->get.s = s;
   if (0 != (options & HTTP_OPTIONS_TCP_STEALTH))
   {
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
     curl_easy_setopt (s->get.easyhandle,
                       CURLOPT_OPENSOCKETFUNCTION,
                       &open_tcp_stealth_socket_cb);
@@ -1722,7 +1722,7 @@
 #endif
   if (0 != (options & HTTP_OPTIONS_TCP_STEALTH))
   {
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
     curl_easy_setopt (s->put.easyhandle,
                       CURLOPT_OPENSOCKETFUNCTION,
                       &open_tcp_stealth_socket_cb);

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2014-11-22 20:28:16 UTC 
(rev 34414)
+++ gnunet/src/transport/plugin_transport_http_server.c 2014-11-22 20:34:13 UTC 
(rev 34415)
@@ -2252,7 +2252,7 @@
                              MHD_OPTION_EXTERNAL_LOGGER,
                              &server_log, NULL,
                              MHD_OPTION_END);
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
   if ( (NULL != server) &&
        (0 != (plugin->options & HTTP_OPTIONS_TCP_STEALTH)) )
   {
@@ -2263,7 +2263,7 @@
                               NULL);
     if ( (0 != setsockopt ((int) di->listen_fd,
                            IPPROTO_TCP,
-                           SO_TCPSTEALTH,
+                           TCP_STEALTH,
                            plugin->env->my_identity,
                            sizeof (struct GNUNET_PeerIdentity))) )
     {
@@ -3429,7 +3429,7 @@
                                             plugin->name,
                                             "TCP_STEALTH"))
   {
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
     plugin->options |= HTTP_OPTIONS_TCP_STEALTH;
 #else
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2014-11-22 20:28:16 UTC (rev 
34414)
+++ gnunet/src/transport/plugin_transport_tcp.c 2014-11-22 20:34:13 UTC (rev 
34415)
@@ -1522,7 +1522,7 @@
   struct GNUNET_ATS_Information ats;
   unsigned int is_natd = GNUNET_NO;
   size_t addrlen;
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
   struct GNUNET_NETWORK_Handle *s;
 #endif
 
@@ -1679,7 +1679,7 @@
 
   if (0 != (options & TCP_OPTIONS_TCP_STEALTH))
   {
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
     s = GNUNET_NETWORK_socket_create (af, SOCK_STREAM, 0);
     if (NULL == s)
     {
@@ -1692,13 +1692,13 @@
       if ( (GNUNET_OK !=
             GNUNET_NETWORK_socket_setsockopt (s,
                                               IPPROTO_TCP,
-                                              SO_TCPSTEALTH,
+                                              TCP_STEALTH,
                                               &session->target,
                                               sizeof (struct 
GNUNET_PeerIdentity))) ||
            (GNUNET_OK !=
             GNUNET_NETWORK_socket_setsockopt (s,
                                               IPPROTO_TCP,
-                                              SO_TCPSTEALTH_INTEGRITY,
+                                              TCP_STEALTH_INTEGRITY,
                                               &plugin->my_welcome,
                                               sizeof (struct WelcomeMessage))) 
)
       {
@@ -2712,7 +2712,7 @@
   unsigned long long max_connections;
   unsigned int i;
   struct GNUNET_TIME_Relative idle_timeout;
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
   struct GNUNET_NETWORK_Handle *const*lsocks;
 #endif
   int ret;
@@ -2792,7 +2792,7 @@
                                               "transport-tcp",
                                               "TCP_STEALTH")) )
   {
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
     plugin->myoptions |= TCP_OPTIONS_TCP_STEALTH;
     lsocks = GNUNET_SERVICE_get_listen_sockets (service);
     if (NULL != lsocks)
@@ -2804,13 +2804,13 @@
         if ( (GNUNET_OK !=
               GNUNET_NETWORK_socket_setsockopt (lsocks[i],
                                                 IPPROTO_TCP,
-                                                SO_TCPSTEALTH,
+                                                TCP_STEALTH,
                                                 env->my_identity,
                                                 sizeof (struct 
GNUNET_PeerIdentity))) ||
              (GNUNET_OK !=
               GNUNET_NETWORK_socket_setsockopt (lsocks[i],
                                                 IPPROTO_TCP,
-                                                SO_TCPSTEALTH_INTEGRITY_LEN,
+                                                TCP_STEALTH_INTEGRITY_LEN,
                                                 &len,
                                                 sizeof (len))) )
         {