From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202602 header.b=lQpfvYAY; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 3527A5A0627 for ; Fri, 27 Mar 2026 05:34:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1774586072; bh=wo+nLVpbxxL1qYTu+iYEHm7LmajJElergHJuBg3J7Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lQpfvYAYHQhW1lqCbARIgmWBzvXAU+xwmuV4cCbsh7jOF71XlFoeIr+zPcr5b3gzG YxHm6VtMNYGqSJwXi7Etu07Hq0WbnxEe8a/CHO58Dmuixu/VRiZpva/RVh9cikOnX8 N1Bs8fAhGYjQovTwtmrYdJlXa/rKQsXbb5bzU0Mkc0CfUuakB3S6t9axkzZSGtrFsl tWHerNNUxdz6oHcInKkeTWvzDDha9zjNSM/mWP51NVJev/EKWtlbtvwBbR0pFjC3NB JcKKZfA1O0slT4349GzLIDDkxtNdoj8zfYVUPgeIbZl0JG92Lt701i2tfNn6E0QCbi RTouNijIm7gfw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4fhnqD53pxz4wSq; Fri, 27 Mar 2026 15:34:32 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 05/18] serialise: Add helpers for serialising unsigned integers Date: Fri, 27 Mar 2026 15:34:17 +1100 Message-ID: <20260327043430.1785787-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260327043430.1785787-1-david@gibson.dropbear.id.au> References: <20260327043430.1785787-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: E4SPWMG56MJAVDDJN33UCEU7PN3QJONQ X-Message-ID-Hash: E4SPWMG56MJAVDDJN33UCEU7PN3QJONQ X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add helpers to serialise/deserialise unsigned integers, handling endian conversion so that the stream format is consistent regardless of host endiannness. Currently we only use this on one place: sending the number of flows during migration. We're going to have more use for this as we add dynamic configuration updates, so these will become more useful. For now we only need a 32-bit version, however define the functions with a macro so we can easily add other integer widths when we need them. Signed-off-by: David Gibson --- flow.c | 10 ++++------ serialise.c | 35 +++++++++++++++++++++++++++++++++++ serialise.h | 7 +++++++ 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/flow.c b/flow.c index 25a6f1a3..c84857b2 100644 --- a/flow.c +++ b/flow.c @@ -1135,10 +1135,9 @@ int flow_migrate_source(struct ctx *c, const struct migrate_stage *stage, count++; } - count = htonl(count); - if (write_all_buf(fd, &count, sizeof(count))) { + if (write_u32(fd, count)) { rc = errno; - err_perror("Can't send flow count (%u)", ntohl(count)); + err_perror("Can't send flow count (%u)", count); return flow_migrate_source_rollback(c, FLOW_MAX, rc); } @@ -1151,7 +1150,7 @@ int flow_migrate_source(struct ctx *c, const struct migrate_stage *stage, debug("Stop listen()s"); fwd_listen_close(&c->fwd_in); - debug("Sending %u flows", ntohl(count)); + debug("Sending %u flows", count); if (!count) return 0; @@ -1221,10 +1220,9 @@ int flow_migrate_target(struct ctx *c, const struct migrate_stage *stage, (void)stage; - if (read_all_buf(fd, &count, sizeof(count))) + if (read_u32(fd, &count)) return errno; - count = ntohl(count); debug("Receiving %u flows", count); if (!count) diff --git a/serialise.c b/serialise.c index f162eeb6..944e7414 100644 --- a/serialise.c +++ b/serialise.c @@ -13,7 +13,9 @@ */ #include +#include #include +#include #include #include "serialise.h" @@ -86,3 +88,36 @@ int write_all_buf(int fd, const void *buf, size_t len) } return 0; } + +/** + * read_uXXX() - Receive a uXXX value from an fd + * @fd: File descriptor to read from + * @valp: Pointer to variable to update with read value + * + * Return: 0 on success, -1 on error + */ +/** + * write_uXXX() - Send a uXXX value to an fd + * @fd: File descriptor to write to + * @val: Value to send + * + * Return: 0 on success, -1 on error + */ +#define SERIALISE_UINT(bits) \ + int read_u##bits(int fd, uint##bits##_t *val) \ + { \ + uint##bits##_t beval; \ + if (read_all_buf(fd, &beval, sizeof(beval)) < 0) \ + return -1; \ + *val = be##bits##toh(beval); \ + return 0; \ + } \ + int write_u##bits(int fd, uint##bits##_t val) \ + { \ + uint##bits##_t beval = htobe##bits(val); \ + return write_all_buf(fd, &beval, sizeof(beval)); \ + } + +SERIALISE_UINT(32) + +#undef SERIALISE_UINT diff --git a/serialise.h b/serialise.h index 251c772a..a88f3dee 100644 --- a/serialise.h +++ b/serialise.h @@ -7,8 +7,15 @@ #define SERIALISE_H #include +#include int read_all_buf(int fd, void *buf, size_t len); int write_all_buf(int fd, const void *buf, size_t len); +#define SERIALISE_UINT_DECL(bits) \ + int read_u##bits(int fd, uint##bits##_t *val); \ + int write_u##bits(int fd, uint##bits##_t val); + +SERIALISE_UINT_DECL(32) + #endif /* SERIALISE_H */ -- 2.53.0