Revert "Make vconns keep track of their names and include them in log messages."

This reverts commit a39a2431c12d25aab4d6ed560da3607611a74937.

diff --git a/include/vconn.h b/include/vconn.h
index e5d659c..22a1da8 100644 (file)
--- a/include/vconn.h
+++ b/include/vconn.h
@@ -50,7 +50,6 @@ struct vconn {
     struct vconn_class *class;
     int connect_status;
     uint32_t ip;
     struct vconn_class *class;
     int connect_status;
     uint32_t ip;

-    char *name;

 };
 
 void vconn_usage(bool active, bool passive);
 };
 
 void vconn_usage(bool active, bool passive);

diff --git a/lib/vconn.c b/lib/vconn.c
index 4152864..bac38d9 100644 (file)
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -174,7 +174,6 @@ vconn_open(const char *name, struct vconn **vconnp)
             if (!retval) {
                 assert(vconn->connect_status != EAGAIN
                        || vconn->class->connect);
             if (!retval) {
                 assert(vconn->connect_status != EAGAIN
                        || vconn->class->connect);

-                vconn->name = xstrdup(name);

                 *vconnp = vconn;
             }
             return retval;
                 *vconnp = vconn;
             }
             return retval;


@@ -211,9 +210,7 @@ void
 vconn_close(struct vconn *vconn)
 {
     if (vconn != NULL) {
 vconn_close(struct vconn *vconn)
 {
     if (vconn != NULL) {

-        char *name = vconn->name;

         (vconn->class->close)(vconn);
         (vconn->class->close)(vconn);

-        free(name);

     }
 }
 
     }
 }
 


@@ -290,15 +287,15 @@ vconn_recv(struct vconn *vconn, struct buffer **msgp)
 
             if (VLOG_IS_DBG_ENABLED()) {
                 char *s = ofp_to_string((*msgp)->data, (*msgp)->size, 1);
 
             if (VLOG_IS_DBG_ENABLED()) {
                 char *s = ofp_to_string((*msgp)->data, (*msgp)->size, 1);

-                VLOG_DBG_RL(&rl, "%s: received: %s", vconn->name, s);
+                VLOG_DBG_RL(&rl, "received: %s", s);

                 free(s);
             }
 
             oh = buffer_at_assert(*msgp, 0, sizeof *oh);
             if (oh->version != OFP_VERSION) {
                 free(s);
             }
 
             oh = buffer_at_assert(*msgp, 0, sizeof *oh);
             if (oh->version != OFP_VERSION) {

-                VLOG_ERR_RL(&rl, "%s: received OpenFlow version %02"PRIx8" "
+                VLOG_ERR_RL(&rl, "received OpenFlow version %02"PRIx8" "

                             "!= expected %02x",
                             "!= expected %02x",

-                            vconn->name, oh->version, OFP_VERSION);
+                            oh->version, OFP_VERSION);

                 buffer_delete(*msgp);
                 *msgp = NULL;
                 return EPROTO;
                 buffer_delete(*msgp);
                 *msgp = NULL;
                 return EPROTO;


@@ -335,7 +332,7 @@ vconn_send(struct vconn *vconn, struct buffer *msg)
             char *s = ofp_to_string(msg->data, msg->size, 1);
             retval = (vconn->class->send)(vconn, msg);
             if (retval != EAGAIN) {
             char *s = ofp_to_string(msg->data, msg->size, 1);
             retval = (vconn->class->send)(vconn, msg);
             if (retval != EAGAIN) {

-                VLOG_DBG_RL(&rl, "%s: sent (%s): %s", vconn->name, strerror(retval), s);
+                VLOG_DBG_RL(&rl, "sent (%s): %s", strerror(retval), s);

             }
             free(s);
         }
             }
             free(s);
         }


@@ -400,8 +397,8 @@ vconn_transact(struct vconn *vconn, struct buffer *request,
             return 0;
         }
 
             return 0;
         }
 

-        VLOG_DBG_RL(&rl, "%s: received reply with xid %08"PRIx32" != expected "
-                    "%08"PRIx32, vconn->name, recv_xid, send_xid);
+        VLOG_DBG_RL(&rl, "received reply with xid %08"PRIx32" != expected "
+                    "%08"PRIx32, recv_xid, send_xid);

         buffer_delete(reply);
     }
 }
         buffer_delete(reply);
     }
 }