X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn-stream.c;h=e91d92c086bb8177bf0032757a85089bca023f2c;hb=c68cc3ef3fa0ee3ade3c86035e5c3d7eb066a605;hp=3d0887463ac87d8854a3342e857d74970425a22c;hpb=1e3c004749e1e0498dac6240b6edda472718dde2;p=sliver-openvswitch.git diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c index 3d0887463..e91d92c08 100644 --- a/lib/vconn-stream.c +++ b/lib/vconn-stream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ #include -#include #include #include #include @@ -32,9 +31,9 @@ #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. */ @@ -47,20 +46,21 @@ struct vconn_stream int n_packets; }; -static struct vconn_class stream_vconn_class; +static const struct vconn_class stream_vconn_class; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25); static void vconn_stream_clear_txbuf(struct vconn_stream *); static struct vconn * -vconn_stream_new(struct stream *stream, int connect_status) +vconn_stream_new(struct stream *stream, int connect_status, + uint32_t allowed_versions) { struct vconn_stream *s; s = xmalloc(sizeof *s); vconn_init(&s->vconn, &stream_vconn_class, connect_status, - stream_get_name(stream)); + stream_get_name(stream), allowed_versions); s->stream = stream; s->txbuf = NULL; s->rxbuf = NULL; @@ -77,21 +77,24 @@ vconn_stream_new(struct stream *stream, int connect_status) * * Returns 0 if successful, otherwise a positive errno value. */ static int -vconn_stream_open(const char *name, char *suffix OVS_UNUSED, - struct vconn **vconnp) +vconn_stream_open(const char *name, uint32_t allowed_versions, + char *suffix OVS_UNUSED, struct vconn **vconnp, uint8_t dscp) { struct stream *stream; int error; error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT, - &stream); - - if (error && error != EAGAIN) { - return error; + &stream, dscp); + if (!error) { + error = stream_connect(stream); + if (!error || error == EAGAIN) { + *vconnp = vconn_stream_new(stream, error, allowed_versions); + return 0; + } } - *vconnp = vconn_stream_new(stream, error); - return 0; + stream_close(stream); + return error; } static struct vconn_stream * @@ -170,8 +173,7 @@ vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp) 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); @@ -225,6 +227,7 @@ vconn_stream_run(struct vconn *vconn) struct vconn_stream *s = vconn_stream_cast(vconn); ssize_t retval; + stream_run(s->stream); if (!s->txbuf) { return; } @@ -250,6 +253,7 @@ vconn_stream_run_wait(struct vconn *vconn) { struct vconn_stream *s = vconn_stream_cast(vconn); + stream_run_wait(s->stream); if (s->txbuf) { stream_send_wait(s->stream); } @@ -292,7 +296,7 @@ struct pvconn_pstream struct pstream *pstream; }; -static struct pvconn_class pstream_pvconn_class; +static const struct pvconn_class pstream_pvconn_class; static struct pvconn_pstream * pvconn_pstream_cast(struct pvconn *pvconn) @@ -306,21 +310,22 @@ pvconn_pstream_cast(struct pvconn *pvconn) * Returns 0 if successful, otherwise a positive errno value. (The current * implementation never fails.) */ static int -pvconn_pstream_listen(const char *name, char *suffix OVS_UNUSED, - struct pvconn **pvconnp) +pvconn_pstream_listen(const char *name, uint32_t allowed_versions, + char *suffix OVS_UNUSED, struct pvconn **pvconnp, + uint8_t dscp) { struct pvconn_pstream *ps; struct pstream *pstream; int error; error = pstream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT, - &pstream); + &pstream, dscp); if (error) { return error; } ps = xmalloc(sizeof *ps); - pvconn_init(&ps->pvconn, &pstream_pvconn_class, name); + pvconn_init(&ps->pvconn, &pstream_pvconn_class, name, allowed_versions); ps->pstream = pstream; *pvconnp = &ps->pvconn; return 0; @@ -350,7 +355,7 @@ pvconn_pstream_accept(struct pvconn *pvconn, struct vconn **new_vconnp) return error; } - *new_vconnp = vconn_stream_new(stream, 0); + *new_vconnp = vconn_stream_new(stream, 0, pvconn->allowed_versions); return 0; } @@ -363,9 +368,9 @@ pvconn_pstream_wait(struct pvconn *pvconn) /* Stream-based vconns and pvconns. */ -#define DEFINE_VCONN_STREAM_CLASS(NAME) \ - struct vconn_class NAME##_vconn_class = { \ - #NAME, \ +#define STREAM_INIT(NAME) \ + { \ + NAME, \ vconn_stream_open, \ vconn_stream_close, \ vconn_stream_connect, \ @@ -374,27 +379,27 @@ pvconn_pstream_wait(struct pvconn *pvconn) vconn_stream_run, \ vconn_stream_run_wait, \ vconn_stream_wait, \ - }; + } -#define DEFINE_PVCONN_STREAM_CLASS(NAME) \ - struct pvconn_class NAME##_pvconn_class = { \ - #NAME, \ +#define PSTREAM_INIT(NAME) \ + { \ + NAME, \ pvconn_pstream_listen, \ pvconn_pstream_close, \ pvconn_pstream_accept, \ pvconn_pstream_wait \ - }; + } -static DEFINE_VCONN_STREAM_CLASS(stream); -static DEFINE_PVCONN_STREAM_CLASS(pstream); +static const struct vconn_class stream_vconn_class = STREAM_INIT("stream"); +static const struct pvconn_class pstream_pvconn_class = PSTREAM_INIT("pstream"); -DEFINE_VCONN_STREAM_CLASS(tcp); -DEFINE_PVCONN_STREAM_CLASS(ptcp); +const struct vconn_class tcp_vconn_class = STREAM_INIT("tcp"); +const struct pvconn_class ptcp_pvconn_class = PSTREAM_INIT("ptcp"); -DEFINE_VCONN_STREAM_CLASS(unix); -DEFINE_PVCONN_STREAM_CLASS(punix); +const struct vconn_class unix_vconn_class = STREAM_INIT("unix"); +const struct pvconn_class punix_pvconn_class = PSTREAM_INIT("punix"); #ifdef HAVE_OPENSSL -DEFINE_VCONN_STREAM_CLASS(ssl); -DEFINE_PVCONN_STREAM_CLASS(pssl); +const struct vconn_class ssl_vconn_class = STREAM_INIT("ssl"); +const struct pvconn_class pssl_pvconn_class = PSTREAM_INIT("pssl"); #endif