Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / log / ModUdp.cc

diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc
index 5ef9ea99e5f92c82d033750b7800ff48c9691bd8..800bc307a9e83fcccb4354a286fe74327894495b 100644 (file)
--- a/src/log/ModUdp.cc
+++ b/src/log/ModUdp.cc
@@ -30,8 +30,9 @@
  *
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "comm.h"
+#include "comm/Connection.h"
 #include "log/File.h"
 #include "log/ModUdp.h"
 #include "Parsing.h"
@@ -99,7 +100,7 @@ logfile_mod_udp_writeline(Logfile * lf, const char *buf, size_t len)
         return;
     }
     /* buffer it */
-    xmemcpy(ll->buf + ll->offset, buf, len);
+    memcpy(ll->buf + ll->offset, buf, len);
 
     ll->offset += len;
 
@@ -148,7 +149,7 @@ logfile_mod_udp_close(Logfile * lf)
 int
 logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag)
 {
-    IpAddress addr;
+    Ip::Address addr;
     char *strAddr;
 
     lf->f_close = logfile_mod_udp_close;
@@ -176,16 +177,14 @@ logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_fla
     }
     safe_free(strAddr);
 
-    IpAddress no_addr;
-    no_addr.SetNoAddr();
+    Ip::Address any_addr;
+    any_addr.SetAnyAddr();
 
-#if USE_IPV6
     // require the sending UDP port to be of the right family for the destination address.
     if (addr.IsIPv4())
-        no_addr.SetIPv4();
-#endif
+        any_addr.SetIPv4();
 
-    ll->fd = comm_open(SOCK_DGRAM, IPPROTO_UDP, no_addr, COMM_NONBLOCKING, "UDP log socket");
+    ll->fd = comm_open(SOCK_DGRAM, IPPROTO_UDP, any_addr, COMM_NONBLOCKING, "UDP log socket");
     if (ll->fd < 0) {
         if (lf->flags.fatal) {
             fatalf("Unable to open UDP socket for logging\n");
@@ -193,7 +192,7 @@ logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_fla
             debugs(50, DBG_IMPORTANT, "Unable to open UDP socket for logging");
             return FALSE;
         }
-    } else if (comm_connect_addr(ll->fd, &addr)) {
+    } else if (!comm_connect_addr(ll->fd, &addr)) {
         if (lf->flags.fatal) {
             fatalf("Unable to connect to %s for UDP log: %s\n", lf->path, xstrerror());
         } else {