mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 07:45:30 +00:00
Code Issues Releases Wiki Activity

socket-util: Make inet_open_passive() pass back the bound address.

Browse Source 
This feature is useful in an upcoming commit.
This commit is contained in:
Ben Pfaff
2010-01-07 15:00:47 -08:00
parent e1bd3bee5c
commit 36775dad35
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/socket-util.c
View File

@@ -400,9 +400,13 @@ exit:
* For TCP, the socket will have SO_REUSEADDR turned on. * For TCP, the socket will have SO_REUSEADDR turned on.
* *
* On success, returns a non-negative file descriptor. On failure, returns a * On success, returns a non-negative file descriptor. On failure, returns a
* negative errno value. */ * negative errno value.
*
* If 'sinp' is non-null, then on success the bound address is stored into
* '*sinp'. */
int int
inet_open_passive(int style, const char *target_, int default_port) inet_open_passive(int style, const char *target_, int default_port,
struct sockaddr_in *sinp)
{ {
char *target = xstrdup(target_); char *target = xstrdup(target_);
char *string_ptr = target; char *string_ptr = target;
@@ -468,6 +472,21 @@ inet_open_passive(int style, const char *target_, int default_port)
VLOG_ERR("%s: listen: %s", target_, strerror(error)); VLOG_ERR("%s: listen: %s", target_, strerror(error));
goto exit_close; goto exit_close;
} }
if (sinp) {
socklen_t sin_len = sizeof sin;
if (getsockname(fd, (struct sockaddr *) &sin, &sin_len) < 0){
error = errno;
VLOG_ERR("%s: getsockname: %s", target_, strerror(error));
goto exit_close;
}
if (sin.sin_family != AF_INET || sin_len != sizeof sin) {
VLOG_ERR("%s: getsockname: invalid socket name", target_);
goto exit_close;
}
*sinp = sin;
}
error = 0; error = 0;
goto exit; goto exit;

3
lib/socket-util.h
View File

@@ -36,7 +36,8 @@ int get_null_fd(void);
int inet_open_active(int style, const char *target, uint16_t default_port, int inet_open_active(int style, const char *target, uint16_t default_port,
struct sockaddr_in *sinp, int *fdp); struct sockaddr_in *sinp, int *fdp);
int inet_open_passive(int style, const char *target, int default_port); int inet_open_passive(int style, const char *target, int default_port,
struct sockaddr_in *sinp);
int read_fully(int fd, void *, size_t, size_t *bytes_read); int read_fully(int fd, void *, size_t, size_t *bytes_read);
int write_fully(int fd, const void *, size_t, size_t *bytes_written); int write_fully(int fd, const void *, size_t, size_t *bytes_written);

4
lib/stream-ssl.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2009 Nicira Networks. * Copyright (c) 2008, 2009, 2010 Nicira Networks.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -721,7 +721,7 @@ pssl_open(const char *name, char *suffix, struct pstream **pstreamp)
return retval; return retval;
} }
fd = inet_open_passive(SOCK_STREAM, suffix, OFP_SSL_PORT); fd = inet_open_passive(SOCK_STREAM, suffix, OFP_SSL_PORT, NULL);
if (fd < 0) { if (fd < 0) {
return -fd; return -fd;
} }

2
lib/stream-tcp.c
View File

@@ -105,7 +105,7 @@ ptcp_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp)
{ {
int fd; int fd;
fd = inet_open_passive(SOCK_STREAM, suffix, -1); fd = inet_open_passive(SOCK_STREAM, suffix, -1, NULL);
if (fd < 0) { if (fd < 0) {
return -fd; return -fd;
} else { } else {