/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(stream_unix);
fd = make_unix_socket(SOCK_STREAM, true, NULL, connect_path);
if (fd < 0) {
- VLOG_DBG("%s: connection failed (%s)", connect_path, strerror(-fd));
+ VLOG_DBG("%s: connection failed (%s)",
+ connect_path, ovs_strerror(-fd));
free(connect_path);
return -fd;
}
free(connect_path);
- return new_fd_stream(name, fd, check_connection_completion(fd), streamp);
+ return new_fd_stream(name, fd, check_connection_completion(fd),
+ AF_UNIX, streamp);
}
const struct stream_class unix_stream_class = {
\f
/* Passive UNIX socket. */
-static int punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
- struct stream **streamp);
+static int punix_accept(int fd, const struct sockaddr_storage *ss,
+ size_t ss_len, struct stream **streamp);
static int
punix_open(const char *name OVS_UNUSED, char *suffix,
bind_path = abs_file_name(ovs_rundir(), suffix);
fd = make_unix_socket(SOCK_STREAM, true, bind_path, NULL);
if (fd < 0) {
- VLOG_ERR("%s: binding failed: %s", bind_path, strerror(errno));
+ VLOG_ERR("%s: binding failed: %s", bind_path, ovs_strerror(errno));
free(bind_path);
return errno;
}
- if (listen(fd, 10) < 0) {
+ if (listen(fd, 64) < 0) {
error = errno;
- VLOG_ERR("%s: listen: %s", name, strerror(error));
+ VLOG_ERR("%s: listen: %s", name, ovs_strerror(error));
close(fd);
free(bind_path);
return error;
}
- return new_fd_pstream(name, fd, punix_accept, NULL, bind_path, pstreamp);
+ return new_fd_pstream(name, fd, punix_accept, bind_path, pstreamp);
}
static int
-punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
+punix_accept(int fd, const struct sockaddr_storage *ss, size_t ss_len,
struct stream **streamp)
{
- const struct sockaddr_un *sun = (const struct sockaddr_un *) sa;
- int name_len = get_unix_name_len(sa_len);
+ const struct sockaddr_un *sun = (const struct sockaddr_un *) ss;
+ int name_len = get_unix_name_len(ss_len);
char name[128];
if (name_len > 0) {
} else {
strcpy(name, "unix");
}
- return new_fd_stream(name, fd, 0, streamp);
+ return new_fd_stream(name, fd, 0, AF_UNIX, streamp);
}
const struct pstream_class punix_pstream_class = {
NULL,
NULL,
NULL,
- NULL,
};