/*
- * 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.
#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"
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;
}
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) {
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);
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;
}
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
\f
struct pstream *pstream;
int error;
- error = pstream_open_with_default_ports(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) {
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;
}