diff options
Diffstat (limited to 'ctdb/tcp')
| -rw-r--r-- | ctdb/tcp/ctdb_tcp.h | 1 | ||||
| -rw-r--r-- | ctdb/tcp/tcp_init.c | 20 |
2 files changed, 20 insertions, 1 deletions
diff --git a/ctdb/tcp/ctdb_tcp.h b/ctdb/tcp/ctdb_tcp.h index 7d47cbcfe1..9a17bd6b59 100644 --- a/ctdb/tcp/ctdb_tcp.h +++ b/ctdb/tcp/ctdb_tcp.h @@ -20,6 +20,7 @@ /* ctdb_tcp main state */ struct ctdb_tcp { + struct ctdb_context *ctdb; int listen_fd; }; diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c index 624f6507ef..527373cb08 100644 --- a/ctdb/tcp/tcp_init.c +++ b/ctdb/tcp/tcp_init.c @@ -54,7 +54,10 @@ static int ctdb_tcp_initialise(struct ctdb_context *ctdb) int i; /* listen on our own address */ - if (ctdb_tcp_listen(ctdb) != 0) return -1; + if (ctdb_tcp_listen(ctdb) != 0) { + DEBUG(DEBUG_CRIT, (__location__ " Failed to start listening on the CTDB socket\n")); + exit(1); + } for (i=0; i<ctdb->num_nodes; i++) { if (ctdb_tcp_add_node(ctdb->nodes[i]) != 0) { @@ -142,6 +145,18 @@ static const struct ctdb_methods ctdb_tcp_methods = { .restart = ctdb_tcp_restart, }; +static int tcp_ctcp_destructor(struct ctdb_tcp *ctcp) +{ + if (ctcp->listen_fd) { + close(ctcp->listen_fd); + } + ctcp->ctdb->private_data = NULL; + ctcp->ctdb->methods = NULL; + + return 0; +} + + /* initialise tcp portion of ctdb */ @@ -152,8 +167,11 @@ int ctdb_tcp_init(struct ctdb_context *ctdb) CTDB_NO_MEMORY(ctdb, ctcp); ctcp->listen_fd = -1; + ctcp->ctdb = ctdb; ctdb->private_data = ctcp; ctdb->methods = &ctdb_tcp_methods; + + talloc_set_destructor(ctcp, tcp_ctcp_destructor); return 0; } |