git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
lib
/
stream-unix.c
diff --git
a/lib/stream-unix.c
b/lib/stream-unix.c
index
689dcf1
..
b3d70b6
100644
(file)
--- a/
lib/stream-unix.c
+++ b/
lib/stream-unix.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012
, 2013, 2014
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,7
+16,6
@@
#include <config.h>
#include "stream.h"
#include <config.h>
#include "stream.h"
-#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <netdb.h>
#include <errno.h>
#include <inttypes.h>
#include <netdb.h>
@@
-30,6
+29,7
@@
#include "packets.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "packets.h"
#include "poll-loop.h"
#include "socket-util.h"
+#include "dirs.h"
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
#include "util.h"
#include "stream-provider.h"
#include "stream-fd.h"
@@
-43,15
+43,20
@@
static int
unix_open(const char *name, char *suffix, struct stream **streamp,
uint8_t dscp OVS_UNUSED)
{
unix_open(const char *name, char *suffix, struct stream **streamp,
uint8_t dscp OVS_UNUSED)
{
- c
onst char *connect_path = suffix
;
+ c
har *connect_path
;
int fd;
int fd;
+ connect_path = abs_file_name(ovs_rundir(), suffix);
fd = make_unix_socket(SOCK_STREAM, true, NULL, connect_path);
fd = make_unix_socket(SOCK_STREAM, true, NULL, connect_path);
+
if (fd < 0) {
if (fd < 0) {
- VLOG_ERR("%s: connection failed (%s)", connect_path, strerror(-fd));
+ VLOG_DBG("%s: connection failed (%s)",
+ connect_path, ovs_strerror(-fd));
+ free(connect_path);
return -fd;
}
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), streamp);
}
@@
-70,38
+75,41
@@
const struct stream_class unix_stream_class = {
\f
/* Passive UNIX socket. */
\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
,
+ s
ize_t ss_len, s
truct stream **streamp);
static int
punix_open(const char *name OVS_UNUSED, char *suffix,
struct pstream **pstreamp, uint8_t dscp OVS_UNUSED)
{
static int
punix_open(const char *name OVS_UNUSED, char *suffix,
struct pstream **pstreamp, uint8_t dscp OVS_UNUSED)
{
+ char *bind_path;
int fd, error;
int fd, error;
- fd = make_unix_socket(SOCK_STREAM, true, suffix, NULL);
+ bind_path = abs_file_name(ovs_rundir(), suffix);
+ fd = make_unix_socket(SOCK_STREAM, true, bind_path, NULL);
if (fd < 0) {
if (fd < 0) {
- VLOG_ERR("%s: binding failed: %s", suffix, strerror(errno));
+ VLOG_ERR("%s: binding failed: %s", bind_path, ovs_strerror(errno));
+ free(bind_path);
return errno;
}
if (listen(fd, 10) < 0) {
error = errno;
return errno;
}
if (listen(fd, 10) < 0) {
error = errno;
- VLOG_ERR("%s: listen: %s", name, strerror(error));
+ VLOG_ERR("%s: listen: %s", name,
ovs_
strerror(error));
close(fd);
close(fd);
+ free(bind_path);
return error;
}
return error;
}
- return new_fd_pstream(name, fd, punix_accept,
- xstrdup(suffix), pstreamp);
+ return new_fd_pstream(name, fd, punix_accept, NULL, bind_path, pstreamp);
}
static int
}
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)
{
struct stream **streamp)
{
- const struct sockaddr_un *sun = (const struct sockaddr_un *) s
a
;
- int name_len = get_unix_name_len(s
a
_len);
+ const struct sockaddr_un *sun = (const struct sockaddr_un *) s
s
;
+ int name_len = get_unix_name_len(s
s
_len);
char name[128];
if (name_len > 0) {
char name[128];
if (name_len > 0) {
@@
-118,6
+126,7
@@
const struct pstream_class punix_pstream_class = {
punix_open,
NULL,
NULL,
punix_open,
NULL,
NULL,
- NULL
+ NULL,
+ NULL,
};
};