zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / imsg-buffer.c

diff --git a/lib/imsg-buffer.c b/lib/imsg-buffer.c
index a486fc17c18d35329eb245ca2d4a051ba3e3fb03..c2f4052b8f5ea66be9be7b5f3cfdcba19cc570a7 100644 (file)
--- a/lib/imsg-buffer.c
+++ b/lib/imsg-buffer.c
@@ -18,17 +18,16 @@
 
 #include <zebra.h>
 
-#include "openbsd-queue.h"
+#include "queue.h"
 #include "imsg.h"
 
-int    ibuf_realloc(struct ibuf *, size_t);
-void   ibuf_enqueue(struct msgbuf *, struct ibuf *);
-void   ibuf_dequeue(struct msgbuf *, struct ibuf *);
+static int ibuf_realloc(struct ibuf *, size_t);
+static void ibuf_enqueue(struct msgbuf *, struct ibuf *);
+static void ibuf_dequeue(struct msgbuf *, struct ibuf *);
 
-struct ibuf *
-ibuf_open(size_t len)
+struct ibuf *ibuf_open(size_t len)
 {
-       struct ibuf     *buf;
+       struct ibuf *buf;
 
        if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
                return (NULL);
@@ -42,10 +41,9 @@ ibuf_open(size_t len)
        return (buf);
 }
 
-struct ibuf *
-ibuf_dynamic(size_t len, size_t max)
+struct ibuf *ibuf_dynamic(size_t len, size_t max)
 {
-       struct ibuf     *buf;
+       struct ibuf *buf;
 
        if (max < len)
                return (NULL);
@@ -59,10 +57,9 @@ ibuf_dynamic(size_t len, size_t max)
        return (buf);
 }
 
