geneve-map-rename: rename geneve-map to tlv-map.

[cascardo/ovs.git] / ofproto / collectors.c

diff --git a/ofproto/collectors.c b/ofproto/collectors.c
index 14572db..5b29212 100644 (file)
--- a/ofproto/collectors.c
+++ b/ofproto/collectors.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include "socket-util.h"
 #include "sset.h"
 #include "util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(collectors);
 
@@ -70,7 +70,7 @@ collectors_create(const struct sset *targets, uint16_t default_port,
             static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
 
             VLOG_WARN_RL(&rl, "couldn't open connection to collector %s (%s)",
-                         name, strerror(error));
+                         name, ovs_strerror(error));
             if (!retval) {
                 retval = error;
             }
@@ -95,7 +95,7 @@ collectors_destroy(struct collectors *c)
         size_t i;
 
         for (i = 0; i < c->n_fds; i++) {
-            close(c->fds[i]);
+            closesocket(c->fds[i]);
         }
         free(c->fds);
         free(c);
@@ -112,8 +112,10 @@ collectors_send(const struct collectors *c, const void *payload, size_t n)
         for (i = 0; i < c->n_fds; i++) {
             static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
             if (send(c->fds[i], payload, n, 0) == -1) {
-                VLOG_WARN_RL(&rl, "sending to collector failed: %s",
-                             strerror(errno));
+                char *s = describe_fd(c->fds[i]);
+                VLOG_WARN_RL(&rl, "%s: sending to collector failed (%s)",
+                             s, ovs_strerror(errno));
+                free(s);
             }
         }
     }