Merge "master" into "next".

[sliver-openvswitch.git] / lib / stream-tcp.c

diff --git a/lib/vconn-tcp.c b/lib/stream-tcp.c
similarity index 62%
rename from lib/vconn-tcp.c
rename to lib/stream-tcp.c
index 906718d..a9bcaeb 100644 (file)
--- a/lib/vconn-tcp.c
+++ b/lib/stream-tcp.c
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "vconn.h"
+#include "stream.h"
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/types.h>
@@ -27,18 +27,17 @@
 #include "packets.h"
 #include "socket-util.h"
 #include "util.h"
-#include "openflow/openflow.h"
-#include "vconn-provider.h"
-#include "vconn-stream.h"
+#include "stream-provider.h"
+#include "stream-fd.h"
 
 #include "vlog.h"
-#define THIS_MODULE VLM_vconn_tcp
+#define THIS_MODULE VLM_stream_tcp
 
 /* Active TCP. */
 
 static int
-new_tcp_vconn(const char *name, int fd, int connect_status,
-              const struct sockaddr_in *remote, struct vconn **vconnp)
+new_tcp_stream(const char *name, int fd, int connect_status,
+              const struct sockaddr_in *remote, struct stream **streamp)
 {
     struct sockaddr_in local;
     socklen_t local_len = sizeof local;
@@ -58,79 +57,83 @@ new_tcp_vconn(const char *name, int fd, int connect_status,
         return errno;
     }
 
-    retval = new_stream_vconn(name, fd, connect_status, NULL, vconnp);
+    retval = new_fd_stream(name, fd, connect_status, NULL, streamp);
     if (!retval) {
-        struct vconn *vconn = *vconnp;
-        vconn_set_remote_ip(vconn, remote->sin_addr.s_addr);
-        vconn_set_remote_port(vconn, remote->sin_port);
-        vconn_set_local_ip(vconn, local.sin_addr.s_addr);
-        vconn_set_local_port(vconn, local.sin_port);
+        struct stream *stream = *streamp;
+        stream_set_remote_ip(stream, remote->sin_addr.s_addr);
+        stream_set_remote_port(stream, remote->sin_port);
+        stream_set_local_ip(stream, local.sin_addr.s_addr);
+        stream_set_local_port(stream, local.sin_port);
     }
     return retval;
 }
 
 static int
-tcp_open(const char *name, char *suffix, struct vconn **vconnp)
+tcp_open(const char *name, char *suffix, struct stream **streamp)
 {
     struct sockaddr_in sin;
     int fd, error;
 
-    error = inet_open_active(SOCK_STREAM, suffix, OFP_TCP_PORT, &sin, &fd);
+    error = inet_open_active(SOCK_STREAM, suffix, 0, &sin, &fd);
     if (fd >= 0) {
-        return new_tcp_vconn(name, fd, error, &sin, vconnp);
+        return new_tcp_stream(name, fd, error, &sin, streamp);
     } else {
         VLOG_ERR("%s: connect: %s", name, strerror(error));
         return error;
     }
 }
 
-struct vconn_class tcp_vconn_class = {
+struct stream_class tcp_stream_class = {
     "tcp",                      /* name */
     tcp_open,                   /* open */
     NULL,                       /* close */
     NULL,                       /* connect */
     NULL,                       /* recv */
     NULL,                       /* send */
+    NULL,                       /* run */
+    NULL,                       /* run_wait */
     NULL,                       /* wait */
 };
 \f
 /* Passive TCP. */
 
 static int ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
-                       struct vconn **vconnp);
+                       struct stream **streamp);
 
 static int
-ptcp_open(const char *name OVS_UNUSED, char *suffix, struct pvconn **pvconnp)
+ptcp_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp)
 {
+    struct sockaddr_in sin;
+    char bound_name[128];
     int fd;
 
-    fd = inet_open_passive(SOCK_STREAM, suffix, OFP_TCP_PORT);
+    fd = inet_open_passive(SOCK_STREAM, suffix, -1, &sin);
     if (fd < 0) {
         return -fd;
-    } else {
-        return new_pstream_pvconn("ptcp", fd, ptcp_accept, NULL, pvconnp);
     }
+
+    sprintf(bound_name, "ptcp:%"PRIu16":"IP_FMT,
+            ntohs(sin.sin_port), IP_ARGS(&sin.sin_addr.s_addr));
+    return new_fd_pstream(bound_name, fd, ptcp_accept, NULL, pstreamp);
 }
 
 static int
 ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
-            struct vconn **vconnp)
+            struct stream **streamp)
 {
     const struct sockaddr_in *sin = (const struct sockaddr_in *) sa;
     char name[128];
 
     if (sa_len == sizeof(struct sockaddr_in) && sin->sin_family == AF_INET) {
         sprintf(name, "tcp:"IP_FMT, IP_ARGS(&sin->sin_addr));
-        if (sin->sin_port != htons(OFP_TCP_PORT)) {
-            sprintf(strchr(name, '\0'), ":%"PRIu16, ntohs(sin->sin_port));
-        }
+        sprintf(strchr(name, '\0'), ":%"PRIu16, ntohs(sin->sin_port));
     } else {
         strcpy(name, "tcp");
     }
-    return new_tcp_vconn(name, fd, 0, sin, vconnp);
+    return new_tcp_stream(name, fd, 0, sin, streamp);
 }
 
-struct pvconn_class ptcp_pvconn_class = {
+struct pstream_class ptcp_pstream_class = {
     "ptcp",
     ptcp_open,
     NULL,