Merge commit '1e47b9f203aaaad0fb658d40a1670f1d0437f1f8' into thread-next

diff --cc nest/cli.h
index 2b96da5b74d674bed4e078b6633ac38a806d1162,3596e37ca777d504c9784bbd1683d84f59ef23b8..2d876571dd448678d9b906e3de289511a67d7413
--- 1/nest/cli.h
--- 2/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 proto/bgp/packets.c
Simple merge

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/unix/main.c
index b15376cc2094b3723f39eda2c32519b6ed47ecf8,627d7a4a80158fb9c90f7a801c1abe035a34ce3c..1ed57a997846fd397aee88bd53c80bb743061eb7
--- 1/sysdep/unix/main.c
--- 2/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;