From 2c8819d2b1364e8144e7bac5c8ae5ce428f5801f Mon Sep 17 00:00:00 2001 From: Keith Wiles Date: Thu, 18 Jul 2024 08:57:13 -0500 Subject: [PATCH] add back Lua socket support Signed-off-by: Keith Wiles --- VERSION | 2 +- app/pktgen-constants.h | 1 - app/pktgen-main.c | 16 ++++++++++++++++ changelog.txt | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 7af777b0..d9e26297 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.07.0 +24.07.1 diff --git a/app/pktgen-constants.h b/app/pktgen-constants.h index bd842c87..bc803df9 100644 --- a/app/pktgen-constants.h +++ b/app/pktgen-constants.h @@ -37,7 +37,6 @@ enum { * For Jumbo frame buffers lets use MTU 9216 + FCS(4) + L2(14) = 9234, for buffer size we use 10KB */ #define _MBUF_LEN (PG_JUMBO_FRAME_LEN + RTE_PKTMBUF_HEADROOM + sizeof(struct rte_mbuf)) -// #define DEFAULT_MBUF_SIZE RTE_MBUF_DEFAULT_BUF_SIZE #ifdef __cplusplus } diff --git a/app/pktgen-main.c b/app/pktgen-main.c index 2409212e..3f113fbd 100644 --- a/app/pktgen-main.c +++ b/app/pktgen-main.c @@ -485,6 +485,22 @@ main(int argc, char **argv) pktgen_timer_setup(); +#ifdef LUA_ENABLED + if (pktgen.flags & IS_SERVER_FLAG) { + pktgen.ld_sock = lua_create_instance(); + if (pktgen.ld_sock == NULL) { + pktgen_log_error("Failed to open Lua socket server support library"); + return -1; + } + + if (lua_start_socket(pktgen.ld_sock, &pktgen.thread, pktgen.hostname, pktgen.socket_port) < + 0) { + pktgen_log_error("Failed to start Lua socket server thread"); + return -1; + } + } +#endif + /* Unblock SIGWINCH so main thread * can handle screen resizes */ sigemptyset(&set); diff --git a/changelog.txt b/changelog.txt index 741f8f1d..4ee2f0e9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,6 +6,7 @@ Pktgen-DPDK - Traffic Generator powered by DPDK ** (Pktgen) Sounds like 'Packet-Gen'** **=== Modifications ===** + - 24.07.1 - add back support for Lua socket support. - 24.07.0 - fix TX errors of packets greater then 100 bytes as MTU size was wrong. Add support for UDP/TCP packets in pktperf application. Update version date.