-int
-ibuf_realloc(struct ibuf *buf, size_t len)
+static int ibuf_realloc(struct ibuf *buf, size_t len)
 {
-       u_char  *b;
+       uint8_t *b;
 
        /* on static buffers max is eq size and so the following fails */
        if (buf->wpos + len > buf->max) {
@@ -79,8 +76,7 @@ ibuf_realloc(struct ibuf *buf, size_t len)
        return (0);
 }
 
-int
-ibuf_add(struct ibuf *buf, const void *data, size_t len)
+int ibuf_add(struct ibuf *buf, const void *data, size_t len)
 {
        if (buf->wpos + len > buf->size)
                if (ibuf_realloc(buf, len) == -1)
@@ -91,10 +87,9 @@ ibuf_add(struct ibuf *buf, const void *data, size_t len)
        return (0);
 }
 
-void *
-ibuf_reserve(struct ibuf *buf, size_t len)
+void *ibuf_reserve(struct ibuf *buf, size_t len)
 {
-       void    *b;
+       void *b;
 
        if (buf->wpos + len > buf->size)
                if (ibuf_realloc(buf, len) == -1)
@@ -105,8 +100,7 @@ ibuf_reserve(struct ibuf *buf, size_t len)
        return (b);
 }
 
-void *
-ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
+void *ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
 {
        /* only allowed to seek in already written parts */
        if (pos + len > buf->wpos)
@@ -115,34 +109,30 @@ ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
        return (buf->buf + pos);
 }
 
-size_t
-ibuf_size(struct ibuf *buf)
+size_t ibuf_size(struct ibuf *buf)
 {
        return (buf->wpos);
 }
 
-size_t
-ibuf_left(struct ibuf *buf)
+size_t ibuf_left(struct ibuf *buf)
 {
        return (buf->max - buf->wpos);
 }
 
-void
-ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
+void ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
 {
        ibuf_enqueue(msgbuf, buf);
 }
 
-int
-ibuf_write(struct msgbuf *msgbuf)
+int ibuf_write(struct msgbuf *msgbuf)
 {
-       struct iovec     iov[IOV_MAX];
-       struct ibuf     *buf;
-       unsigned int     i = 0;
-       ssize_t n;
+       struct iovec iov[IOV_MAX];
+       struct ibuf *buf;
+       unsigned int i = 0;
+       ssize_t n;
 
        memset(&iov, 0, sizeof(iov));
-       TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
+       TAILQ_FOREACH (buf, &msgbuf->bufs, entry) {
                if (i >= IOV_MAX)
                        break;
                iov[i].iov_base = buf->buf + buf->rpos;
@@ -159,7 +149,7 @@ again:
                return (-1);
        }
 
-       if (n == 0) {                   /* connection closed */
+       if (n == 0) { /* connection closed */
                errno = 0;
                return (0);
        }
@@ -169,8 +159,7 @@ again:
        return (1);
 }
 
-void
-ibuf_free(struct ibuf *buf)
+void ibuf_free(struct ibuf *buf)
 {
        if (buf == NULL)
                return;
@@ -178,24 +167,24 @@ ibuf_free(struct ibuf *buf)
        free(buf);
 }
 
-void
-msgbuf_init(struct msgbuf *msgbuf)
+void msgbuf_init(struct msgbuf *msgbuf)
 {
        msgbuf->queued = 0;
        msgbuf->fd = -1;
        TAILQ_INIT(&msgbuf->bufs);
 }
 
-void
-msgbuf_drain(struct msgbuf *msgbuf, size_t n)
+void msgbuf_drain(struct msgbuf *msgbuf, size_t n)
 {
-       struct ibuf     *buf, *next;
+       struct ibuf *buf, *next;
 
        for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
-           buf = next) {
+            buf = next) {
                next = TAILQ_NEXT(buf, entry);
                if (buf->rpos + n >= buf->wpos) {
                        n -= buf->wpos - buf->rpos;
+
+                       TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
                        ibuf_dequeue(msgbuf, buf);
                } else {
                        buf->rpos += n;
@@ -204,33 +193,31 @@ msgbuf_drain(struct msgbuf *msgbuf, size_t n)
        }
 }
 
-void
-msgbuf_clear(struct msgbuf *msgbuf)
+void msgbuf_clear(struct msgbuf *msgbuf)
 {
-       struct ibuf     *buf;
+       struct ibuf *buf;
 
-       while ((buf = TAILQ_FIRST(&msgbuf->bufs)) != NULL)
+       while ((buf = TAILQ_POP_FIRST(&msgbuf->bufs, entry)) != NULL)
                ibuf_dequeue(msgbuf, buf);
 }
 
-int
-msgbuf_write(struct msgbuf *msgbuf)
+int msgbuf_write(struct msgbuf *msgbuf)
 {
-       struct iovec     iov[IOV_MAX];
-       struct ibuf     *buf;
-       unsigned int     i = 0;
-       ssize_t          n;
-       struct msghdr    msg;
-       struct cmsghdr  *cmsg;
+       struct iovec iov[IOV_MAX];
+       struct ibuf *buf;
+       unsigned int i = 0;
+       ssize_t n;
+       struct msghdr msg;
+       struct cmsghdr *cmsg;
        union {
-               struct cmsghdr  hdr;
-               char            buf[CMSG_SPACE(sizeof(int))];
+               struct cmsghdr hdr;
+               char buf[CMSG_SPACE(sizeof(int))];
        } cmsgbuf;
 
        memset(&iov, 0, sizeof(iov));
        memset(&msg, 0, sizeof(msg));
        memset(&cmsgbuf, 0, sizeof(cmsgbuf));
-       TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
+       TAILQ_FOREACH (buf, &msgbuf->bufs, entry) {
                if (i >= IOV_MAX)
                        break;
                iov[i].iov_base = buf->buf + buf->rpos;
@@ -262,7 +249,7 @@ again:
                return (-1);
        }
 
-       if (n == 0) {                   /* connection closed */
+       if (n == 0) { /* connection closed */
                errno = 0;
                return (0);
        }
@@ -281,18 +268,15 @@ again:
        return (1);
 }
 
-void
-ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
+static void ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
 {
        TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry);
        msgbuf->queued++;
 }
 
-void
-ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
+static void ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
 {
-       TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
-
+       /* TAILQ_REMOVE done by caller */
        if (buf->fd != -1)
                close(buf->fd);