Fix documentation for LWS_CALLBACK_FILTER_NETWORK_CONNECTION
At the time callback LWS_CALLBACK_FILTER_NETWORK_CONNECTION is called,
there is no client connection information yet, so the parameter wsi
still pointing to the main server connection. Add an description of
this behavior to the documentation.
diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index e195b4d..1408ef5 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -172,6 +172,7 @@
LWS_CALLBACK_HTTP_WRITEABLE,
LWS_CALLBACK_FILTER_NETWORK_CONNECTION,
LWS_CALLBACK_FILTER_HTTP_CONNECTION,
+ LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED,
LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION,
LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS,
LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS,
@@ -554,12 +555,21 @@
* the server at network level; the connection is accepted but then
* passed to this callback to decide whether to hang up immediately
* or not, based on the client IP. @in contains the connection
- * socket's descriptor. Return non-zero to terminate
- * the connection before sending or receiving anything.
- * Because this happens immediately after the network connection
- * from the client, there's no websocket protocol selected yet so
- * this callback is issued only to protocol 0.
+ * socket's descriptor. Since the client connection information is
+ * not available yet, @wsi still pointing to the main server socket.
+ * Return non-zero to terminate the connection before sending or
+ * receiving anything. Because this happens immediately after the
+ * network connection from the client, there's no websocket protocol
+ * selected yet so this callback is issued only to protocol 0.
*
+ * LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED: A new client just had
+ * been connected, accepted, and instantiated into the pool. This
+ * callback allows setting any relevant property to it. Because this
+ * happens immediately after the instantiation of a new client,
+ * there's no websocket protocol selected yet so this callback is
+ * issued only to protocol 0. Only @wsi is defined, pointing to the
+ * new client, and the return value is ignored.
+ *
* LWS_CALLBACK_FILTER_HTTP_CONNECTION: called when the request has
* been received and parsed from the client, but the response is
* not sent yet. Return non-zero to disallow the connection.
diff --git a/lib/server.c b/lib/server.c
index ad7ba42..547364c 100644
--- a/lib/server.c
+++ b/lib/server.c
@@ -282,6 +282,16 @@
new_wsi->sock = accept_fd;
+ /*
+ * A new connection was accepted. Give the user a chance to
+ * set properties of the newly created wsi. There's no protocol
+ * selected yet so we issue this to protocols[0]
+ */
+
+ (context->protocols[0].callback)(context, new_wsi,
+ LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED, NULL, NULL, 0);
+
+
#ifdef LWS_OPENSSL_SUPPORT
new_wsi->ssl = NULL;
if (!context->use_ssl) {