From f9a44f56e2ad13a4373e63cda3d5f20fc0d4e921 Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on Debian Linux)" <rob@synchro.net> Date: Mon, 24 Jul 2023 18:31:58 -0700 Subject: [PATCH] Manual revert of the ListeningSocket contructor "fix" which wasn't necessary I keep reverting/un-reverting the merge that includes an unrelated logon.cpp change. So just manually remove this new code that was added to attempt to fix issue #402 since I incorrectly concluded that sockopts.ini wasn't being applied to new sockets created with ListeningSocket(). --- src/sbbs3/js_socket.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c index fb6eff8ac2..aa657371f6 100644 --- a/src/sbbs3/js_socket.c +++ b/src/sbbs3/js_socket.c @@ -3359,17 +3359,6 @@ js_listening_socket_constructor(JSContext *cx, uintN argc, jsval *arglist) } } - for (i = 0; (jsuint)i < set->sock_count; ++i) { - char error[256] = ""; - if (set_socket_options(scfg, set->socks[i].sock, protocol, error, sizeof(error)) != 0) { - JS_ReportError(cx, "Error (%s) setting socket options (for %s) on socket %d" - ,error, protocol, set->socks[i].sock); - free(protocol); - free(set); - return JS_FALSE; - } - } - obj=JS_NewObject(cx, &js_socket_class, NULL, NULL); JS_SET_RVAL(cx, arglist, OBJECT_TO_JSVAL(obj)); -- GitLab