diff options
Diffstat (limited to '')
| -rw-r--r-- | src/deps/_libusockets.h | 1 | ||||
| -rw-r--r-- | src/deps/libuwsockets.cpp | 10 | ||||
| -rw-r--r-- | src/deps/uws.zig | 9 |
3 files changed, 8 insertions, 12 deletions
diff --git a/src/deps/_libusockets.h b/src/deps/_libusockets.h index d9bebda0c..551a33f45 100644 --- a/src/deps/_libusockets.h +++ b/src/deps/_libusockets.h @@ -121,7 +121,6 @@ typedef struct { } uws_socket_behavior_t; typedef void (*uws_listen_handler)(struct us_listen_socket_t *listen_socket, - uws_app_listen_config_t config, void *user_data); typedef void (*uws_method_handler)(uws_res_t *response, uws_req_t *request, void *user_data); diff --git a/src/deps/libuwsockets.cpp b/src/deps/libuwsockets.cpp index b34401685..c7c7028b0 100644 --- a/src/deps/libuwsockets.cpp +++ b/src/deps/libuwsockets.cpp @@ -183,14 +183,14 @@ void uws_app_listen(int ssl, uws_app_t *app, int port, uWS::SSLApp *uwsApp = (uWS::SSLApp *)app; uwsApp->listen(port, [handler, config, user_data](struct us_listen_socket_t *listen_socket) { - handler((struct us_listen_socket_t *)listen_socket, config, user_data); + handler((struct us_listen_socket_t *)listen_socket, user_data); }); } else { uWS::App *uwsApp = (uWS::App *)app; uwsApp->listen(port, [handler, config, user_data](struct us_listen_socket_t *listen_socket) { - handler((struct us_listen_socket_t *)listen_socket, config, user_data); + handler((struct us_listen_socket_t *)listen_socket, user_data); }); } } @@ -207,16 +207,14 @@ void uws_app_listen_with_config(int ssl, uws_app_t *app, uwsApp->listen( hostname, config.port, config.options, [handler, config, user_data](struct us_listen_socket_t *listen_socket) { - handler((struct us_listen_socket_t *)listen_socket, config, - user_data); + handler((struct us_listen_socket_t *)listen_socket, user_data); }); } else { uWS::App *uwsApp = (uWS::App *)app; uwsApp->listen( hostname, config.port, config.options, [handler, config, user_data](struct us_listen_socket_t *listen_socket) { - handler((struct us_listen_socket_t *)listen_socket, config, - user_data); + handler((struct us_listen_socket_t *)listen_socket, user_data); }); } } diff --git a/src/deps/uws.zig b/src/deps/uws.zig index 0299f6dd5..9cabda244 100644 --- a/src/deps/uws.zig +++ b/src/deps/uws.zig @@ -596,7 +596,7 @@ pub const uws_socket_behavior_t = extern struct { pong: uws_websocket_ping_pong_handler, close: uws_websocket_close_handler, }; -pub const uws_listen_handler = ?fn (?*listen_socket_t, uws_app_listen_config_t, ?*anyopaque) callconv(.C) void; +pub const uws_listen_handler = ?fn (?*listen_socket_t, ?*anyopaque) callconv(.C) void; pub const uws_method_handler = ?fn (*uws_res, *Request, ?*anyopaque) callconv(.C) void; pub const uws_filter_handler = ?fn (*uws_res, i32, ?*anyopaque) callconv(.C) void; pub const uws_missing_server_handler = ?fn ([*c]const u8, ?*anyopaque) callconv(.C) void; @@ -863,18 +863,17 @@ pub fn NewApp(comptime ssl: bool) type { app: *ThisApp, comptime UserData: type, user_data: UserData, - comptime handler: fn (UserData, ?*ListenSocket, uws_app_listen_config_t) void, + comptime handler: fn (UserData, ?*ListenSocket) void, config: uws_app_listen_config_t, ) void { const Wrapper = struct { - pub fn handle(socket: ?*listen_socket_t, conf: uws_app_listen_config_t, data: ?*anyopaque) callconv(.C) void { + pub fn handle(socket: ?*listen_socket_t, data: ?*anyopaque) callconv(.C) void { if (comptime UserData == void) { - @call(.{ .modifier = .always_inline }, handler, .{ void{}, @ptrCast(?*ListenSocket, socket), conf }); + @call(.{ .modifier = .always_inline }, handler, .{ void{}, @ptrCast(?*ListenSocket, socket) }); } else { @call(.{ .modifier = .always_inline }, handler, .{ @ptrCast(UserData, @alignCast(@alignOf(UserData), data.?)), @ptrCast(?*ListenSocket, socket), - conf, }); } } |