svn commit: r1054901 - in /trafficserver/traffic/trunk: iocore/net/I_Net.h iocore/net/I_NetErrno.h iocore/net/NetTest-connect.c iocore/net/UnixNetVConnection.cc lib/ts/InkErrno.h

[zw...@apache.org]

Author: zwoop
Date: Tue Jan  4 05:23:55 2011
New Revision: 1054901

URL: http://svn.apache.org/viewvc?rev=1054901&view=rev
Log:
Cleanup: Getting it to compile with gcc < 4.x and eliminate a junk file

Removed:
    trafficserver/traffic/trunk/iocore/net/I_NetErrno.h
Modified:
    trafficserver/traffic/trunk/iocore/net/I_Net.h
    trafficserver/traffic/trunk/iocore/net/NetTest-connect.c
    trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
    trafficserver/traffic/trunk/lib/ts/InkErrno.h

Modified: trafficserver/traffic/trunk/iocore/net/I_Net.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_Net.h?rev=1054901&r1=1054900&r2=1054901&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_Net.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_Net.h Tue Jan  4 05:23:55 2011
@@ -93,7 +93,6 @@
 
 //struct socks_conf_struct;
 #include "I_NetConfig.h"
-#include "I_NetErrno.h"
 #include "I_NetVConnection.h"
 #include "I_NetProcessor.h"
 #include "I_UDPNet.h"

Modified: trafficserver/traffic/trunk/iocore/net/NetTest-connect.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetTest-connect.c?rev=1054901&r1=1054900&r2=1054901&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetTest-connect.c (original)
+++ trafficserver/traffic/trunk/iocore/net/NetTest-connect.c Tue Jan  4 05:23:55 2011
@@ -23,6 +23,29 @@
 
 #include <arpa/inet.h>
 
+inline const char *
+get_net_error_name(int err_no)
+{
+  switch (err_no) {
+  case ENET_THROTTLING:
+    return "ENET_THROTTLING";
+  case ENET_CONNECT_TIMEOUT:
+    return "ENET_CONNECT_TIMEOUT";
+  case ENET_CONNECT_FAILED:
+    return "ENET_CONNECT_FAILED";
+
+  case ESOCK_DENIED:
+    return "ESOCK_DENIED";
+  case ESOCK_TIMEOUT:
+    return "ESOCK_TIMEOUT";
+  case ESOCK_NO_SOCK_SERVER_CONN:
+    return "ESOCK_NO_SOCK_SERVER_CONN";
+
+  default:
+    return "UNKNOWN ERROR";
+  }
+}
+
 struct NetConnectTester:public Continuation
 {
 

Modified: trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc?rev=1054901&r1=1054900&r2=1054901&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc Tue Jan  4 05:23:55 2011
@@ -1089,7 +1089,7 @@ UnixNetVConnection::connectUp(EThread *t
     if (ep.start(get_PollDescriptor(t), this, EVENTIO_READ|EVENTIO_WRITE) < 0) {
       lerrno = errno;
       Debug("iocore_net", "connectUp : Failed to add to epoll list\n");
-      action_.continuation->handleEvent(NET_EVENT_OPEN_FAILED, (void *) res);
+      action_.continuation->handleEvent(NET_EVENT_OPEN_FAILED, (void *)0); // 0 == res
       free(t);
       return CONNECT_FAILURE;
     }

Modified: trafficserver/traffic/trunk/lib/ts/InkErrno.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/InkErrno.h?rev=1054901&r1=1054900&r2=1054901&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/InkErrno.h (original)
+++ trafficserver/traffic/trunk/lib/ts/InkErrno.h Tue Jan  4 05:23:55 2011
@@ -40,6 +40,8 @@
 #define HTTP_ERRNO                        INK_START_ERRNO+600
 
 #define ENET_THROTTLING                   (NET_ERRNO+1)
+#define ENET_CONNECT_TIMEOUT              (NET_ERRNO+2)
+#define ENET_CONNECT_FAILED               (NET_ERRNO+3)
 
 #define ESOCK_DENIED                      (SOCK_ERRNO+0)
 #define ESOCK_TIMEOUT                     (SOCK_ERRNO+1)