git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index
9363712
..
9347b5e
100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-64,10
+64,6
@@
vconn_stream_new(struct stream *stream, int connect_status,
s->txbuf = NULL;
s->rxbuf = NULL;
s->n_packets = 0;
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.local_port = stream_get_local_port(stream);
return &s->vconn;
}
return &s->vconn;
}
@@
-107,7
+103,7
@@
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(
s->rxbuf->data, s->rxbuf->size
, STREAM_OPENFLOW,
+ stream_report_content(
ofpbuf_data(s->rxbuf), ofpbuf_size(s->rxbuf)
, STREAM_OPENFLOW,
THIS_MODULE, vconn_get_name(vconn));
}
THIS_MODULE, vconn_get_name(vconn));
}
@@
-130,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 -
rx->size
;
+ want_bytes = rx_len -
ofpbuf_size(rx)
;
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) {
-
rx->size += retval
;
+
ofpbuf_set_size(rx, ofpbuf_size(rx) + retval)
;
return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
- if (
rx->size
) {
+ if (
ofpbuf_size(rx)
) {
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
}
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
}
@@
-160,7
+156,7
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
/* Read ofp_header. */
}
/* Read ofp_header. */
- if (
s->rxbuf->size
< sizeof(struct ofp_header)) {
+ if (
ofpbuf_size(s->rxbuf)
< 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;
@@
-168,12
+164,12
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
/* Read payload. */
}
/* Read payload. */
- oh =
s->rxbuf->data
;
+ oh =
ofpbuf_data(s->rxbuf)
;
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 (
s->rxbuf->size
< rx_len) {
+ } else if (
ofpbuf_size(s->rxbuf)
< 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;
@@
-203,8
+199,8
@@
vconn_stream_send(struct vconn *vconn, struct ofpbuf *buffer)
return EAGAIN;
}
return EAGAIN;
}
- retval = stream_send(s->stream,
buffer->data, buffer->size
);
- if (retval ==
buffer->size
) {
+ retval = stream_send(s->stream,
ofpbuf_data(buffer), ofpbuf_size(buffer)
);
+ if (retval ==
ofpbuf_size(buffer)
) {
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
@@
-229,7
+225,7
@@
vconn_stream_run(struct vconn *vconn)
return;
}
return;
}
- retval = stream_send(s->stream,
s->txbuf->data, s->txbuf->size
);
+ retval = stream_send(s->stream,
ofpbuf_data(s->txbuf), ofpbuf_size(s->txbuf)
);
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));
@@
-238,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 (!
s->txbuf->size
) {
+ if (!
ofpbuf_size(s->txbuf)
) {
vconn_stream_clear_txbuf(s);
return;
}
vconn_stream_clear_txbuf(s);
return;
}