X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fstream-unix.c;h=b3d70b6596119b461f612862edab939222404d09;hb=HEAD;hp=dbee135d97d0eb10e210ab65c6fccd6a32313560;hpb=67680b012be30d9c26eab999b83b08c6eb32dbd2;p=sliver-openvswitch.git diff --git a/lib/stream-unix.c b/lib/stream-unix.c index dbee135d9..b3d70b659 100644 --- a/lib/stream-unix.c +++ b/lib/stream-unix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 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. @@ -50,7 +50,8 @@ unix_open(const char *name, char *suffix, struct stream **streamp, 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; } @@ -74,8 +75,8 @@ const struct stream_class unix_stream_class = { /* 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, @@ -87,14 +88,14 @@ 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) { 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; @@ -104,11 +105,11 @@ punix_open(const char *name OVS_UNUSED, char *suffix, } 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) {