X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-tcp.c;h=d92fe3af502080917d18075352be559c4c399b06;hb=299915eadc559f12d145945436289931a74621b8;hp=dd55845fc6f751cf91b7a8cd89a20070fcf03a49;hpb=36775dad3505929f8370166c33e8e0f04ca96c1c;p=openvswitch diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c index dd55845f..d92fe3af 100644 --- a/lib/stream-tcp.c +++ b/lib/stream-tcp.c @@ -23,15 +23,16 @@ #include #include #include +#include #include #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. */ @@ -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