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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index
e91d92c
..
d169840
100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012
, 2013
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.
@@
-22,7
+22,6
@@
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
-#include "leak-checker.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
@@
-65,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;
}
@@
-83,8
+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_ports(name, OFP_TCP_PORT, OFP_SSL_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) {
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
@@
-210,7
+204,6
@@
vconn_stream_send(struct vconn *vconn, struct ofpbuf *buffer)
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
- leak_checker_claim(buffer);
s->txbuf = buffer;
if (retval > 0) {
ofpbuf_pull(buffer, retval);
s->txbuf = buffer;
if (retval > 0) {
ofpbuf_pull(buffer, retval);
@@
-235,7
+228,7
@@
vconn_stream_run(struct vconn *vconn)
retval = stream_send(s->stream, s->txbuf->data, s->txbuf->size);
if (retval < 0) {
if (retval != -EAGAIN) {
retval = stream_send(s->stream, s->txbuf->data, s->txbuf->size);
if (retval < 0) {
if (retval != -EAGAIN) {
- VLOG_ERR_RL(&rl, "send: %s", strerror(-retval));
+ VLOG_ERR_RL(&rl, "send: %s",
ovs_
strerror(-retval));
vconn_stream_clear_txbuf(s);
return;
}
vconn_stream_clear_txbuf(s);
return;
}
@@
-284,7
+277,7
@@
vconn_stream_wait(struct vconn *vconn, enum vconn_wait_type wait)
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
\f
}
}
\f
@@
-318,8
+311,8
@@
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
s(name, OFP_TCP_PORT, OFP_SSL
_PORT,
-
&pstream, dscp);
+ error = pstream_open_with_default_port
(name, OFP_OLD
_PORT,
+ &pstream, dscp);
if (error) {
return error;
}
if (error) {
return error;
}
@@
-350,7
+343,7
@@
pvconn_pstream_accept(struct pvconn *pvconn, struct vconn **new_vconnp)
if (error) {
if (error != EAGAIN) {
VLOG_DBG_RL(&rl, "%s: accept: %s",
if (error) {
if (error != EAGAIN) {
VLOG_DBG_RL(&rl, "%s: accept: %s",
- pstream_get_name(ps->pstream), strerror(error));
+ pstream_get_name(ps->pstream),
ovs_
strerror(error));
}
return error;
}
}
return error;
}