mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 13:58:14 +00:00
Code Issues Releases Wiki Activity

socket-util: Make TCP open function support no default port.

Browse Source 
Until now, tcp_open_active() and tcp_open_passive() have only been used
in situations where there is a reasonable default port, e.g. OFP_TCP_PORT.
But now, in the upcoming JSON-RPC library and underlying stream library,
there is no reasonable default, so enhance these functions so that they
can require the user to specify a port explicitly.
This commit is contained in:
Ben Pfaff
2009-10-28 15:20:42 -07:00
parent 675febfa2f
commit 8a8eb86772
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/socket-util.c
View File

@@ -292,8 +292,9 @@ guess_netmask(uint32_t ip)
}
/* Opens a non-blocking TCP socket and connects to 'target', which should be a
* string in the format "<host>[:<port>]", where <host> is required and <port>
* is optional, with 'default_port' assumed if <port> is omitted.
* string in the format "<host>[:<port>]". <host> is required. If
* 'default_port' is nonzero then <port> is optional and defaults to
* 'default_port'.
*
* On success, returns 0 (indicating connection complete) or EAGAIN (indicating
* connection in progress), in which case the new file descriptor is stored
@@ -335,6 +336,10 @@ tcp_open_active(const char *target_, uint16_t default_port,
}
if (port_string && atoi(port_string)) {
sin.sin_port = htons(atoi(port_string));
} else if (!default_port) {
VLOG_ERR("%s: port number must be specified", target_);
error = EAFNOSUPPORT;
goto exit;
}
/* Create non-blocking socket. */
@@ -376,10 +381,10 @@ exit:
}
/* Opens a non-blocking TCP socket, binds to 'target', and listens for incoming
* connections. 'target' should be a string in the format "[<port>][:<ip>]",
* where both <port> and <ip> are optional. If <port> is omitted, it defaults
* to 'default_port'; if <ip> is omitted it defaults to the wildcard IP
* address.
* connections. 'target' should be a string in the format "[<port>][:<ip>]".
* <port> may be omitted if 'default_port' is nonzero, in which case it
* defaults to 'default_port'. If <ip> is omitted it defaults to the wildcard
* IP address.
*
* The socket will have SO_REUSEADDR turned on.
*
@@ -406,6 +411,10 @@ tcp_open_passive(const char *target_, uint16_t default_port)
port_string = strsep(&string_ptr, ":");
if (port_string && atoi(port_string)) {
sin.sin_port = htons(atoi(port_string));
} else if (!default_port) {
VLOG_ERR("%s: port number must be specified", target_);
error = EAFNOSUPPORT;
goto exit;
}
/* Parse optional bind IP. */