mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-23 14:57:06 +00:00
Code Issues Releases Wiki Activity

stream-unix: Do not bind a name for client sockets.

Browse Source 
There's no reason for a Unix domain client socket to bind a name.  I don't
know why we've always done that.  Stevens's "Unix Network Programming"
Unix domain socket client example doesn't do a bind.

Removes the 'unlink_path' parameter from new_fd_stream() since it is now
always passed as NULL.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-02-27 11:13:00 -08:00
parent e36d0b530a
commit 7921b912de
5 changed files with 16 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/stream-unix.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,28 +39,19 @@ VLOG_DEFINE_THIS_MODULE(stream_unix);
/* Active UNIX socket. */
/* Number of unix sockets created so far, to ensure binding path uniqueness. */
static int n_unix_sockets;
static int
unix_open(const char *name, char *suffix, struct stream **streamp)
{
const char *connect_path = suffix;
char *bind_path;
int fd;
bind_path = xasprintf("/tmp/stream-unix.%ld.%d",
(long int) getpid(), n_unix_sockets++);
fd = make_unix_socket(SOCK_STREAM, true, false, bind_path, connect_path);
fd = make_unix_socket(SOCK_STREAM, true, false, NULL, connect_path);
if (fd < 0) {
VLOG_ERR("%s: connection to %s failed: %s",
bind_path, connect_path, strerror(-fd));
free(bind_path);
VLOG_ERR("%s: connection failed (%s)", connect_path, strerror(-fd));
return -fd;
}
return new_fd_stream(name, fd, check_connection_completion(fd),
bind_path, streamp);
return new_fd_stream(name, fd, check_connection_completion(fd), streamp);
}
const struct stream_class unix_stream_class = {
@@ -116,7 +107,7 @@ punix_accept(int fd, const struct sockaddr *sa, size_t sa_len,
} else {
strcpy(name, "unix");
}
return new_fd_stream(name, fd, 0, NULL, streamp);
return new_fd_stream(name, fd, 0, streamp);
}
const struct pstream_class punix_pstream_class = {