mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove config struct

Browse Source
This commit is contained in:
Jarred Sumner
2022-10-11 23:44:35 -07:00
parent 40eca63653
commit dbd569d2ab
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/deps/_libusockets.h
View File

@@ -155,8 +155,8 @@ void uws_app_run(int ssl, uws_app_t *);
void uws_app_listen(int ssl, uws_app_t *app, int port,
uws_listen_handler handler, void *user_data);
void uws_app_listen_with_config(int ssl, uws_app_t *app,
const uws_app_listen_config_t *config,
void uws_app_listen_with_config(int ssl, uws_app_t *app, const char *host,
uint16_t port, int32_t options,
uws_listen_handler handler, void *user_data);
bool uws_constructor_failed(int ssl, uws_app_t *app);
unsigned int uws_num_subscribers(int ssl, uws_app_t *app, const char *topic);

17
src/deps/libuwsockets.cpp
View File

@@ -195,25 +195,22 @@ void uws_app_listen(int ssl, uws_app_t *app, int port,
}
}
void uws_app_listen_with_config(int ssl, uws_app_t *app,
const uws_app_listen_config_t *config_,
void uws_app_listen_with_config(int ssl, uws_app_t *app, const char *host,
uint16_t port, int32_t options,
uws_listen_handler handler, void *user_data) {
uws_app_listen_config_t config = *config_;
std::string hostname = config.host && config.host[0]
? std::string(config.host, strlen(config.host))
: "";
std::string hostname = host && host[0] ? std::string(host, strlen(host)) : "";
if (ssl) {
uWS::SSLApp *uwsApp = (uWS::SSLApp *)app;
uwsApp->listen(
hostname, config.port, config.options,
[handler, config, user_data](struct us_listen_socket_t *listen_socket) {
hostname, port, options,
[handler, user_data](struct us_listen_socket_t *listen_socket) {
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) {
hostname, port, options,
[handler, user_data](struct us_listen_socket_t *listen_socket) {
handler((struct us_listen_socket_t *)listen_socket, user_data);
});
}

12
src/deps/uws.zig
View File

@@ -878,7 +878,7 @@ pub fn NewApp(comptime ssl: bool) type {
}
}
};
return uws_app_listen_with_config(ssl_flag, @ptrCast(*uws_app_t, app), &config, Wrapper.handle, user_data);
return uws_app_listen_with_config(ssl_flag, @ptrCast(*uws_app_t, app), config.host, @intCast(u16, config.port), config.options, Wrapper.handle, user_data);
}
pub fn constructorFailed(app: *ThisApp) bool {
return uws_constructor_failed(ssl_flag, app);
@@ -1250,7 +1250,15 @@ extern fn uws_app_trace(ssl: i32, app: *uws_app_t, pattern: [*c]const u8, handle
extern fn uws_app_any(ssl: i32, app: *uws_app_t, pattern: [*c]const u8, handler: uws_method_handler, user_data: ?*anyopaque) void;
extern fn uws_app_run(ssl: i32, *uws_app_t) void;
extern fn uws_app_listen(ssl: i32, app: *uws_app_t, port: i32, handler: uws_listen_handler, user_data: ?*anyopaque) void;
extern fn uws_app_listen_with_config(ssl: i32, app: *uws_app_t, config: *const uws_app_listen_config_t, handler: uws_listen_handler, user_data: ?*anyopaque) void;
extern fn uws_app_listen_with_config(
ssl: i32,
app: *uws_app_t,
host: [*c]const u8,
port: u16,
options: i32,
handler: uws_listen_handler,
user_data: ?*anyopaque,
) void;
extern fn uws_constructor_failed(ssl: i32, app: *uws_app_t) bool;
extern fn uws_num_subscribers(ssl: i32, app: *uws_app_t, topic: [*c]const u8) c_uint;
extern fn uws_publish(ssl: i32, app: *uws_app_t, topic: [*c]const u8, topic_length: usize, message: [*c]const u8, message_length: usize, opcode: uws_opcode_t, compress: bool) bool;