diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-09-19 23:44:31 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-10-05 05:19:21 +0200 |
| commit | c98691c340e3463d90279014bbdc4e71da61de85 (patch) | |
| tree | 47d31d0df4e1d96281f8a65aa299b45e4cb6c562 /ctdb/common | |
| parent | 330436bd6ca4ec2700fd3b493bfd569c4ec81e4e (diff) | |
| download | samba-c98691c340e3463d90279014bbdc4e71da61de85.tar.gz | |
ctdb-common: Replace parse_ip() -> ctdb_sock_addr_from_string()
... and ctdb_sock_addr_set_port().
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/common')
| -rw-r--r-- | ctdb/common/ctdb_util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index 72358ca7e72..901e5e2a630 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -29,6 +29,8 @@ #include "ctdb_private.h" +#include "protocol/protocol_util.h" + #include "common/reqid.h" #include "common/system.h" #include "common/common.h" @@ -172,6 +174,7 @@ int ctdb_parse_address(TALLOC_CTX *mem_ctx, const char *str, { struct servent *se; int port; + int ret; setservent(0); se = getservbyname("ctdb", "tcp"); @@ -183,9 +186,11 @@ int ctdb_parse_address(TALLOC_CTX *mem_ctx, const char *str, port = ntohs(se->s_port); } - if (! parse_ip(str, NULL, port, address)) { + ret = ctdb_sock_addr_from_string(str, address, false); + if (ret != 0) { return -1; } + ctdb_sock_addr_set_port(address, port); return 0; } |