X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvconn-tcp.c;h=aac716623de0ed09845c1cbf12d7c45014fbe3e8;hb=2d2d6d4a71776813f8d2fd1af1051f22b836befc;hp=eece228e8f3e6dad95aaea5e2b8dbe92859c1d39;hpb=00908dc27a4d93bd1c5bda3bcdc84ec351e9a09a;p=openvswitch diff --git a/lib/vconn-tcp.c b/lib/vconn-tcp.c index eece228e..aac71662 100644 --- a/lib/vconn-tcp.c +++ b/lib/vconn-tcp.c @@ -58,7 +58,7 @@ new_tcp_vconn(const char *name, int fd, int connect_status, return errno; } - retval = new_stream_vconn(name, fd, connect_status, true, vconnp); + retval = new_stream_vconn(name, fd, connect_status, NULL, vconnp); if (!retval) { struct vconn *vconn = *vconnp; vconn_set_remote_ip(vconn, remote->sin_addr.s_addr); @@ -75,7 +75,7 @@ tcp_open(const char *name, char *suffix, struct vconn **vconnp) struct sockaddr_in sin; int fd, error; - error = tcp_open_active(suffix, OFP_TCP_PORT, NULL, &fd); + error = inet_open_active(SOCK_STREAM, suffix, OFP_TCP_PORT, &sin, &fd); if (fd >= 0) { return new_tcp_vconn(name, fd, error, &sin, vconnp); } else { @@ -104,11 +104,11 @@ ptcp_open(const char *name UNUSED, char *suffix, struct pvconn **pvconnp) { int fd; - fd = tcp_open_passive(suffix, OFP_TCP_PORT); + fd = inet_open_passive(SOCK_STREAM, suffix, OFP_TCP_PORT); if (fd < 0) { return -fd; } else { - return new_pstream_pvconn("ptcp", fd, ptcp_accept, pvconnp); + return new_pstream_pvconn("ptcp", fd, ptcp_accept, NULL, pvconnp); } }