Skip to content
Snippets Groups Projects
Commit 99e8c77c authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Revert "Revert "Apply socket options from sockopts.ini to sockets created by ListeningSocket()""

This reverts commit 7ff687ff.

We're already passing a sock_init callback (ls_cb) which is supposed to set
the socket options (call set_socket_options), so this change shouldn't be
necessary and reportedly caused more issues binding ircd sockets when running
ircd.js via jsexec (though I didn't see this myself).
parent 46f1f80e
Branches
Tags
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #4570 passed
......@@ -3359,6 +3359,17 @@ 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));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment