mirror of
https://github.com/samba-team/samba.git
synced 2025-02-02 09:47:23 +03:00
ctdb-common: Remove unused function parse_ip_port()
Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
parent
3ee9822f9d
commit
4683ef28ab
@ -53,7 +53,6 @@ bool parse_ip(const char *addr, const char *ifaces, unsigned port,
|
||||
ctdb_sock_addr *saddr);
|
||||
bool parse_ip_mask(const char *str, const char *ifaces, ctdb_sock_addr *addr,
|
||||
unsigned *mask);
|
||||
bool parse_ip_port(const char *addr, ctdb_sock_addr *saddr);
|
||||
|
||||
void lockdown_memory(bool valgrinding);
|
||||
|
||||
|
@ -244,46 +244,6 @@ bool parse_ip_mask(const char *str, const char *ifaces, ctdb_sock_addr *addr, un
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a ip:port pair
|
||||
*/
|
||||
bool parse_ip_port(const char *addr, ctdb_sock_addr *saddr)
|
||||
{
|
||||
char *p;
|
||||
char s[64]; /* Much longer than INET6_ADDRSTRLEN */
|
||||
unsigned port;
|
||||
char *endp = NULL;
|
||||
ssize_t len;
|
||||
bool ret;
|
||||
|
||||
len = strlen(addr);
|
||||
if (len >= sizeof(s)) {
|
||||
DEBUG(DEBUG_ERR, ("Address %s is unreasonably long\n", addr));
|
||||
return false;
|
||||
}
|
||||
|
||||
strncpy(s, addr, len+1);
|
||||
|
||||
p = rindex(s, ':');
|
||||
if (p == NULL) {
|
||||
DEBUG(DEBUG_ERR, (__location__ " This addr: %s does not contain a port number\n", s));
|
||||
return false;
|
||||
}
|
||||
|
||||
port = strtoul(p+1, &endp, 10);
|
||||
if (endp == NULL || *endp != 0) {
|
||||
/* trailing garbage */
|
||||
DEBUG(DEBUG_ERR, (__location__ " Trailing garbage after the port in %s\n", s));
|
||||
return false;
|
||||
}
|
||||
*p = 0;
|
||||
|
||||
/* now is this a ipv4 or ipv6 address ?*/
|
||||
ret = parse_ip(s, NULL, port, saddr);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* we don't lock future pages here; it would increase the chance that
|
||||
* we'd fail to mmap later on. */
|
||||
void lockdown_memory(bool valgrinding)
|
||||
|
Loading…
x
Reference in New Issue
Block a user