From: Maria Matejka <mq@ucw.cz>
Date: Sat, 21 Jan 2023 22:49:52 +0000 (+0100)
Subject: Merge commit '1e47b9f203aaaad0fb658d40a1670f1d0437f1f8' into thread-next
X-Git-Tag: v3.0-alpha1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21c4c8eafb7125375b2e562cc0e7e9d52bbb1aaf;p=thirdparty%2Fbird.git

Merge commit '1e47b9f203aaaad0fb658d40a1670f1d0437f1f8' into thread-next
---

21c4c8eafb7125375b2e562cc0e7e9d52bbb1aaf
diff --cc nest/cli.h
index 2b96da5b7,3596e37ca..2d876571d
--- a/nest/cli.h
+++ b/nest/cli.h
@@@ -28,8 -28,8 +28,8 @@@ struct cli_out 
  typedef struct cli {
    node n;				/* Node in list of all log hooks */
    pool *pool;
 -  void *priv;				/* Private to sysdep layer */
 +  struct birdsock *sock;		/* Underlying socket */
-   byte *rx_buf, *rx_pos, *rx_aux;	/* sysdep */
+   byte *rx_buf, *rx_pos;		/* sysdep */
    struct cli_out *tx_buf, *tx_pos, *tx_write;
    event *event;
    void (*cont)(struct cli *c);
diff --cc sysdep/unix/main.c
index b15376cc2,627d7a4a8..1ed57a997
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@@ -446,9 -440,8 +446,9 @@@ cli_tx(sock *s
  int
  cli_get_command(cli *c)
  {
 -  sock *s = c->priv;
 +  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;