X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=4feefdfdfd4e8a6e31950d0697bfa340053ff6c4;hb=f606c7e99465477cf0533ecbc4795a0f8fe635e0;hp=40ef012486e70ee6242892284201d5dacd211b38;hpb=f1936eb65178f796d26a8d265697af8c19dce8cd;p=openvswitch diff --git a/lib/stream-unix.c b/lib/stream-unix.c index 40ef0124..4feefdfd 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_WARN("%s: connection failed (%s)", connect_path, strerror(-fd)); return -fd; } @@ -79,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; @@ -92,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); } @@ -118,6 +118,7 @@ const struct pstream_class punix_pstream_class = { punix_open, NULL, NULL, - NULL + NULL, + NULL, };