X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fstream-fd.c;h=8062d2deab1f77f7ebf4c84023a4966aa92a5247;hb=e731d71bf47b8370e4bfa87827113eedd20b7398;hp=81c5a43aeb9a5cff715a006deab1712f5d88b828;hpb=978188b242c8900f2a598f8d5bb233d9155ebf36;p=sliver-openvswitch.git diff --git a/lib/stream-fd.c b/lib/stream-fd.c index 81c5a43ae..8062d2dea 100644 --- a/lib/stream-fd.c +++ b/lib/stream-fd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 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. @@ -148,7 +148,7 @@ struct fd_pstream { struct pstream pstream; int fd; - int (*accept_cb)(int fd, const struct sockaddr *, size_t sa_len, + int (*accept_cb)(int fd, const struct sockaddr_storage *, size_t ss_len, struct stream **); int (*set_dscp_cb)(int fd, uint8_t dscp); char *unlink_path; @@ -179,8 +179,8 @@ fd_pstream_cast(struct pstream *pstream) * implementation never fails.) */ int new_fd_pstream(const char *name, int fd, - int (*accept_cb)(int fd, const struct sockaddr *sa, - size_t sa_len, struct stream **streamp), + int (*accept_cb)(int fd, const struct sockaddr_storage *ss, + size_t ss_len, struct stream **streamp), int (*set_dscp_cb)(int fd, uint8_t dscp), char *unlink_path, struct pstream **pstreamp) { @@ -227,8 +227,7 @@ pfd_accept(struct pstream *pstream, struct stream **new_streamp) return retval; } - return ps->accept_cb(new_fd, (const struct sockaddr *) &ss, ss_len, - new_streamp); + return ps->accept_cb(new_fd, &ss, ss_len, new_streamp); } static void