stream: don't close underlying socket when creating a stream from it

diff --git a/src/libstrongswan/networking/streams/stream_service.c b/src/libstrongswan/networking/streams/stream_service.c
index 1b06e1eb14d1da4a0f31577ae41c6ecc5ec8a288..c2681af3a317f9b3bdce363e1c7ff4d6f4a4d47a 100644 (file)
--- a/src/libstrongswan/networking/streams/stream_service.c
+++ b/src/libstrongswan/networking/streams/stream_service.c
@@ -109,7 +109,10 @@ static void destroy_async_data(async_data_t *data)
        this->condvar->signal(this->condvar);
        this->mutex->unlock(this->mutex);
 
-       close(data->fd);
+       if (data->fd != -1)
+       {
+               close(data->fd);
+       }
        free(data);
 }
 
@@ -123,6 +126,8 @@ static job_requeue_t accept_async(async_data_t *data)
        stream = stream_create_from_fd(data->fd);
        if (stream)
        {
+               /* FD is now owned by stream, don't close it during cleanup */
+               data->fd = -1;
                thread_cleanup_push((void*)stream->destroy, stream);
                thread_cleanup_pop(!data->cb(data->data, stream));
        }