X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=33f566b371edaa4f6e2e4187b50d6a3850713ed8;hb=6f643e4946016399f0b217c2226284e3892b6267;hp=a5dfd55b898d4935960c13d331cf60176ff10fc1;hpb=c34b65c731a1b6dae014efe8895141e5b2fe758a;p=sliver-openvswitch.git diff --git a/lib/stream-unix.c b/lib/stream-unix.c index a5dfd55b8..33f566b37 100644 --- a/lib/stream-unix.c +++ b/lib/stream-unix.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. @@ -69,6 +69,8 @@ struct stream_class unix_stream_class = { NULL, /* connect */ NULL, /* recv */ NULL, /* send */ + NULL, /* run */ + NULL, /* run_wait */ NULL, /* wait */ }; @@ -78,7 +80,8 @@ static int punix_accept(int fd, const struct sockaddr *sa, size_t sa_len, struct stream **streamp); static int -punix_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp) +punix_open(const char *name OVS_UNUSED, char *suffix, + struct pstream **pstreamp) { int fd, error; @@ -88,12 +91,6 @@ punix_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp) return errno; } - error = set_nonblocking(fd); - if (error) { - close(fd); - return error; - } - if (listen(fd, 10) < 0) { error = errno; VLOG_ERR("%s: listen: %s", name, strerror(error));