X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=send_common.c;h=90242d5c9b5ccb125617004e16fbf9b64d5484f6;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=ea494d9a7b23f5ee87186917d11e883631ec9cbc;hpb=e2e1adca824585eeecd091f54955e51212927533;p=paraslash.git diff --git a/send_common.c b/send_common.c index ea494d9a..90242d5c 100644 --- a/send_common.c +++ b/send_common.c @@ -44,12 +44,12 @@ */ void shutdown_client(struct sender_client *sc, struct sender_status *ss) { - PARA_INFO_LOG("shutting down %s on fd %d\n", sc->name, sc->fd); - free(sc->name); if (!process_is_command_handler()) { + PARA_INFO_LOG("shutting down %s on fd %d\n", sc->name, sc->fd); close(sc->fd); del_close_on_fork_list(sc->fd); } + free(sc->name); cq_destroy(sc->cq); list_del(&sc->node); free(sc->private_data); @@ -136,9 +136,9 @@ void init_sender_status(struct sender_status *ss, } ss->default_port = default_port; - INIT_LIST_HEAD(&ss->client_list); + init_list_head(&ss->client_list); /* Initialize an access control list */ - INIT_LIST_HEAD(&ss->acl); + init_list_head(&ss->acl); for (i = 0; i < lls_opt_given(acl_opt_result); i++) { const char *arg = lls_string_val(i, acl_opt_result); char addr[16];