mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Socket: pausing and restoring RX is a little bit more checked

Browse Source
This commit is contained in:
Maria Matejka 2024-09-24 12:51:01 +02:00
parent d8df9c5d62
commit d27c2b6ec5
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/socket.h
View File

@ -58,6 +58,7 @@ typedef struct birdsock {
uint fast_rx; /* RX has higher priority in event loop */ uint fast_rx; /* RX has higher priority in event loop */
uint rbsize; uint rbsize;
int (*rx_hook)(struct birdsock *, uint size); /* NULL=receiving turned off, returns 1 to clear rx buffer */ int (*rx_hook)(struct birdsock *, uint size); /* NULL=receiving turned off, returns 1 to clear rx buffer */
int (*rx_paused)(struct birdsock *, uint size); /* stored rx_hook when paused */
byte *tbuf, *tpos; /* NULL=allocate automatically */ byte *tbuf, *tpos; /* NULL=allocate automatically */
byte *ttx; /* Internal */ byte *ttx; /* Internal */
@ -65,6 +66,7 @@ typedef struct birdsock {
void (*tx_hook)(struct birdsock *); void (*tx_hook)(struct birdsock *);
void (*err_hook)(struct birdsock *, int); /* errno or zero if EOF */ void (*err_hook)(struct birdsock *, int); /* errno or zero if EOF */
void (*err_paused)(struct birdsock *, int); /* called first when paused */
/* Information about received datagrams (UDP, RAW), valid in rx_hook */ /* Information about received datagrams (UDP, RAW), valid in rx_hook */
ip_addr faddr, laddr; /* src (From) and dst (Local) address of the datagram */ ip_addr faddr, laddr; /* src (From) and dst (Local) address of the datagram */
@ -98,7 +100,7 @@ int sk_send(sock *, uint len); /* Send data, <0=err, >0=ok, 0=sleep */
int sk_send_to(sock *, uint len, ip_addr to, uint port); /* sk_send to given destination */ int sk_send_to(sock *, uint len, ip_addr to, uint port); /* sk_send to given destination */
void sk_reallocate(sock *); /* Free and allocate tbuf & rbuf */ void sk_reallocate(sock *); /* Free and allocate tbuf & rbuf */
void sk_pause_rx(struct birdloop *loop, sock *s); void sk_pause_rx(struct birdloop *loop, sock *s);
void sk_resume_rx(struct birdloop *loop, sock *s, int (*hook)(sock *, uint)); void sk_resume_rx(struct birdloop *loop, sock *s);
void sk_set_rbsize(sock *s, uint val); /* Resize RX buffer */ void sk_set_rbsize(sock *s, uint val); /* Resize RX buffer */
void sk_set_tbsize(sock *s, uint val); /* Resize TX buffer, keeping content */ void sk_set_tbsize(sock *s, uint val); /* Resize TX buffer, keeping content */
void sk_set_tbuf(sock *s, void *tbuf); /* Switch TX buffer, NULL-> return to internal */ void sk_set_tbuf(sock *s, void *tbuf); /* Switch TX buffer, NULL-> return to internal */

2
proto/bgp/packets.c
View File

@ -3474,7 +3474,7 @@ bgp_do_uncork(callback *cb)
{ {
struct birdsock *sk = p->conn->sk; struct birdsock *sk = p->conn->sk;
ASSERT_DIE(sk->rpos > sk->rbuf); ASSERT_DIE(sk->rpos > sk->rbuf);
sk_resume_rx(p->p.loop, sk, bgp_rx); sk_resume_rx(p->p.loop, sk);
bgp_rx(sk, sk->rpos - sk->rbuf); bgp_rx(sk, sk->rpos - sk->rbuf);
BGP_TRACE(D_PACKETS, "Uncorked"); BGP_TRACE(D_PACKETS, "Uncorked");
} }

11
sysdep/unix/io-loop.c
View File

@ -460,16 +460,21 @@ void
sk_pause_rx(struct birdloop *loop, sock *s) sk_pause_rx(struct birdloop *loop, sock *s)
{ {
ASSERT_DIE(birdloop_inside(loop)); ASSERT_DIE(birdloop_inside(loop));
ASSERT_DIE(!s->rx_paused);
ASSERT_DIE(s->rx_hook);
s->rx_paused = s->rx_hook;
s->rx_hook = NULL; s->rx_hook = NULL;
socket_changed(s); socket_changed(s);
} }
void void
sk_resume_rx(struct birdloop *loop, sock *s, int (*hook)(sock *, uint)) sk_resume_rx(struct birdloop *loop, sock *s)
{ {
ASSERT_DIE(birdloop_inside(loop)); ASSERT_DIE(birdloop_inside(loop));
ASSERT_DIE(hook); ASSERT_DIE(s->rx_paused);
s->rx_hook = hook; ASSERT_DIE(!s->rx_hook);
s->rx_hook = s->rx_paused;
s->rx_paused = NULL;
socket_changed(s); socket_changed(s);
} }

3
sysdep/unix/socket.c
View File

@ -895,6 +895,9 @@ sk_setup(sock *s)
static void static void
sk_err_hook(sock *s, int e) sk_err_hook(sock *s, int e)
{ {
if (s->rx_paused)
CALL(s->err_paused, s, e);
s->err_hook(s, e); s->err_hook(s, e);
} }