From 2a94a42397d6b695dd14bf1b1d31be95899de3ba Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Mon, 5 Jan 2026 08:42:12 +0100 Subject: [PATCH 1/2] rfsim: fix linking issue Fix an issue caused by assuming C++ linkage of get_currentchannels_type --- radio/rfsimulator/simulator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/rfsimulator/simulator.cpp b/radio/rfsimulator/simulator.cpp index a29001e0bf..65e32216c4 100644 --- a/radio/rfsimulator/simulator.cpp +++ b/radio/rfsimulator/simulator.cpp @@ -54,6 +54,10 @@ extern "C" { #include #include #include "rfsimulator.h" +extern int get_currentchannels_type(const char *buf, + int debug, + webdatadef_t *tdata, + telnet_printfunc_t prnt); // in random_channel.c } #include #include @@ -112,10 +116,6 @@ typedef enum { SIMU_ROLE_SERVER = 1, SIMU_ROLE_CLIENT } simuRole; }; // clang-format on static void getset_currentchannels_type(char *buf, int debug, webdatadef_t *tdata, telnet_printfunc_t prnt); -extern int get_currentchannels_type(const char *buf, - int debug, - webdatadef_t *tdata, - telnet_printfunc_t prnt); // in random_channel.c static int rfsimu_setchanmod_cmd(char *buff, int debug, telnet_printfunc_t prnt, void *arg); static int rfsimu_setdistance_cmd(char *buff, int debug, telnet_printfunc_t prnt, void *arg); static int rfsimu_getdistance_cmd(char *buff, int debug, telnet_printfunc_t prnt, void *arg); From f8f7bc890bff4fb3a0153b03a548125ae0798412 Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Mon, 5 Jan 2026 08:49:20 +0100 Subject: [PATCH 2/2] rfsim: fix replay_node when used for rfsim without beamforming --- radio/rfsimulator/stored_node.c | 1 + 1 file changed, 1 insertion(+) diff --git a/radio/rfsimulator/stored_node.c b/radio/rfsimulator/stored_node.c index 51db5bfea1..5792304671 100644 --- a/radio/rfsimulator/stored_node.c +++ b/radio/rfsimulator/stored_node.c @@ -177,6 +177,7 @@ int main(int argc, char *argv[]) { timestamp+=blockSize; header.option_value=0; header.option_flag=0; + header.beam_map = 1; } else { AssertFatal(read(fd,&header,sizeof(header)), ""); }