X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-tcp.c;h=9a7614db73b4f49c30b02e72b41b4362b912b1d8;hb=f6d1465cec98fd7e83845d24fb394145bbbcf531;hp=dd55845fc6f751cf91b7a8cd89a20070fcf03a49;hpb=36775dad3505929f8370166c33e8e0f04ca96c1c;p=openvswitch

diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c
index dd55845f..9a7614db 100644
--- a/lib/stream-tcp.c
+++ b/lib/stream-tcp.c
@@ -23,15 +23,16 @@
 #include <netinet/tcp.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #include "packets.h"
 #include "socket-util.h"
 #include "util.h"
 #include "stream-provider.h"
 #include "stream-fd.h"
-
 #include "vlog.h"
-#define THIS_MODULE VLM_stream_tcp
+
+VLOG_DEFINE_THIS_MODULE(stream_tcp);
 
 /* Active TCP. */
 
@@ -83,7 +84,7 @@ tcp_open(const char *name, char *suffix, struct stream **streamp)
     }
 }
 
-struct stream_class tcp_stream_class = {
+const struct stream_class tcp_stream_class = {
     "tcp",                      /* name */
     tcp_open,                   /* open */
     NULL,                       /* close */
@@ -101,16 +102,20 @@ static int ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
                        struct stream **streamp);
 
 static int
-ptcp_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
+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, -1, NULL);
+    fd = inet_open_passive(SOCK_STREAM, suffix, -1, &sin);
     if (fd < 0) {
         return -fd;
-    } else {
-        return new_fd_pstream("ptcp", fd, ptcp_accept, NULL, pstreamp);
     }
+
+    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
@@ -129,7 +134,7 @@ ptcp_accept(int fd, const struct sockaddr *sa, size_t sa_len,
     return new_tcp_stream(name, fd, 0, sin, streamp);
 }
 
-struct pstream_class ptcp_pstream_class = {
+const struct pstream_class ptcp_pstream_class = {
     "ptcp",
     ptcp_open,
     NULL,