summaryrefslogtreecommitdiffstats
path: root/ctdb/include
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2009-03-24 13:45:11 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2009-03-24 13:45:11 +1100
commit7265c713db1470a3953678f3898ce4fdee219c20 (patch)
tree20d0ca95919f64ad0da7ff76cc2b315bce35aba4 /ctdb/include
parent4d5bb92fa939f799dfaec1472f6d5e61b0b6ea73 (diff)
downloadsamba-7265c713db1470a3953678f3898ce4fdee219c20.tar.gz
samba-7265c713db1470a3953678f3898ce4fdee219c20.tar.xz
samba-7265c713db1470a3953678f3898ce4fdee219c20.zip
we need to set the port properly in the parse_ip helper
(This used to be ctdb commit 43fe18d86995744ba61c7a6405b70edcb265930a)
Diffstat (limited to 'ctdb/include')
-rw-r--r--ctdb/include/ctdb_private.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 988b6d94bb..b6f44dedeb 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1290,7 +1290,7 @@ void ctdb_start_freeze(struct ctdb_context *ctdb);
bool parse_ip_mask(const char *s, const char *iface, ctdb_sock_addr *addr, unsigned *mask);
bool parse_ip_port(const char *s, ctdb_sock_addr *addr);
-bool parse_ip(const char *s, const char *iface, ctdb_sock_addr *addr);
+bool parse_ip(const char *s, const char *iface, unsigned port, ctdb_sock_addr *addr);
bool parse_ipv4(const char *s, unsigned port, struct sockaddr_in *sin);
@@ -1401,6 +1401,7 @@ int32_t ctdb_control_trans2_error(struct ctdb_context *ctdb,
struct ctdb_req_control *c);
char *ctdb_addr_to_str(ctdb_sock_addr *addr);
+unsigned ctdb_addr_to_port(ctdb_sock_addr *addr);
void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip);
int32_t ctdb_control_recd_ping(struct ctdb_context *ctdb);