MINOR: quic_sock: un-statify quic_conn_sock_fd_iocb()

This one is printed as the iocb in the "show fd" output, and arguably
this wasn't very convenient as-is:
    293 : st=0x000123(cl heopI W:sRa R:sRA) ref=0 gid=1 tmask=0x8 umask=0x0 prmsk=0x8 pwmsk=0x0 owner=0x7f488487afe0 iocb=0x50a2c0(main+0x60f90)

Let's unstatify it and export it so that the symbol can now be resolved
from the various points that need it.

diff --git a/include/haproxy/quic_sock.h b/include/haproxy/quic_sock.h
index 55ea170a18c06b321fe1ce0895a796bda23678e9..89f7f158b7ba8ef9fe8adca0632e0c3cb0de3694 100644 (file)
--- a/include/haproxy/quic_sock.h
+++ b/include/haproxy/quic_sock.h
@@ -46,6 +46,7 @@ void quic_lstnr_sock_fd_iocb(int fd);
 int qc_snd_buf(struct quic_conn *qc, const struct buffer *buf, size_t count,
                int flags);
 int qc_rcv_buf(struct quic_conn *qc);
+void quic_conn_sock_fd_iocb(int fd);
 
 /* Set default value for <qc> socket as uninitialized. */
 static inline void qc_init_fd(struct quic_conn *qc)

diff --git a/src/quic_sock.c b/src/quic_sock.c
index 16c4c644f4488e174ebf43a64f8861b18eae58ad..6dde545e9be3c9350ed5bc2189b5e44316d017db 100644 (file)
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -486,7 +486,7 @@ void quic_lstnr_sock_fd_iocb(int fd)
 }
 
 /* FD-owned quic-conn socket callback. */
-static void quic_conn_sock_fd_iocb(int fd)
+void quic_conn_sock_fd_iocb(int fd)
 {
        struct quic_conn *qc = fdtab[fd].owner;
 

diff --git a/src/tools.c b/src/tools.c
index f7fdfff81453b575aa16b582c1c34de3e0e64a20..a4572b954b8c94e7e833f795cf5345ca403f1d67 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -61,6 +61,7 @@ extern void *__elf_aux_vector;
 #include <haproxy/namespace.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/protocol.h>
+#include <haproxy/quic_sock.h>
 #include <haproxy/resolvers.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/sock.h>
@@ -5090,6 +5091,9 @@ const void *resolve_sym_name(struct buffer *buf, const char *pfx, const void *ad
 #ifdef SSL_MODE_ASYNC
                { .func = ssl_async_fd_free, .name = "ssl_async_fd_free" },
                { .func = ssl_async_fd_handler, .name = "ssl_async_fd_handler" },
+#endif
+#ifdef USE_QUIC
+               { .func = quic_conn_sock_fd_iocb, .name = "quic_conn_sock_fd_iocb" },
 #endif
        };