X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=14680ac59c22560f6f0c89da832b172702ce5b5d;hb=7593daa2473c464cd179420b9c7f68989044fdee;hp=9046da154828852e5d529ede214324dfb760c32c;hpb=e6e6bdad78300b27b5f42567c03c092e7bad45e9;p=openvswitch diff --git a/lib/stream-unix.c b/lib/stream-unix.c index 9046da15..14680ac5 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 #include #include +#include #include #include #include @@ -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. */ @@ -69,6 +70,8 @@ struct stream_class unix_stream_class = { 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; @@ -95,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); }