oven-sh · robobun · Aug 24, 2026 · Aug 24, 2026 · Aug 24, 2026 · Aug 24, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -362,7 +362,6 @@ rustix = { version = "0.38", default-features = false, features = ["std", "fs",
 bitflags = "2"
 thiserror = "2"
 smallvec = "1"
-typed-arena = "2"
 itoa = "1"
 encoding_rs = "0.8.35"
 # Vendored, not crates.io — see the `exclude = ["vendor"]` note above.

diff --git a/packages/bun-usockets/src/context.c b/packages/bun-usockets/src/context.c
@@ -167,10 +167,6 @@ void us_socket_group_close_all(struct us_socket_group_t *group) {
     us_socket_group_close_all_ex(group, 1);
 }
 
-unsigned short us_socket_group_timestamp(struct us_socket_group_t *group) {
-    return group->timestamp;
-}
-
 __attribute__((always_inline)) struct us_loop_t *us_socket_group_loop(struct us_socket_group_t *group) {
     return group->loop;
 }
@@ -179,10 +175,6 @@ __attribute__((always_inline)) void *us_socket_group_ext(struct us_socket_group_
     return group->ext;
 }
 
-struct us_socket_group_t *us_socket_group_next(struct us_socket_group_t *group) {
-    return group->next;
-}
-
 /* ── Link / unlink ──────────────────────────────────────────────────────── */
 
 static inline int us_internal_group_is_empty(struct us_socket_group_t *group) {
@@ -502,10 +494,6 @@ void us_listen_socket_close(struct us_listen_socket_t *ls) {
     /* We cannot immediately free a listen socket as we can be inside an accept loop */
 }
 
-__attribute__((always_inline)) void *us_listen_socket_ext(struct us_listen_socket_t *ls) {
-    return ls + 1;
-}
-
 struct us_listen_socket_t *us_socket_group_head_listen_socket(struct us_socket_group_t *group) {
     return group->head_listen_sockets;
 }
@@ -518,10 +506,6 @@ LIBUS_SOCKET_DESCRIPTOR us_listen_socket_get_fd(struct us_listen_socket_t *ls) {
     return us_poll_fd(&ls->s.p);
 }
 
-int us_listen_socket_port(struct us_listen_socket_t *ls) {
-    return us_socket_local_port(&ls->s);
-}
-
 struct us_socket_group_t *us_listen_socket_group(struct us_listen_socket_t *ls) {
     return ls->accept_group;
 }

diff --git a/packages/bun-usockets/src/crypto/openssl.c b/packages/bun-usockets/src/crypto/openssl.c
@@ -3064,27 +3064,6 @@ void us_listen_socket_remove_server_name(struct us_listen_socket_t *ls,
   sni_node_destructor(node);
 }
 
-void *us_listen_socket_find_server_name_userdata(struct us_listen_socket_t *ls,
-                                                 const char *hostname_pattern) {
-  if (!ls->sni) return NULL;
-  struct sni_node_t *node = (struct sni_node_t *)sni_find(ls->sni, hostname_pattern);
-  return node ? node->user : NULL;
-}
-
-/* Returns the SSL_CTX registered for `hostname_pattern` via
- * us_listen_socket_add_server_name, or NULL. Owned - the caller must release
- * the reference. The on_server_name resolvers return owned references (the
- * SNI dispatcher frees them after SSL_set_SSL_CTX takes its own), so the
- * tree's reference must not be handed out as a borrow. */
-struct ssl_ctx_st *us_listen_socket_find_server_name_ctx(struct us_listen_socket_t *ls,
-                                                         const char *hostname_pattern) {
-  if (!ls->sni) return NULL;
-  struct sni_node_t *node = (struct sni_node_t *)sni_find(ls->sni, hostname_pattern);
-  if (!node || !node->ctx) return NULL;
-  SSL_CTX_up_ref(node->ctx);
-  return node->ctx;
-}
-
 void us_listen_socket_on_server_name(struct us_listen_socket_t *ls,
                                      struct ssl_ctx_st *(*cb)(struct us_listen_socket_t *, const char *, int *, struct us_socket_t *)) {
   ls->on_server_name = cb;

diff --git a/packages/bun-usockets/src/crypto/sni_tree.cpp b/packages/bun-usockets/src/crypto/sni_tree.cpp
@@ -31,9 +31,6 @@
 #include <cstdlib>
 #include <algorithm>
 
-/* We only handle a maximum of 10 labels per hostname */
-#define MAX_LABELS 10
-
 /* This cannot be shared */
 thread_local void (*sni_free_cb)(void *);
 

diff --git a/packages/bun-usockets/src/fault_inject.c b/packages/bun-usockets/src/fault_inject.c
@@ -49,16 +49,6 @@ void us_fault_set(int sc, const struct us_fault_rule *rule) {
     Bun__unlock(&us_fault_lock);
 }
 
-void us_fault_clear(int sc) {
-    if ((unsigned)sc >= US_FAULT_COUNT) return;
-    Bun__lock(&us_fault_lock);
-    us_fault_state[sc].rule.action = US_FAULT_NONE;
-    us_fault_state[sc].calls_seen = 0;
-    us_fault_state[sc].fired = 0;
-    us_fault_recompute_armed();
-    Bun__unlock(&us_fault_lock);
-}
-
 void us_fault_clear_all(void) {
     Bun__lock(&us_fault_lock);
     for (int i = 0; i < US_FAULT_COUNT; i++) {

diff --git a/packages/bun-usockets/src/internal/fault_inject.h b/packages/bun-usockets/src/internal/fault_inject.h
@@ -88,7 +88,6 @@ extern "C" {
 extern int us_fault_armed;
 
 void us_fault_set(int syscall, const struct us_fault_rule *rule);
-void us_fault_clear(int syscall);
 void us_fault_clear_all(void);
 int us_fault_hit(int syscall, int fd, ssize_t *out, int *clamp);
 

diff --git a/packages/bun-usockets/src/internal/internal.h b/packages/bun-usockets/src/internal/internal.h
@@ -105,10 +105,8 @@ enum {
   POLL_TYPE_POLLING_IN = 16,
 };
 
-#define POLL_TYPE_BITSIZE 5 // make sure to update epoll_kqueue.h if you change this
 #define POLL_TYPE_KIND_MASK 0b111
 #define POLL_TYPE_POLLING_MASK 0b11000
-#define POLL_TYPE_MASK (POLL_TYPE_KIND_MASK | POLL_TYPE_POLLING_MASK)
 
 /* Bun APIs implemented in Zig */
 void Bun__lock(zig_mutex_t *lock);

diff --git a/packages/bun-usockets/src/internal/networking/bsd.h b/packages/bun-usockets/src/internal/networking/bsd.h
@@ -33,7 +33,6 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #pragma comment(lib, "ws2_32.lib")
-#define SETSOCKOPT_PTR_TYPE const char *
 #define LIBUS_SOCKET_ERROR INVALID_SOCKET
 #else /* POSIX */
 #ifndef _GNU_SOURCE
@@ -42,7 +41,6 @@
 /* For socklen_t */
 #include <sys/socket.h>
 #include <netdb.h>
-#define SETSOCKOPT_PTR_TYPE int *
 #define LIBUS_SOCKET_ERROR -1
 #endif
 

diff --git a/packages/bun-usockets/src/libusockets.h b/packages/bun-usockets/src/libusockets.h
@@ -102,7 +102,6 @@
 #define LIBUS_RECV_BUFFER_PADDING 32
 /* Guaranteed alignment of extension memory */
 #define LIBUS_EXT_ALIGNMENT 16
-#define ALLOW_SERVER_RENEGOTIATION 0
 
 /* close() codes — two orthogonal bits collapsed into three states:
  *   0  graceful: TLS sends close_notify and DEFERS the fd close until the
@@ -211,16 +210,8 @@ char *us_udp_packet_buffer_peer(struct us_udp_packet_buffer_t *buf, int index);
 /* Peeks ECN of received packet */
 // int us_udp_packet_buffer_ecn(struct us_udp_packet_buffer_t *buf, int index);
 
-/* Receives a set of packets into specified packet buffer */
-int us_udp_socket_receive(struct us_udp_socket_t *s, struct us_udp_packet_buffer_t *buf);
-
-void us_udp_buffer_set_packet_payload(struct us_udp_packet_buffer_t *send_buf, int index, int offset, void *payload, int length, void *peer_addr);
-
 int us_udp_socket_send(struct us_udp_socket_t *s, void** payloads, size_t* lengths, void** addresses, int num);
 
-/* Allocates a packet buffer that is reuable per thread. Mutated by us_udp_socket_receive. */
-struct us_udp_packet_buffer_t *us_create_udp_packet_buffer();
-
 /* Creates a (heavy-weight) UDP socket with a user space ring buffer. Again, this one is heavy weight and
  * shoud be reused. One entire QUIC server can be implemented using only one single UDP socket so weight
  * is not a concern as is the case for TCP sockets which are 1-to-1 with TCP connections. */
@@ -251,9 +242,6 @@ struct us_udp_socket_t *us_create_udp_socket_from_fd(us_loop_r loop, void (*data
 /* This one is ugly, should be ext! not user */
 void *us_udp_socket_user(struct us_udp_socket_t *s);
 
-/* Binds the UDP socket to an interface and port */
-int us_udp_socket_bind(struct us_udp_socket_t *s, const char *hostname, unsigned int port);
-
 /* Public interfaces for timers. libuv (Windows) only — epoll/kqueue schedules
  * on bun.JSC.EventLoopTimer, no file descriptor or syscall. */
 #ifdef _WIN32
@@ -361,10 +349,8 @@ void us_socket_group_close_all_ex(us_socket_group_r group, int also_listeners) n
  * (see close_all_ex). */
 int us_loop_close_all_groups(us_loop_r loop) nonnull_fn_decl;
 
-unsigned short us_socket_group_timestamp(us_socket_group_r group) nonnull_fn_decl;
 struct us_loop_t *us_socket_group_loop(us_socket_group_r group) nonnull_fn_decl __attribute((returns_nonnull));
 void *us_socket_group_ext(us_socket_group_r group) nonnull_fn_decl;
-struct us_socket_group_t *us_socket_group_next(us_socket_group_r group) nonnull_fn_decl;
 
 /* Move an open socket between groups / kinds, optionally resizing its ext.
  * Replaces us_socket_context_adopt_socket + us_create_child_socket_context.
@@ -412,11 +398,6 @@ int us_listen_socket_add_server_name(struct us_listen_socket_t *ls,
     __attribute__((nonnull(1, 2, 3)));
 void us_listen_socket_remove_server_name(struct us_listen_socket_t *ls,
     const char *hostname_pattern) nonnull_fn_decl;
-void *us_listen_socket_find_server_name_userdata(struct us_listen_socket_t *ls,
-    const char *hostname_pattern) nonnull_fn_decl;
-/* Returns an owned reference; the caller must release it. */
-struct ssl_ctx_st *us_listen_socket_find_server_name_ctx(struct us_listen_socket_t *ls,
-    const char *hostname_pattern) nonnull_fn_decl;
 /* Parses a PKCS#12 blob into malloc'd PEM key/cert/ca strings (caller frees);
  * returns 0 with a static *err_reason tag on failure. */
 int us_ssl_parse_pkcs12(const char *data, size_t len, const char *pass,
@@ -698,12 +679,9 @@ int us_socket_remote_port(us_socket_r s) nonnull_fn_decl;
 void us_socket_remote_address(us_socket_r s, char *nonnull_arg buf, int *nonnull_arg length) nonnull_fn_decl;
 void us_socket_local_address(us_socket_r s, char *nonnull_arg buf, int *nonnull_arg length) nonnull_fn_decl;
 
-struct us_socket_t *us_socket_detach(us_socket_r s) nonnull_fn_decl;
 int us_socket_ipc_write_fd(us_socket_r s, const char *data, int length, int fd) nonnull_fn_decl;
 void us_socket_sendfile_needs_more(us_socket_r s) nonnull_fn_decl;
-void *us_listen_socket_ext(struct us_listen_socket_t *ls) nonnull_fn_decl;
 LIBUS_SOCKET_DESCRIPTOR us_listen_socket_get_fd(struct us_listen_socket_t *ls) nonnull_fn_decl;
-int us_listen_socket_port(struct us_listen_socket_t *ls) nonnull_fn_decl;
 struct us_socket_group_t *us_listen_socket_group(struct us_listen_socket_t *ls) nonnull_fn_decl;
 /* Walk a group's live listeners. The list is the source of truth — anything
  * that caches us_listen_socket_t* across event-loop ticks (e.g. a std::vector

diff --git a/packages/bun-usockets/src/loop.c b/packages/bun-usockets/src/loop.c
@@ -425,12 +425,6 @@ void us_internal_loop_post(struct us_loop_t *loop) {
     loop->data.post_cb(loop);
 }
 
-#ifdef WIN32
-#define us_ioctl ioctlsocket
-#else
-#define us_ioctl ioctl
-#endif
-
 void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error, int eof, int events) {
     switch (us_internal_poll_type(p)) {
     case POLL_TYPE_CALLBACK: {
@@ -1081,5 +1075,3 @@ void us_loop_integrate(struct us_loop_t *loop) {
 __attribute__((always_inline)) void *us_loop_ext(struct us_loop_t *loop) {
     return loop + 1;
 }
-
-#undef us_ioctl
diff --git a/packages/bun-usockets/src/node_quic_shim.c b/packages/bun-usockets/src/node_quic_shim.c
@@ -526,7 +526,6 @@ lsquic_engine_t *us_nq_engine_new(int is_server, int is_http,
 
 const struct sockaddr *us_nq_spec_dest(const struct lsquic_out_spec *s) { return s->dest_sa; }
 const struct sockaddr *us_nq_spec_local(const struct lsquic_out_spec *s) { return s->local_sa; }
-void *us_nq_spec_peer_ctx(const struct lsquic_out_spec *s) { return s->peer_ctx; }
 const struct iovec *us_nq_spec_iov(const struct lsquic_out_spec *s, size_t *n) {
     *n = s->iovlen;
     return s->iov;