From c5c69a0ad226aa480dbef5e97dce061338cc0163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= Date: Wed, 20 Oct 2021 17:24:42 +0200 Subject: [PATCH] CLEANUP: quic: Remove useless code Remove old I/O handler implementation (listener and server). At this time keep a defined but not used function for servers (qc_srv_pkt_rcv()). --- include/haproxy/xprt_quic.h | 2 -- src/xprt_quic.c | 60 +------------------------------------ 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h index 2050b79b4..57f639ea4 100644 --- a/include/haproxy/xprt_quic.h +++ b/include/haproxy/xprt_quic.h @@ -1054,7 +1054,5 @@ static inline void quic_tx_packet_refdec(struct quic_tx_packet *pkt) ssize_t quic_lstnr_dgram_read(char *buf, size_t len, void *owner, struct sockaddr_storage *saddr); -ssize_t quic_srv_dgram_read(char *buf, size_t len, void *owner, - struct sockaddr_storage *saddr); #endif /* USE_QUIC */ #endif /* _HAPROXY_XPRT_QUIC_H */ diff --git a/src/xprt_quic.c b/src/xprt_quic.c index 9de8a038a..244dfcd7a 100644 --- a/src/xprt_quic.c +++ b/src/xprt_quic.c @@ -3260,6 +3260,7 @@ static inline void qc_parse_hd_form(struct quic_rx_packet *pkt, } } +__attribute__((unused)) static ssize_t qc_srv_pkt_rcv(unsigned char **buf, const unsigned char *end, struct quic_rx_packet *pkt, struct quic_dgram_ctx *dgram_ctx, @@ -4725,65 +4726,6 @@ ssize_t quic_lstnr_dgram_read(char *buf, size_t len, void *owner, return quic_dgram_read(buf, len, owner, saddr, qc_lstnr_pkt_rcv); } -ssize_t quic_srv_dgram_read(char *buf, size_t len, void *owner, - struct sockaddr_storage *saddr) -{ - return quic_dgram_read(buf, len, owner, saddr, qc_srv_pkt_rcv); -} - -/* QUIC I/O handler for connection to local listeners or remove servers - * depending on boolean value, with as socket file - * descriptor and as context. - */ -static size_t quic_conn_handler(int fd, void *ctx, qpkt_read_func *func) -{ - ssize_t ret; - size_t done = 0; - struct buffer *buf = get_trash_chunk(); - /* Source address */ - struct sockaddr_storage saddr = {0}; - socklen_t saddrlen = sizeof saddr; - - if (!fd_recv_ready(fd)) - return 0; - - do { - ret = recvfrom(fd, buf->area, buf->size, 0, - (struct sockaddr *)&saddr, &saddrlen); - if (ret < 0) { - if (errno == EINTR) - continue; - if (errno == EAGAIN) - fd_cant_recv(fd); - goto out; - } - } while (0); - - done = buf->data = ret; - quic_dgram_read(buf->area, buf->data, ctx, &saddr, func); - - out: - return done; -} - -/* QUIC I/O handler for connections to local listeners with as socket - * file descriptor. - */ -void quic_fd_handler(int fd) -{ - if (fdtab[fd].state & FD_POLL_IN) - quic_conn_handler(fd, fdtab[fd].owner, &qc_lstnr_pkt_rcv); -} - -/* QUIC I/O handler for connections to remote servers with as socket - * file descriptor. - */ -void quic_conn_fd_handler(int fd) -{ - if (fdtab[fd].state & FD_POLL_IN) - quic_conn_handler(fd, fdtab[fd].owner, &qc_srv_pkt_rcv); -} - /* * Local variables: * c-indent-level: 8