X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=d7dde8fc44f1e3c819c4d3eb6aab147fa08e90cb;hb=491aa8847a05f3ab98e6e6bd2ac26e331c363b3d;hp=a5dfd55b898d4935960c13d331cf60176ff10fc1;hpb=58fda1dab104041fc693032475ec4662c1a52849;p=openvswitch

diff --git a/lib/stream-unix.c b/lib/stream-unix.c
index a5dfd55b..d7dde8fc 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, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include <inttypes.h>
 #include <netdb.h>
 #include <poll.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <stdlib.h>
@@ -32,9 +33,9 @@
 #include "util.h"
 #include "stream-provider.h"
 #include "stream-fd.h"
-
 #include "vlog.h"
-#define THIS_MODULE VLM_stream_unix
+
+VLOG_DEFINE_THIS_MODULE(stream_unix);
 
 /* Active UNIX socket. */
 
@@ -62,13 +63,15 @@ unix_open(const char *name, char *suffix, struct stream **streamp)
                          bind_path, streamp);
 }
 
-struct stream_class unix_stream_class = {
+const struct stream_class unix_stream_class = {
     "unix",                     /* name */
     unix_open,                  /* open */
     NULL,                       /* close */
     NULL,                       /* connect */
     NULL,                       /* recv */
     NULL,                       /* send */
+    NULL,                       /* run */
+    NULL,                       /* run_wait */
     NULL,                       /* wait */
 };
 
@@ -78,7 +81,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 +92,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));
@@ -101,7 +99,7 @@ punix_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
         return error;
     }
 
-    return new_fd_pstream("punix", fd, punix_accept,
+    return new_fd_pstream(name, fd, punix_accept,
                           xstrdup(suffix), pstreamp);
 }
 
@@ -121,7 +119,7 @@ punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
     return new_fd_stream(name, fd, 0, NULL, streamp);
 }
 
-struct pstream_class punix_pstream_class = {
+const struct pstream_class punix_pstream_class = {
     "punix",
     punix_open,
     NULL,