X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn-stream.c;h=d169840ce7489cc83f59603d573e3885849f719e;hb=f87d3302c4e01189c437fafa4f0639c604962b18;hp=23145ea088467581de55919145194122075ff80b;hpb=ca843648e3b4181a52a398b902e5e69221976476;p=sliver-openvswitch.git diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c index 23145ea08..d169840ce 100644 --- 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->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; } @@ -82,7 +78,7 @@ vconn_stream_open(const char *name, uint32_t allowed_versions, struct stream *stream; int error; - error = stream_open_with_default_port(name, OFP_TCP_PORT, &stream, dscp); + error = stream_open_with_default_port(name, OFP_OLD_PORT, &stream, dscp); if (!error) { error = stream_connect(stream); if (!error || error == EAGAIN) { @@ -281,7 +277,7 @@ vconn_stream_wait(struct vconn *vconn, enum vconn_wait_type wait) break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -315,7 +311,7 @@ pvconn_pstream_listen(const char *name, uint32_t allowed_versions, struct pstream *pstream; int error; - error = pstream_open_with_default_port(name, OFP_TCP_PORT, + error = pstream_open_with_default_port(name, OFP_OLD_PORT, &pstream, dscp); if (error) { return error;