X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-tcp.c;h=a9bcaeb475ce2f91829d466a3537921969021c96;hb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;hp=bfcf35c7402eefc8e91bc3cb3281ad8c337eb810;hpb=539e96f62300e4afab00e5906a28e3b89301d62e;p=openvswitch diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c index bfcf35c7..a9bcaeb4 100644 --- a/lib/stream-tcp.c +++ b/lib/stream-tcp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -101,16 +101,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, 0); + 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