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=APnfcOf5; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id CCEB25A0623 for ; Thu, 19 Mar 2026 07:12:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1773900722; bh=7+ls187wPHdoMJ17ENzeTyAcRPfwqfgyZUSTr89n0nQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=APnfcOf5O0fP6WHDem4XOYW553x29b5Ah2SPTjqMpZjcQvqYKCDBDM4oRdRFl1l0X TKtJ2y4UIansTAxZMUshKaTQT5AStb/rsWbcp3sAi550mgyjokmleo3M0cLA9AuwrZ n/K5UEj2gzISAHWdGH1S8o3o4CbCXDZdF4eOe0UJ7OrcNJ+DmV4vJlqAv9sDMiLqu3 fdxmH2RdKE09hn9i8xQKNwkdp+HXB5I8sih0bP3cj1TRXkawg7YSYQzErRnjv/68PJ 6VAcdbjagMgxASB98CMXBewNwmav4DxyisdD3xg0cP0fO4wFekpLf1sx6CqIEn6a2e Z+USKOlZ4KAVA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4fbwMQ0g0jz4wSv; Thu, 19 Mar 2026 17:12:02 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 09/15] pesto: Expose list of pifs to pesto Date: Thu, 19 Mar 2026 17:11:51 +1100 Message-ID: <20260319061157.1983818-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319061157.1983818-1-david@gibson.dropbear.id.au> References: <20260319061157.1983818-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: S4WOGT5W4LYHCYFIELQAVC5WKVO3IIXW X-Message-ID-Hash: S4WOGT5W4LYHCYFIELQAVC5WKVO3IIXW 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: Extend the dynamic update protocol to expose the pif indices and names from a running passt/pasta to the pesto tool. pesto records that data and (for now) prints it out. Signed-off-by: David Gibson --- conf.c | 38 +++++++++++++++++++++ pesto.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++- serialise.c | 21 ++++++++++++ serialise.h | 3 ++ 4 files changed, 159 insertions(+), 1 deletion(-) diff --git a/conf.c b/conf.c index e862b023..603ca2ac 100644 --- a/conf.c +++ b/conf.c @@ -2304,6 +2304,41 @@ void conf(struct ctx *c, int argc, char **argv) conf_print(c); } +/** + * conf_send_pifs() - Send list of pifs to dynamic update client (pesto) + * @c: Execution context + * @fd: Socket to the client + * + * Return: 0 on success, -1 on failure + */ +static int conf_send_pifs(const struct ctx *c, int fd) +{ + uint32_t num = 0; + unsigned pif; + + /* First count the number of pifs with tables */ + for (pif = 0; pif < PIF_NUM_TYPES; pif++) { + if (c->fwd[pif]) + num++; + } + + if (sewrite_u32(fd, num)) + return -1; + + for (pif = 0; pif < PIF_NUM_TYPES; pif++) { + if (!c->fwd[pif]) + continue; + + if (sewrite_u8(fd, pif)) + return -1; + + if (sewrite_str(fd, pif_name(pif)) < 0) + return -1; + } + + return 0; +} + /** * conf_listen_handler() - Handle events on configuration listening socket * @c: Execution context @@ -2360,6 +2395,9 @@ void conf_listen_handler(struct ctx *c, uint32_t events) "Warning: Using experimental unsupported configuration protocol"); } + if (conf_send_pifs(c, fd) < 0) + goto fail; + return; fail: diff --git a/pesto.c b/pesto.c index a8c134f5..dbc27a58 100644 --- a/pesto.c +++ b/pesto.c @@ -36,6 +36,8 @@ #include "serialise.h" #include "pesto.h" +static int verbosity = 1; + #define die(...) \ do { \ FPRINTF(stderr, __VA_ARGS__); \ @@ -51,6 +53,19 @@ } \ } while (0) +/** + * xmalloc() - Allocate memory, with fatal error on failure + * @size: Number of bytes to allocate + */ +static void *xmalloc(size_t size) +{ + void *p = malloc(size); + + if (!p) + die("Memory allocation failure"); + return p; +} + /** * usage() - Print usage, exit with given status code * @name: Executable name @@ -69,6 +84,83 @@ static void usage(const char *name, FILE *f, int status) exit(status); } +/** + * pesto_recv_str() - Receive a string from passt/pasta + * @fd: Control socket + * + * Return: pointer to malloc()ed string + */ +static const char *pesto_recv_str(int fd) +{ + uint32_t len; + char *buf; + + if (seread_u32(fd, &len) < 0) + die("Error reading from control socket"); + + buf = xmalloc(len); + if (seread_buf(fd, buf, len) < 0) + die("Error reading from control socket"); + + return buf; +} + +struct pif_state { + uint8_t pif; + const char *name; +}; + +struct conf_state { + uint32_t npifs; + struct pif_state pif[]; +}; + +/** + * pesto_read_pifs() - Read pif names and IDs from passt/pasta + * @fd: Control socket + */ +static const struct conf_state *pesto_read_pifs(int fd) +{ + uint32_t num; + struct conf_state *state; + unsigned i; + + if (seread_u32(fd, &num) < 0) + die("Error reading from control socket"); + + debug("Receiving %"PRIu32" interface names", num); + + state = xmalloc(sizeof(*state) + num * sizeof(struct pif_state)); + state->npifs = num; + + for (i = 0; i < num; i++) { + struct pif_state *ps = &state->pif[i]; + + if (seread_u8(fd, &ps->pif) < 0) + die("Error reading from control socket"); + ps->name = pesto_recv_str(fd); + + debug("%u: %s", ps->pif, ps->name); + } + + return state; +} + +/** + * show_state() - Show current rule state obtained from passt/pasta + * @pifs: PIF name information + */ +static void show_state(const struct conf_state *state) +{ + unsigned i; + + for (i = 0; i < state->npifs; i++) { + const struct pif_state *ps = &state->pif[i]; + printf("Forwarding rules for %s interface\n", ps->name); + printf("\tTBD\n"); + } +} + /** * main() - Entry point and whole program with loop * @argc: Argument count @@ -91,12 +183,12 @@ int main(int argc, char **argv) { 0 }, }; struct sockaddr_un a = { AF_UNIX, "" }; + const struct conf_state *state; const char *optstring = "vh"; struct pesto_hello hello; struct sock_fprog prog; int optname, ret, s; uint32_t s_version; - int verbosity = 1; prog.len = (unsigned short)sizeof(filter_pesto) / sizeof(filter_pesto[0]); @@ -172,5 +264,9 @@ int main(int argc, char **argv) "Warning: Using experimental protocol version, client and server must match\n"); } + state = pesto_read_pifs(s); + + show_state(state); + exit(0); } diff --git a/serialise.c b/serialise.c index 4fc0d116..4645c58e 100644 --- a/serialise.c +++ b/serialise.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "serialise.h" @@ -121,6 +122,26 @@ int sewrite_buf(int fd, const void *buf, size_t len) return sewrite_var(fd, &beval); \ } +#define be8toh(x) (x) +#define htobe8(x) (x) + +SERIALISE_UINT(8) SERIALISE_UINT(32) #undef SERIALISE_UNIT + +/** + * sewrite_str() - Write a string to an fd in length/value format + * @fd: Socket to the client + * @s: String to send + * + * Return: 0 on success, -1 on error + */ +int sewrite_str(int fd, const char *s) +{ + uint32_t len = strlen(s) + 1; /* Include \0 */ + + if (sewrite_u32(fd, len) < 0) + return -1; + return sewrite_buf(fd, s, len); +} diff --git a/serialise.h b/serialise.h index f2e0aa8d..1f0747c7 100644 --- a/serialise.h +++ b/serialise.h @@ -19,6 +19,9 @@ int sewrite_buf(int fd, const void *buf, size_t len); int seread_u##bits(int fd, uint##bits##_t *val); \ int sewrite_u##bits(int fd, uint##bits##_t val); +SERIALISE_UINT_DECL(8) SERIALISE_UINT_DECL(32) +int sewrite_str(int fd, const char *s); + #endif /* _SERIALISE_H */ -- 2.53.0