1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: quic_sock: un-statify quic_conn_sock_fd_iocb()

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2023-03-10 12:04:02 +01:00
parent 4377dbd756
commit 8f6da64641
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/quic_sock.h
View File

@ -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)

2
src/quic_sock.c
View File

@ -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;

4
src/tools.c
View File

@ -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
};