jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Unexpected error 9 on netlink descriptor <fd>

Browse Source 
The problem is double close of `fd` since the `fdopen`
takes ownership of fd passed.
This commit is contained in:
Kamil Trzcinski 2022-09-24 10:59:08 +02:00
parent f08421a796
commit 771f61449b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/http/http.c
View File

@ -172,7 +172,7 @@ static void http_process(http_worker_t *worker, FILE *stream)
static void http_client(http_worker_t *worker) static void http_client(http_worker_t *worker)
{ {
worker->client_host = inet_ntoa(worker->client_addr.sin_addr); worker->client_host = inet_ntoa(worker->client_addr.sin_addr);
LOG_INFO(worker, "Client connected %s.", worker->client_host); LOG_INFO(worker, "Client connected %s (fd=%d).", worker->client_host, worker->client_fd);
struct timeval tv; struct timeval tv;
tv.tv_sec = 3; tv.tv_sec = 3;
@ -186,12 +186,16 @@ static void http_client(http_worker_t *worker)
FILE *stream = fdopen(worker->client_fd, "r+"); FILE *stream = fdopen(worker->client_fd, "r+");
if (stream) { if (stream) {
worker->client_fd = -1; // ownership taken by stream
http_process(worker, stream); http_process(worker, stream);
fclose(stream); fclose(stream);
} }
close(worker->client_fd); if (worker->client_fd >= 0) {
worker->client_fd = -1; close(worker->client_fd);
worker->client_fd = -1;
}
LOG_INFO(worker, "Client disconnected %s.", worker->client_host); LOG_INFO(worker, "Client disconnected %s.", worker->client_host);
worker->client_host = NULL; worker->client_host = NULL;