mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Merge commit '1e47b9f203aaaad0fb658d40a1670f1d0437f1f8' into thread-next

Browse Source
This commit is contained in:
Maria Matejka
2023-01-21 23:49:52 +01:00
parent 2f764c87ff 1e47b9f203
commit 21c4c8eafb
8 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sysdep/unix/main.c
View File

@@ -448,7 +448,7 @@ cli_get_command(cli *c)
{
sock *s = c->sock;
ASSERT_DIE(c->sock);
byte *t = c->rx_aux ? : s->rbuf;
byte *t = s->rbuf;
byte *tend = s->rpos;
byte *d = c->rx_pos;
byte *dend = c->rx_buf + CLI_RX_BUF_SIZE - 2;
@@ -459,16 +459,22 @@ cli_get_command(cli *c)
t++;
else if (*t == '\n')
{
t++;
c->rx_pos = c->rx_buf;
c->rx_aux = t;
*d = 0;
t++;
/* Move remaining data and reset pointers */
uint rest = (t < tend) ? (tend - t) : 0;
memmove(s->rbuf, t, rest);
s->rpos = s->rbuf + rest;
c->rx_pos = c->rx_buf;
return (d < dend) ? 1 : -1;
}
else if (d < dend)
*d++ = *t++;
}
c->rx_aux = s->rpos = s->rbuf;
s->rpos = s->rbuf;
c->rx_pos = d;
return 0;
}
@@ -516,7 +522,6 @@ cli_connect(sock *s, uint size UNUSED)
s->pool = c->pool; /* We need to have all the socket buffers allocated in the cli pool */
s->fast_rx = 1;
c->rx_pos = c->rx_buf;
c->rx_aux = NULL;
rmove(s, c->pool);
return 1;
}