[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    squid3-ipv6 squid3/src comm.cc,1.47.2.32,1.47.2.33
From:       Amos Jeffries <amosjeffries () users ! sourceforge ! net>
Date:       2007-05-31 10:51:09
Message-ID: 20070531105111.27995.qmail () squid-cache ! org
[Download RAW message or body]

Update of cvs.devel.squid-cache.org:/cvsroot/squid/squid3/src

Modified Files:
      Tag: squid3-ipv6
	comm.cc 
Log Message:
Drop debug lines no longer needed. Update known bug NOTES.


Index: comm.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/comm.cc,v
retrieving revision 1.47.2.32
retrieving revision 1.47.2.33
diff -C2 -d -r1.47.2.32 -r1.47.2.33
*** comm.cc	31 May 2007 10:39:09 -0000	1.47.2.32
--- comm.cc	31 May 2007 10:51:06 -0000	1.47.2.33
***************
*** 888,894 ****
      AI->ai_flags = flags;
  
!     debugs(50, 3, "comm_openex: Attempt open socket to/from : " << addr);
!     debugs(50, 3, "AYJ: protocol=" << AI->ai_protocol << " WANT=" << IPPROTO_TCP << \
                " or " << IPPROTO_UDP );
!     debugs(50, 3, "AYJ: protocol=" << AI->ai_socktype << " WANT=" << SOCK_STREAM);
  
      if ((new_socket = socket( AI->ai_family, AI->ai_socktype, AI->ai_protocol)) < \
                0)
--- 888,892 ----
      AI->ai_flags = flags;
  
!     debugs(50, 3, "comm_openex: Attempt open socket to/on : " << addr);
  
      if ((new_socket = socket( AI->ai_family, AI->ai_socktype, AI->ai_protocol)) < \
                0)
***************
*** 1652,1673 ****
      struct addrinfo *AI = new addrinfo;
  
-     to_addr.GetAddrInfo(*AI); // MUST be first! resets AI.
- // Hmm, these details are never used from here on!
-     AI->ai_protocol = IPPROTO_UDP;
-     AI->ai_socktype = SOCK_DGRAM;
- 
      PROF_start(comm_udp_sendto);
      statCounter.syscalls.sock.sendtos++;
  
!     debugs(50, 3, "comm_udp_sendto: Attempt open socket to/from : " << to_addr);
!     debugs(50, 3, "AYJ: using FD " << fd << " using Port " << comm_local_port(fd) \
                );
!     debugs(50, 3, "AYJ: protocol=" << AI->ai_protocol << " WANT=" << IPPROTO_UDP );
!     debugs(50, 3, "AYJ: socktype=" << AI->ai_socktype << " WANT=" << SOCK_DGRAM);
  
      x = sendto(fd, buf, len, 0, (struct sockaddr *)AI->ai_addr, AI->ai_addrlen);
-     PROF_stop(comm_udp_sendto);
  
      freeaddrinfo(AI);
  
      if (x >= 0)
          return x;
--- 1650,1667 ----
      struct addrinfo *AI = new addrinfo;
  
      PROF_start(comm_udp_sendto);
      statCounter.syscalls.sock.sendtos++;
  
!     to_addr.GetAddrInfo(*AI); // MUST be first! resets AI.
! 
!     debugs(50, 3, "comm_udp_sendto: Attempt to send UDP packet to " << to_addr <<
!                   " using FD " << fd << " using Port " << comm_local_port(fd) );
  
      x = sendto(fd, buf, len, 0, (struct sockaddr *)AI->ai_addr, AI->ai_addrlen);
  
      freeaddrinfo(AI);
  
+     PROF_stop(comm_udp_sendto);
+ 
      if (x >= 0)
          return x;


[prev in list] [next in list] [prev in thread] [next in thread]