sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

ctdb-common: Make parse_ip() and parse_ipv4() static

Browse Source 
parse_ip() has interface checking for IPv6 that is still used
indirectly by the IP takeover code via parse_ip_mask().  This will be
removed eventually.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Oct  5 09:19:31 CEST 2017 on sn-devel-144
This commit is contained in:
Martin Schwenke 2017-09-19 23:51:21 +10:00 committed by Martin Schwenke
parent c98691c340
commit e1a8c9b270
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/common/system.h
View File

@ -48,9 +48,6 @@ int ctdb_get_peer_pid(const int fd, pid_t *peer_pid);
bool set_scheduler(void);
void reset_scheduler(void);
bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin);
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);

5
ctdb/common/system_util.c
View File

@ -114,7 +114,7 @@ void reset_scheduler(void)
#endif
}
bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin)
static bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin)
{
sin->sin_family = AF_INET;
sin->sin_port = htons(port);
@ -161,7 +161,8 @@ static bool parse_ipv6(const char *s, const char *ifaces, unsigned port, ctdb_so
/*
parse an ip
*/
bool parse_ip(const char *addr, const char *ifaces, unsigned port, ctdb_sock_addr *saddr)
static bool parse_ip(const char *addr, const char *ifaces, unsigned port,
ctdb_sock_addr *saddr)
{
char *p;
bool ret;