diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-07-10 08:06:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:59:20 -0500 |
| commit | 6504900f1f52927adab3489b8d04b6644ceaee7d (patch) | |
| tree | 893cadba231a529f320046429767cedf8b0eec30 /source4/cluster/ctdb/ib/ibw_ctdb.c | |
| parent | d4e2d157cbce5a1cdc75efb5ced75d9608a0f7df (diff) | |
| download | samba-6504900f1f52927adab3489b8d04b6644ceaee7d.tar.gz samba-6504900f1f52927adab3489b8d04b6644ceaee7d.tar.bz2 samba-6504900f1f52927adab3489b8d04b6644ceaee7d.zip | |
r23806: update Samba4 with the latest ctdb code.
This doesn't get the ctdb code fully working in Samba4, it just gets
it building and not breaking non-clustered use of Samba. It will take
a bit longer to update some of the calling ctdb_cluster.c code to make
it work correctly in Samba4.
Note also that Samba4 now only links to the client portion of
ctdb. For the moment I am leaving the ctdbd as a separate daemon,
which you install separately from http://ctdb.samba.org/.
(This used to be commit b196077cbb55cbecad87065133c2d67198e31066)
Diffstat (limited to 'source4/cluster/ctdb/ib/ibw_ctdb.c')
| -rw-r--r-- | source4/cluster/ctdb/ib/ibw_ctdb.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/source4/cluster/ctdb/ib/ibw_ctdb.c b/source4/cluster/ctdb/ib/ibw_ctdb.c index c3d1dc368c..5822ffb186 100644 --- a/source4/cluster/ctdb/ib/ibw_ctdb.c +++ b/source4/cluster/ctdb/ib/ibw_ctdb.c @@ -28,6 +28,21 @@ #include "ibwrapper.h" #include "ibw_ctdb.h" +int ctdb_ibw_get_address(struct ctdb_context *ctdb, + const char *address, struct in_addr *addr) +{ + if (inet_pton(AF_INET, address, addr) <= 0) { + struct hostent *he = gethostbyname(address); + if (he == NULL || he->h_length > sizeof(*addr)) { + ctdb_set_error(ctdb, "invalid nework address '%s'\n", + address); + return -1; + } + memcpy(addr, he->h_addr, he->h_length); + } + return 0; +} + int ctdb_ibw_node_connect(struct ctdb_node *node) { struct ctdb_ibw_node *cn = talloc_get_type(node->private_data, struct ctdb_ibw_node); @@ -38,9 +53,12 @@ int ctdb_ibw_node_connect(struct ctdb_node *node) struct sockaddr_in sock_out; memset(&sock_out, 0, sizeof(struct sockaddr_in)); - inet_pton(AF_INET, node->address.address, &sock_out.sin_addr); sock_out.sin_port = htons(node->address.port); sock_out.sin_family = PF_INET; + if (ctdb_ibw_get_address(node->ctdb, node->address.address, &sock_out.sin_addr)) { + DEBUG(0, ("ctdb_ibw_node_connect failed\n")); + return -1; + } rc = ibw_connect(cn->conn, &sock_out, node); if (rc) { |