You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/04/02 23:36:24 UTC

[07/15] git commit: TS-1067 Remove -UDPNetProcessor::UDPClassifyConnection class

TS-1067 Remove -UDPNetProcessor::UDPClassifyConnection class


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/33d92c8d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/33d92c8d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/33d92c8d

Branch: refs/heads/master
Commit: 33d92c8d2404672fe642b9dacf04c6744b7a73b1
Parents: e486543
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Mar 26 09:07:14 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Apr 2 13:52:33 2013 -0600

----------------------------------------------------------------------
 iocore/net/I_UDPNet.h    |    3 ---
 iocore/net/UnixUDPNet.cc |   32 --------------------------------
 2 files changed, 0 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/33d92c8d/iocore/net/I_UDPNet.h
----------------------------------------------------------------------
diff --git a/iocore/net/I_UDPNet.h b/iocore/net/I_UDPNet.h
index 5497fbd..847e2c1 100644
--- a/iocore/net/I_UDPNet.h
+++ b/iocore/net/I_UDPNet.h
@@ -81,9 +81,6 @@ public:
   */
   inkcoreapi Action *UDPBind(Continuation * c, sockaddr const* addr, int send_bufsize = 0, int recv_bufsize = 0);
 
-  // The mess again: the complier won't let me stick UDPConnection here.
-  void UDPClassifyConnection(Continuation * udpConn, IpAddr const& addr);
-
   // Regarding sendto_re, sendmsg_re, recvfrom_re:
   // * You may be called back on 'c' with completion or error status.
   // * 'token' is an opaque which can be used by caller to match up the I/O

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/33d92c8d/iocore/net/UnixUDPNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixUDPNet.cc b/iocore/net/UnixUDPNet.cc
index 79dd8da..ccf1fde 100644
--- a/iocore/net/UnixUDPNet.cc
+++ b/iocore/net/UnixUDPNet.cc
@@ -575,38 +575,6 @@ HardError:
   return false;
 }
 
-void
-UDPNetProcessor::UDPClassifyConnection(
-  Continuation * udpConn,
-  IpAddr const& destIP
-) {
-  int i;
-  UDPConnectionInternal *p = static_cast<UDPConnectionInternal *>(udpConn);
-
-  if (G_inkPipeInfo.numPipes == 0) {
-    p->pipe_class = 0;
-    return;
-  }
-  p->pipe_class = -1;
-  // find a match: 0 is best-effort
-  for (i = 0; i < G_inkPipeInfo.numPipes + 1; i++)
-    if (G_inkPipeInfo.perPipeInfo[i].destIP == destIP)
-      p->pipe_class = i;
-  // no match; set it to the null class
-  if (p->pipe_class == -1) {
-    IpAddr null; // default constructed -> invalid value.
-    for (i = 0; i < G_inkPipeInfo.numPipes + 1; ++i)
-      if (G_inkPipeInfo.perPipeInfo[i].destIP == null) {
-        p->pipe_class = i;
-        break;
-      }
-  }
-  Debug("udpnet-pipe", "Pipe class = %d", p->pipe_class);
-  ink_debug_assert(p->pipe_class != -1);
-  if (p->pipe_class == -1)
-    p->pipe_class = 0;
-  G_inkPipeInfo.perPipeInfo[p->pipe_class].count++;
-}
 
 Action *
 UDPNetProcessor::UDPBind(Continuation * cont, sockaddr const* addr, int send_bufsize, int recv_bufsize)