git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b67a542
)
Make vconns keep track of their names and include them in log messages.
author
Ben Pfaff
<blp@nicira.com>
Tue, 2 Sep 2008 21:28:22 +0000
(14:28 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Tue, 2 Sep 2008 21:28:22 +0000
(14:28 -0700)
include/vconn.h
patch
|
blob
|
history
lib/vconn.c
patch
|
blob
|
history
diff --git
a/include/vconn.h
b/include/vconn.h
index
22a1da8
..
e5d659c
100644
(file)
--- a/
include/vconn.h
+++ b/
include/vconn.h
@@
-50,6
+50,7
@@
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
bac38d9
..
4152864
100644
(file)
--- a/
lib/vconn.c
+++ b/
lib/vconn.c
@@
-174,6
+174,7
@@
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;
@@
-210,7
+211,9
@@
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);
}
}
}
}
@@
-287,15
+290,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, "
received: %s"
, s);
+ VLOG_DBG_RL(&rl, "
%s: received: %s", vconn->name
, 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, "received OpenFlow version %02"PRIx8" "
+ VLOG_ERR_RL(&rl, "
%s:
received OpenFlow version %02"PRIx8" "
"!= expected %02x",
"!= expected %02x",
- oh->version, OFP_VERSION);
+
vconn->name,
oh->version, OFP_VERSION);
buffer_delete(*msgp);
*msgp = NULL;
return EPROTO;
buffer_delete(*msgp);
*msgp = NULL;
return EPROTO;
@@
-332,7
+335,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, "
sent (%s): %s"
, strerror(retval), s);
+ VLOG_DBG_RL(&rl, "
%s: sent (%s): %s", vconn->name
, strerror(retval), s);
}
free(s);
}
}
free(s);
}
@@
-397,8
+400,8
@@
vconn_transact(struct vconn *vconn, struct buffer *request,
return 0;
}
return 0;
}
- VLOG_DBG_RL(&rl, "received reply with xid %08"PRIx32" != expected "
- "%08"PRIx32, recv_xid, send_xid);
+ VLOG_DBG_RL(&rl, "
%s:
received reply with xid %08"PRIx32" != expected "
+ "%08"PRIx32,
vconn->name,
recv_xid, send_xid);
buffer_delete(reply);
}
}
buffer_delete(reply);
}
}