projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ofctl: Warn about flows not in normal form.
[openvswitch]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index 0a721d97a1aa3de9ceac388fb98eefd3da208862..df728d5ccde9870c792981f6d198f4b3b0872114 100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-44,6
+44,7
@@
struct vconn_stream
struct stream *stream;
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
struct stream *stream;
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
+ int n_packets;
};
static struct vconn_class stream_vconn_class;
};
static struct vconn_class stream_vconn_class;
@@
-63,6
+64,7
@@
vconn_stream_new(struct stream *stream, int connect_status)
s->stream = stream;
s->txbuf = NULL;
s->rxbuf = NULL;
s->stream = stream;
s->txbuf = NULL;
s->rxbuf = NULL;
+ s->n_packets = 0;
s->vconn.remote_ip = stream_get_remote_ip(stream);
s->vconn.remote_port = stream_get_remote_port(stream);
s->vconn.local_ip = stream_get_local_ip(stream);
s->vconn.remote_ip = stream_get_remote_ip(stream);
s->vconn.remote_port = stream_get_remote_port(stream);
s->vconn.local_ip = stream_get_local_ip(stream);
@@
-83,13
+85,16
@@
vconn_stream_open(const char *name, char *suffix OVS_UNUSED,
error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
&stream);
error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
&stream);
-
- if (error && error != EAGAIN) {
- return error;
+ if (!error) {
+ error = stream_connect(stream);
+ if (!error || error == EAGAIN) {
+ *vconnp = vconn_stream_new(stream, error);
+ return 0;
+ }
}
}
-
*vconnp = vconn_stream_new(stream, error
);
- return
0
;
+
stream_close(stream
);
+ return
error
;
}
static struct vconn_stream *
}
static struct vconn_stream *
@@
-102,6
+107,12
@@
static void
vconn_stream_close(struct vconn *vconn)
{
struct vconn_stream *s = vconn_stream_cast(vconn);
vconn_stream_close(struct vconn *vconn)
{
struct vconn_stream *s = vconn_stream_cast(vconn);
+
+ if ((vconn->error == EPROTO || s->n_packets < 1) && s->rxbuf) {
+ stream_report_content(s->rxbuf->data, s->rxbuf->size, STREAM_OPENFLOW,
+ THIS_MODULE, vconn_get_name(vconn));
+ }
+
stream_close(s->stream);
vconn_stream_clear_txbuf(s);
ofpbuf_delete(s->rxbuf);
stream_close(s->stream);
vconn_stream_clear_txbuf(s);
ofpbuf_delete(s->rxbuf);
@@
-172,6
+183,7
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
}
}
}
+ s->n_packets++;
*bufferp = s->rxbuf;
s->rxbuf = NULL;
return 0;
*bufferp = s->rxbuf;
s->rxbuf = NULL;
return 0;