X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=6dee17d7b18d8aadc3628485eb8c3aa712f3b945;hb=558e2cc58e16f6e3cee44926d69d385d84d42521;hp=a9d76f2572050a56a9857909485c68f4df20e8ba;hpb=f125905cdd3dc0339ad968c0a70128807884b400;p=openvswitch diff --git a/lib/stream-unix.c b/lib/stream-unix.c index a9d76f25..6dee17d7 100644 --- a/lib/stream-unix.c +++ b/lib/stream-unix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,9 +46,9 @@ unix_open(const char *name, char *suffix, struct stream **streamp, const char *connect_path = suffix; int fd; - fd = make_unix_socket(SOCK_STREAM, true, false, NULL, connect_path); + fd = make_unix_socket(SOCK_STREAM, true, NULL, connect_path); if (fd < 0) { - VLOG_ERR("%s: connection failed (%s)", connect_path, strerror(-fd)); + VLOG_DBG("%s: connection failed (%s)", connect_path, strerror(-fd)); return -fd; } @@ -57,6 +57,7 @@ unix_open(const char *name, char *suffix, struct stream **streamp, const struct stream_class unix_stream_class = { "unix", /* name */ + false, /* needs_probes */ unix_open, /* open */ NULL, /* close */ NULL, /* connect */ @@ -78,7 +79,7 @@ punix_open(const char *name OVS_UNUSED, char *suffix, { int fd, error; - fd = make_unix_socket(SOCK_STREAM, true, true, suffix, NULL); + fd = make_unix_socket(SOCK_STREAM, true, suffix, NULL); if (fd < 0) { VLOG_ERR("%s: binding failed: %s", suffix, strerror(errno)); return errno; @@ -91,7 +92,7 @@ punix_open(const char *name OVS_UNUSED, char *suffix, return error; } - return new_fd_pstream(name, fd, punix_accept, + return new_fd_pstream(name, fd, punix_accept, NULL, xstrdup(suffix), pstreamp); } @@ -113,9 +114,11 @@ punix_accept(int fd, const struct sockaddr *sa, size_t sa_len, const struct pstream_class punix_pstream_class = { "punix", + false, punix_open, NULL, NULL, - NULL + NULL, + NULL, };