|
 |
b6c02a |
From 954eabaeb76a0f93a32210b6bf63157ad2c0fb22 Mon Sep 17 00:00:00 2001
|
|
|
b6c02a |
From: Uri Lublin <uril@redhat.com>
|
|
|
b6c02a |
Date: Wed, 17 Jun 2020 11:52:05 +0300
|
|
|
b6c02a |
Subject: [PATCH] test-websocket: check setsockopt return value
|
|
|
b6c02a |
|
|
|
b6c02a |
Acked-by: Frediano Ziglio <fziglio@redhat.com>
|
|
|
b6c02a |
---
|
|
|
b6c02a |
server/tests/test-websocket.c | 10 ++++++++--
|
|
|
b6c02a |
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
b6c02a |
|
|
|
b6c02a |
diff --git a/server/tests/test-websocket.c b/server/tests/test-websocket.c
|
|
|
b6c02a |
index 2115411e..701f5408 100644
|
|
|
b6c02a |
--- a/server/tests/test-websocket.c
|
|
|
b6c02a |
+++ b/server/tests/test-websocket.c
|
|
|
b6c02a |
@@ -146,7 +146,10 @@ main(int argc, char **argv)
|
|
|
b6c02a |
}
|
|
|
b6c02a |
|
|
|
b6c02a |
int enable = 1;
|
|
|
b6c02a |
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
|
|
|
b6c02a |
+ if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
|
|
|
b6c02a |
+ (const void *) &enable, sizeof(enable)) < 0) {
|
|
|
b6c02a |
+ err(1, "setsockopt reuseaddr");
|
|
|
b6c02a |
+ }
|
|
|
b6c02a |
|
|
|
b6c02a |
if (non_blocking) {
|
|
|
b6c02a |
red_socket_set_non_blocking(sock, true);
|
|
|
b6c02a |
@@ -200,7 +203,10 @@ handle_client(int new_sock)
|
|
|
b6c02a |
}
|
|
|
b6c02a |
|
|
|
b6c02a |
int enable = 1;
|
|
|
b6c02a |
- setsockopt(new_sock, SOL_TCP, TCP_NODELAY, (const void *) &enable, sizeof(enable));
|
|
|
b6c02a |
+ if (setsockopt(new_sock, SOL_TCP, TCP_NODELAY,
|
|
|
b6c02a |
+ (const void *) &enable, sizeof(enable)) < 0) {
|
|
|
b6c02a |
+ err(1, "setsockopt nodelay");
|
|
|
b6c02a |
+ }
|
|
|
b6c02a |
|
|
|
b6c02a |
// wait header
|
|
|
b6c02a |
wait_for(new_sock, POLLIN);
|
|
|
b6c02a |
--
|
|
|
b6c02a |
2.26.2
|
|
|
b6c02a |
|