Explicitly free the listener in the socket destructor

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 632cb0ae190ad5c6e59f5edc83d3876f984da748..72d00cb10c9f990e01b7174c176d4397e73ed596 100644 (file)
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -1278,6 +1278,7 @@ static int _network_socket_free(fr_network_socket_t *s)
        }
 
        talloc_free(s->waiting);
+       talloc_free(s->listen);
 
        return 0;
 }

diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c
index 7bbaf09231b18dc842639349c15e39cd2d446248..e3fc43546b00dcbb0bb128f87306ff35f5d47632 100644 (file)
--- a/src/listen/detail/proto_detail_work.c
+++ b/src/listen/detail/proto_detail_work.c
@@ -761,14 +761,6 @@ static int mod_close_internal(proto_detail_work_thread_t *thread)
        close(thread->fd);
        thread->fd = -1;
 
-       /*
-        *      If we've been spawned from proto_detail_file, clean
-        *      ourselves up, including our listener.
-        */
-       if (thread->listen) {
-               talloc_free(thread->listen);
-       }
-
        if (inst->parent->exit_when_done) {
                INFO("Done reading detail files, process will now exit");