{
struct vconn vconn;
int fd;
- void (*connect_success_cb)(struct vconn *, int);
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
struct poll_waiter *tx_waiter;
int
new_stream_vconn(const char *name, int fd, int connect_status,
- uint32_t remote_ip, uint16_t remote_port,
- bool reconnectable,
- connect_success_cb_func *connect_success_cb,
- struct vconn **vconnp)
+ bool reconnectable, struct vconn **vconnp)
{
struct stream_vconn *s;
s = xmalloc(sizeof *s);
- vconn_init(&s->vconn, &stream_vconn_class, connect_status, remote_ip,
- remote_port, name, reconnectable);
+ vconn_init(&s->vconn, &stream_vconn_class, connect_status,
+ name, reconnectable);
s->fd = fd;
s->txbuf = NULL;
s->tx_waiter = NULL;
s->rxbuf = NULL;
- s->connect_success_cb = connect_success_cb;
*vconnp = &s->vconn;
return 0;
}
stream_connect(struct vconn *vconn)
{
struct stream_vconn *s = stream_vconn_cast(vconn);
- int retval = check_connection_completion(s->fd);
- if (retval) {
- return retval;
- }
- if (s->connect_success_cb) {
- s->connect_success_cb(vconn, s->fd);
- }
- return 0;
+ return check_connection_completion(s->fd);
}
static int
size_t sa_len, struct vconn **),
struct pvconn **pvconnp)
{
- struct pstream_pvconn *ps;
- int retval;
-
- retval = set_nonblocking(fd);
- if (retval) {
- close(fd);
- return retval;
- }
-
- if (listen(fd, 10) < 0) {
- int error = errno;
- VLOG_ERR("%s: listen: %s", name, strerror(error));
- close(fd);
- return error;
- }
-
- ps = xmalloc(sizeof *ps);
+ struct pstream_pvconn *ps = xmalloc(sizeof *ps);
pvconn_init(&ps->pvconn, &pstream_pvconn_class, name);
ps->fd = fd;
ps->accept_cb = accept_cb;