projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-dpdk: fix mbuf leaks
[cascardo/ovs.git]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index
32c25cd
..
2858462
100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013
, 2016
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-29,7
+29,7
@@
#include "stream.h"
#include "util.h"
#include "vconn-provider.h"
#include "stream.h"
#include "util.h"
#include "vconn-provider.h"
-#include "vconn.h"
+#include "
openvswitch/
vconn.h"
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(vconn_stream);
#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(vconn_stream);
@@
-78,7
+78,7
@@
vconn_stream_open(const char *name, uint32_t allowed_versions,
struct stream *stream;
int error;
struct stream *stream;
int error;
- error = stream_open_with_default_port(name, OFP_
OLD_
PORT, &stream, dscp);
+ error = stream_open_with_default_port(name, OFP_PORT, &stream, dscp);
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
@@
-103,8
+103,8
@@
vconn_stream_close(struct vconn *vconn)
struct vconn_stream *s = vconn_stream_cast(vconn);
if ((vconn->error == EPROTO || s->n_packets < 1) && s->rxbuf) {
struct vconn_stream *s = vconn_stream_cast(vconn);
if ((vconn->error == EPROTO || s->n_packets < 1) && s->rxbuf) {
- stream_report_content(
ofpbuf_data(s->rxbuf), ofpbuf_size(s->rxbuf)
, STREAM_OPENFLOW,
-
THIS_MODULE
, vconn_get_name(vconn));
+ stream_report_content(
s->rxbuf->data, s->rxbuf->size
, STREAM_OPENFLOW,
+
&this_module
, vconn_get_name(vconn));
}
stream_close(s->stream);
}
stream_close(s->stream);
@@
-126,14
+126,14
@@
vconn_stream_recv__(struct vconn_stream *s, int rx_len)
struct ofpbuf *rx = s->rxbuf;
int want_bytes, retval;
struct ofpbuf *rx = s->rxbuf;
int want_bytes, retval;
- want_bytes = rx_len -
ofpbuf_size(rx)
;
+ want_bytes = rx_len -
rx->size
;
ofpbuf_prealloc_tailroom(rx, want_bytes);
retval = stream_recv(s->stream, ofpbuf_tail(rx), want_bytes);
if (retval > 0) {
ofpbuf_prealloc_tailroom(rx, want_bytes);
retval = stream_recv(s->stream, ofpbuf_tail(rx), want_bytes);
if (retval > 0) {
-
ofpbuf_set_size(rx, ofpbuf_size(rx) + retval)
;
+
rx->size += retval
;
return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
- if (
ofpbuf_size(rx)
) {
+ if (
rx->size
) {
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
}
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
}
@@
-156,7
+156,7
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
/* Read ofp_header. */
}
/* Read ofp_header. */
- if (
ofpbuf_size(s->rxbuf)
< sizeof(struct ofp_header)) {
+ if (
s->rxbuf->size
< sizeof(struct ofp_header)) {
int retval = vconn_stream_recv__(s, sizeof(struct ofp_header));
if (retval) {
return retval;
int retval = vconn_stream_recv__(s, sizeof(struct ofp_header));
if (retval) {
return retval;
@@
-164,12
+164,12
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
/* Read payload. */
}
/* Read payload. */
- oh =
ofpbuf_data(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 (%d bytes)", rx_len);
return EPROTO;
rx_len = ntohs(oh->length);
if (rx_len < sizeof(struct ofp_header)) {
VLOG_ERR_RL(&rl, "received too-short ofp_header (%d bytes)", rx_len);
return EPROTO;
- } else if (
ofpbuf_size(s->rxbuf)
< rx_len) {
+ } else if (
s->rxbuf->size
< rx_len) {
int retval = vconn_stream_recv__(s, rx_len);
if (retval) {
return retval;
int retval = vconn_stream_recv__(s, rx_len);
if (retval) {
return retval;
@@
-199,8
+199,8
@@
vconn_stream_send(struct vconn *vconn, struct ofpbuf *buffer)
return EAGAIN;
}
return EAGAIN;
}
- retval = stream_send(s->stream,
ofpbuf_data(buffer), ofpbuf_size(buffer)
);
- if (retval ==
ofpbuf_size(buffer)
) {
+ retval = stream_send(s->stream,
buffer->data, buffer->size
);
+ if (retval ==
buffer->size
) {
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
@@
-225,7
+225,7
@@
vconn_stream_run(struct vconn *vconn)
return;
}
return;
}
- retval = stream_send(s->stream,
ofpbuf_data(s->txbuf), ofpbuf_size(s->txbuf)
);
+ retval = stream_send(s->stream,
s->txbuf->data, s->txbuf->size
);
if (retval < 0) {
if (retval != -EAGAIN) {
VLOG_ERR_RL(&rl, "send: %s", ovs_strerror(-retval));
if (retval < 0) {
if (retval != -EAGAIN) {
VLOG_ERR_RL(&rl, "send: %s", ovs_strerror(-retval));
@@
-234,7
+234,7
@@
vconn_stream_run(struct vconn *vconn)
}
} else if (retval > 0) {
ofpbuf_pull(s->txbuf, retval);
}
} else if (retval > 0) {
ofpbuf_pull(s->txbuf, retval);
- if (!
ofpbuf_size(s->txbuf)
) {
+ if (!
s->txbuf->size
) {
vconn_stream_clear_txbuf(s);
return;
}
vconn_stream_clear_txbuf(s);
return;
}
@@
-311,8
+311,7
@@
pvconn_pstream_listen(const char *name, uint32_t allowed_versions,
struct pstream *pstream;
int error;
struct pstream *pstream;
int error;
- error = pstream_open_with_default_port(name, OFP_OLD_PORT,
- &pstream, dscp);
+ error = pstream_open_with_default_port(name, OFP_PORT, &pstream, dscp);
if (error) {
return error;
}
if (error) {
return error;
}