#include "util.h"
#include "vconn-provider.h"
#include "vconn.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_vconn_stream
+
+VLOG_DEFINE_THIS_MODULE(vconn_stream)
/* Active stream socket vconn. */
struct stream *stream;
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
+ int n_packets;
};
static struct vconn_class stream_vconn_class;
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);
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 *
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);
oh = s->rxbuf->data;
rx_len = ntohs(oh->length);
if (rx_len < sizeof(struct ofp_header)) {
- VLOG_ERR_RL(&rl, "received too-short ofp_header (%zu bytes)",
- rx_len);
+ VLOG_ERR_RL(&rl, "received too-short ofp_header (%d bytes)", rx_len);
return EPROTO;
} else if (s->rxbuf->size < rx_len) {
int retval = vconn_stream_recv__(s, rx_len);
}
}
+ s->n_packets++;
*bufferp = s->rxbuf;
s->rxbuf = NULL;
return 0;