node:dgram compatibility improvements

packages/bun-usockets/src/internal/networking/bsd.h

@@ -26,7 +26,7 @@
 
 #include "libusockets.h"
 
-#ifdef _WIN32 
+#ifdef _WIN32
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
@@ -178,9 +178,15 @@ int bsd_udp_packet_buffer_local_ip(struct udp_recvbuf *msgvec, int index, char *
 LIBUS_SOCKET_DESCRIPTOR apple_no_sigpipe(LIBUS_SOCKET_DESCRIPTOR fd);
 LIBUS_SOCKET_DESCRIPTOR bsd_set_nonblocking(LIBUS_SOCKET_DESCRIPTOR fd);
 void bsd_socket_nodelay(LIBUS_SOCKET_DESCRIPTOR fd, int enabled);
+int bsd_socket_broadcast(LIBUS_SOCKET_DESCRIPTOR fd, int enabled);
+int bsd_socket_ttl_unicast(LIBUS_SOCKET_DESCRIPTOR fd, int ttl);
+int bsd_socket_ttl_multicast(LIBUS_SOCKET_DESCRIPTOR fd, int ttl);
+int bsd_socket_multicast_loopback(LIBUS_SOCKET_DESCRIPTOR fd, int enabled);
+int bsd_socket_multicast_interface(LIBUS_SOCKET_DESCRIPTOR fd, const struct sockaddr_storage *addr);
+int bsd_socket_set_membership(LIBUS_SOCKET_DESCRIPTOR fd, const struct sockaddr_storage *addr, const struct sockaddr_storage *iface, int drop);
 int bsd_socket_keepalive(LIBUS_SOCKET_DESCRIPTOR fd, int on, unsigned int delay);
 void bsd_socket_flush(LIBUS_SOCKET_DESCRIPTOR fd);
-LIBUS_SOCKET_DESCRIPTOR bsd_create_socket(int domain, int type, int protocol);
+LIBUS_SOCKET_DESCRIPTOR bsd_create_socket(int domain, int type, int protocol, int *err);
 
 void bsd_close_socket(LIBUS_SOCKET_DESCRIPTOR fd);
 void bsd_shutdown_socket(LIBUS_SOCKET_DESCRIPTOR fd);
@@ -211,7 +217,7 @@ LIBUS_SOCKET_DESCRIPTOR bsd_create_listen_socket(const char *host, int port, int
 LIBUS_SOCKET_DESCRIPTOR bsd_create_listen_socket_unix(const char *path, size_t pathlen, int options, int* error);
 
 /* Creates an UDP socket bound to the hostname and port */
-LIBUS_SOCKET_DESCRIPTOR bsd_create_udp_socket(const char *host, int port);
+LIBUS_SOCKET_DESCRIPTOR bsd_create_udp_socket(const char *host, int port, int options, int *err);
 int bsd_connect_udp_socket(LIBUS_SOCKET_DESCRIPTOR fd, const char *host, int port);
 int bsd_disconnect_udp_socket(LIBUS_SOCKET_DESCRIPTOR fd);
 

packages/bun-usockets/src/libusockets.h

@@ -42,8 +42,8 @@
 #endif
 
 #ifdef BUN_DEBUG
-#define nonnull_fn_decl 
-#else 
+#define nonnull_fn_decl
+#else
 #ifndef nonnull_fn_decl
 #define nonnull_fn_decl __attribute__((nonnull))
 #endif
@@ -98,7 +98,7 @@ enum {
     LIBUS_SOCKET_ALLOW_HALF_OPEN = 2,
     /* Setting reusePort allows multiple sockets on the same host to bind to the same port. Incoming connections are distributed by the operating system to listening sockets. This option is available only on some platforms, such as Linux 3.9+, DragonFlyBSD 3.6+, FreeBSD 12.0+, Solaris 11.4, and AIX 7.2.5+*/
     LIBUS_LISTEN_REUSE_PORT = 4,
-    /* etting ipv6Only will disable dual-stack support, i.e., binding to host :: won't make 0.0.0.0 be bound.*/
+    /* Setting ipv6Only will disable dual-stack support, i.e., binding to host :: won't make 0.0.0.0 be bound.*/
     LIBUS_SOCKET_IPV6_ONLY = 8,
 };
 
@@ -153,10 +153,12 @@ struct us_udp_packet_buffer_t *us_create_udp_packet_buffer();
 
 //struct us_udp_socket_t *us_create_udp_socket(us_loop_r loop, void (*data_cb)(struct us_udp_socket_t *, struct us_udp_packet_buffer_t *, int), void (*drain_cb)(struct us_udp_socket_t *), char *host, unsigned short port);
 
-struct us_udp_socket_t *us_create_udp_socket(us_loop_r loop, void (*data_cb)(struct us_udp_socket_t *, void *, int), void (*drain_cb)(struct us_udp_socket_t *), void (*close_cb)(struct us_udp_socket_t *), const char *host, unsigned short port, void *user);
+struct us_udp_socket_t *us_create_udp_socket(us_loop_r loop, void (*data_cb)(struct us_udp_socket_t *, void *, int), void (*drain_cb)(struct us_udp_socket_t *), void (*close_cb)(struct us_udp_socket_t *), const char *host, unsigned short port, int flags, int *err, void *user);
 
 void us_udp_socket_close(struct us_udp_socket_t *s);
 
+int us_udp_socket_set_broadcast(struct us_udp_socket_t *s, int enabled);
+
 /* This one is ugly, should be ext! not user */
 void *us_udp_socket_user(struct us_udp_socket_t *s);
 
@@ -223,11 +225,11 @@ struct us_bun_socket_context_options_t {
     const char *ssl_ciphers;
     int ssl_prefer_low_memory_usage; /* Todo: rename to prefer_low_memory_usage and apply for TCP as well */
     const char **key;
-    unsigned int key_count; 
+    unsigned int key_count;
     const char **cert;
-    unsigned int cert_count; 
+    unsigned int cert_count;
     const char **ca;
-    unsigned int ca_count; 
+    unsigned int ca_count;
     unsigned int secure_options;
     int reject_unauthorized;
     int request_cert;
@@ -310,7 +312,7 @@ struct us_listen_socket_t *us_socket_context_listen_unix(int ssl, us_socket_cont
 void us_listen_socket_close(int ssl, struct us_listen_socket_t *ls) nonnull_fn_decl;
 
 /*
-    Returns one of 
+    Returns one of
     - struct us_socket_t * - indicated by the value at on_connecting being set to 1
       This is the fast path where the DNS result is available immediately and only a single remote
       address is available

packages/bun-usockets/src/quic.c

@@ -102,7 +102,7 @@ void on_udp_socket_writable(struct us_udp_socket_t *s) {
 
 // we need two differetn handlers to know to put it in client or servcer context
 void on_udp_socket_data_client(struct us_udp_socket_t *s, struct us_udp_packet_buffer_t *buf, int packets) {
-    
+
     int fd = us_poll_fd((struct us_poll_t *) s);
     //printf("Reading on fd: %d\n", fd);
 
@@ -113,7 +113,7 @@ void on_udp_socket_data_client(struct us_udp_socket_t *s, struct us_udp_packet_b
     // do we have udp socket contexts? or do we just have user data?
 
     us_quic_socket_context_t *context = us_udp_socket_user(s);
-    
+
     /* We just shove it to lsquic */
     for (int i = 0; i < packets; i++) {
         char *payload = us_udp_packet_buffer_payload(buf, i);
@@ -155,15 +155,15 @@ void on_udp_socket_data_client(struct us_udp_socket_t *s, struct us_udp_packet_b
         int ret = lsquic_engine_packet_in(context->client_engine, payload, length, (struct sockaddr *) &local_addr, peer_addr, (void *) s, 0);
         //printf("Engine returned: %d\n", ret);
 
-    
+
     }
 
     lsquic_engine_process_conns(context->client_engine);
 
 }
 
 void on_udp_socket_data(struct us_udp_socket_t *s, struct us_udp_packet_buffer_t *buf, int packets) {
-    
+
 
     //printf("UDP socket got data: %p\n", s);
 
@@ -175,7 +175,7 @@ void on_udp_socket_data(struct us_udp_socket_t *s, struct us_udp_packet_buffer_t
 
     // process conns now? to accept new connections?
     lsquic_engine_process_conns(context->engine);
-    
+
     /* We just shove it to lsquic */
     for (int i = 0; i < packets; i++) {
         char *payload = us_udp_packet_buffer_payload(buf, i);
@@ -218,7 +218,7 @@ void on_udp_socket_data(struct us_udp_socket_t *s, struct us_udp_packet_buffer_t
         int ret = lsquic_engine_packet_in(context->engine, payload, length, (struct sockaddr *) &local_addr, peer_addr, (void *) s, 0);
         //printf("Engine returned: %d\n", ret);
 
-    
+
     }
 
     lsquic_engine_process_conns(context->engine);
@@ -653,9 +653,9 @@ struct ssl_ctx_st *get_ssl_ctx(void *peer_ctx, const struct sockaddr *local) {
 
     SSL_CTX_set_min_proto_version(ctx, TLS1_3_VERSION);
     SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
-    
+
     //SSL_CTX_set_default_verify_paths(ctx);
-    
+
     // probably cannot use this when http is in use?
     // alpn is needed
     SSL_CTX_set_alpn_select_cb(ctx, select_alpn, NULL);
@@ -950,7 +950,7 @@ us_quic_socket_context_t *us_create_quic_socket_context(struct us_loop_t *loop,
         .ea_stream_if_ctx   = context,
 
         .ea_get_ssl_ctx = get_ssl_ctx,
-        
+
         // lookup certificate
         .ea_lookup_cert = sni_lookup,
         .ea_cert_lu_ctx = 0,
@@ -980,7 +980,7 @@ us_quic_socket_context_t *us_create_quic_socket_context(struct us_loop_t *loop,
         .ea_stream_if_ctx   = context,
 
         //.ea_get_ssl_ctx = get_ssl_ctx, // for client?
-        
+
         // lookup certificate
         //.ea_lookup_cert = sni_lookup, // for client?
         //.ea_cert_lu_ctx = 13, // for client?
@@ -1008,7 +1008,7 @@ us_quic_socket_context_t *us_create_quic_socket_context(struct us_loop_t *loop,
 
 us_quic_listen_socket_t *us_quic_socket_context_listen(us_quic_socket_context_t *context, const char *host, int port, int ext_size) {
     /* We literally do create a listen socket */
-    return (us_quic_listen_socket_t *) us_create_udp_socket(context->loop, /*context->recv_buf*/ NULL, on_udp_socket_data, on_udp_socket_writable, host, port, context);
+    return (us_quic_listen_socket_t *) us_create_udp_socket(context->loop, /*context->recv_buf*/ NULL, on_udp_socket_data, on_udp_socket_writable, host, port, 0, context);
     //return NULL;
 }
 
@@ -1030,7 +1030,7 @@ us_quic_socket_t *us_quic_socket_context_connect(us_quic_socket_context_t *conte
     addr->sin6_family = AF_INET6;
 
     // Create the UDP socket binding to ephemeral port
-    struct us_udp_socket_t *udp_socket = us_create_udp_socket(context->loop, /*context->recv_buf*/ NULL, on_udp_socket_data_client, on_udp_socket_writable, 0, 0, context);
+    struct us_udp_socket_t *udp_socket = us_create_udp_socket(context->loop, /*context->recv_buf*/ NULL, on_udp_socket_data_client, on_udp_socket_writable, 0, 0, 0, context);
 
     // Determine what port we got, creating the local sockaddr
     int ephemeral = us_udp_socket_bound_port(udp_socket);

packages/bun-usockets/src/udp.c

@@ -55,7 +55,7 @@ int us_udp_socket_send(struct us_udp_socket_t *s, void** payloads, size_t* lengt
         num -= count;
         // TODO nohang flag?
         int sent = bsd_sendmmsg(fd, buf, MSG_DONTWAIT);
-        if (sent < 0) { 
+        if (sent < 0) {
             return sent;
         }
         total_sent += sent;
@@ -91,9 +91,7 @@ void us_udp_socket_remote_ip(struct us_udp_socket_t *s, char *buf, int *length)
   }
 }
 
-void *us_udp_socket_user(struct us_udp_socket_t *s) {
-    struct us_udp_socket_t *udp = (struct us_udp_socket_t *) s;
-
+void *us_udp_socket_user(struct us_udp_socket_t *udp) {
     return udp->user;
 }
 
@@ -108,6 +106,18 @@ void us_udp_socket_close(struct us_udp_socket_t *s) {
     s->on_close(s);
 }
 
+int us_udp_socket_set_broadcast(struct us_udp_socket_t *s, int enabled) {
+    return bsd_socket_broadcast(us_poll_fd(&s->p), enabled);
+}
+
+int us_udp_socket_set_ttl_unicast(struct us_udp_socket_t *s, int ttl) {
+    return bsd_socket_ttl_unicast(us_poll_fd(&s->p), ttl);
+}
+
+int us_udp_socket_set_ttl_multicast(struct us_udp_socket_t *s, int ttl) {
+    return bsd_socket_ttl_multicast(us_poll_fd(&s->p), ttl);
+}
+
 int us_udp_socket_connect(struct us_udp_socket_t *s, const char* host, unsigned short port) {
     return bsd_connect_udp_socket(us_poll_fd((struct us_poll_t *)s), host, port);
 }
@@ -116,17 +126,31 @@ int us_udp_socket_disconnect(struct us_udp_socket_t *s) {
     return bsd_disconnect_udp_socket(us_poll_fd((struct us_poll_t *)s));
 }
 
+int us_udp_socket_set_multicast_loopback(struct us_udp_socket_t *s, int enabled) {
+    return bsd_socket_multicast_loopback(us_poll_fd(&s->p), enabled);
+}
+
+int us_udp_socket_set_multicast_interface(struct us_udp_socket_t *s, const struct sockaddr_storage *addr) {
+    return bsd_socket_multicast_interface(us_poll_fd(&s->p), addr);
+}
+
+int us_udp_socket_set_membership(struct us_udp_socket_t *s, const struct sockaddr_storage *addr, const struct sockaddr_storage *iface, int drop) {
+    return bsd_socket_set_membership(us_poll_fd(&s->p), addr, iface, drop);
+}
+
 struct us_udp_socket_t *us_create_udp_socket(
-    struct us_loop_t *loop, 
-    void (*data_cb)(struct us_udp_socket_t *, void *, int), 
-    void (*drain_cb)(struct us_udp_socket_t *), 
+    struct us_loop_t *loop,
+    void (*data_cb)(struct us_udp_socket_t *, void *, int),
+    void (*drain_cb)(struct us_udp_socket_t *),
     void (*close_cb)(struct us_udp_socket_t *),
-    const char *host, 
-    unsigned short port, 
+    const char *host,
+    unsigned short port,
+    int flags,
+    int *err,
     void *user
 ) {
 
-    LIBUS_SOCKET_DESCRIPTOR fd = bsd_create_udp_socket(host, port);
+    LIBUS_SOCKET_DESCRIPTOR fd = bsd_create_udp_socket(host, port, flags, err);
     if (fd == LIBUS_SOCKET_ERROR) {
         return 0;
     }
@@ -157,6 +181,6 @@ struct us_udp_socket_t *us_create_udp_socket(
     udp->next = NULL;
 
     us_poll_start((struct us_poll_t *) udp, udp->loop, LIBUS_SOCKET_READABLE | LIBUS_SOCKET_WRITABLE);
-    
+
     return (struct us_udp_socket_t *) udp;
 }