mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: quic: Remove useless code

Browse Source 
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()).
This commit is contained in:
Frédéric Lécaille 2021-10-20 17:24:42 +02:00 committed by Amaury Denoyelle
parent c1029f6182
commit c5c69a0ad2
2 changed files with 1 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/xprt_quic.h
View File

@ -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, ssize_t quic_lstnr_dgram_read(char *buf, size_t len, void *owner,
struct sockaddr_storage *saddr); 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 /* USE_QUIC */
#endif /* _HAPROXY_XPRT_QUIC_H */ #endif /* _HAPROXY_XPRT_QUIC_H */

60
src/xprt_quic.c
View File

@ -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, static ssize_t qc_srv_pkt_rcv(unsigned char **buf, const unsigned char *end,
struct quic_rx_packet *pkt, struct quic_rx_packet *pkt,
struct quic_dgram_ctx *dgram_ctx, 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); 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 <listener> boolean value, with <fd> as socket file
* descriptor and <ctx> 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 <fd> 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 <fd> 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: * Local variables:
* c-indent-level: 8 * c-indent-level: 8