summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2015-03-03 15:54:58 -0800
committerBen Pfaff <blp@nicira.com>2015-03-03 16:05:12 -0800
commit560d3df761d0d0c3847cb69642c80f5a87972596 (patch)
tree7aa01cdc325ded7b510f105a223efc78e83b2835
parent6fd6ed71cb9f2dba8307da371d5e86c34695783c (diff)
downloadopenvswitch-560d3df761d0d0c3847cb69642c80f5a87972596.tar.gz
stream-ssl: Fix broken build.
In all the churn around ofpbuf and dp_packet, this code seems to have been overlooked. This fixes the problem. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Pravin B Shelar <pshelar@nicira.com>
-rw-r--r--lib/stream-ssl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index c2ace711a..2ad794d83 100644
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.c
@@ -634,15 +634,14 @@ ssl_do_tx(struct stream *stream)
for (;;) {
int old_state = SSL_get_state(sslv->ssl);
- int ret = SSL_write(sslv->ssl,
- ofpbuf_data(sslv->txbuf), ofpbuf_size(sslv->txbuf));
+ int ret = SSL_write(sslv->ssl, sslv->txbuf->data, sslv->txbuf->size);
if (old_state != SSL_get_state(sslv->ssl)) {
sslv->rx_want = SSL_NOTHING;
}
sslv->tx_want = SSL_NOTHING;
if (ret > 0) {
ofpbuf_pull(sslv->txbuf, ret);
- if (ofpbuf_size(sslv->txbuf) == 0) {
+ if (sslv->txbuf->size == 0) {
return 0;
}
} else {