X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=d7dde8fc44f1e3c819c4d3eb6aab147fa08e90cb;hb=ca261b65354f522ba43c823221763ca6f4604e2d;hp=930f548680c0cb00079e4d8925727c998e9cc730;hpb=3762274e6359f4afe04107851f4c71347fa0afa0;p=openvswitch diff --git a/lib/stream-unix.c b/lib/stream-unix.c index 930f5486..d7dde8fc 100644 --- a/lib/stream-unix.c +++ b/lib/stream-unix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 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. @@ -33,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. */ @@ -63,7 +63,7 @@ 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 */ @@ -99,7 +99,7 @@ punix_open(const char *name OVS_UNUSED, char *suffix, return error; } - return new_fd_pstream("punix", fd, punix_accept, + return new_fd_pstream(name, fd, punix_accept, xstrdup(suffix), pstreamp); } @@ -119,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,