Merge remote-tracking branch 'origin/beams-to-rf-board' into integration_2025_w52 (!3656)

Rfsimulator beam reception/transmission

A simplified beam switching simulation for rfsimulator. This works
mainly in 1 gNB - N UEs scenarios. This is not a real beamformer with
antenna, channel and propagation model. The way it works is that the
peers inform each other about the beams they transmit in, and on
reception before channel modelling, the beam data is combined based on
preconfigured rx_beam/tx_beam gain matrix.

Usage:

- Add --rfsimulator.enable_beams to enable beam simulation

- Add --rfsimulator.beam_gains .

    Example list: 0,-5,-10

    Resulting matrix:

    [[0, -5, -10] [-5, 0, -5]] [-10, -5, 0]]

- Add --telnetsrv if you want to control the beams manually. The command
  in telnet is "rfsimu setbeam <beam_map>", where beam_map is a uint64_t
  controling the reception beam and transmission beam. If the
  application is switching the beams automatically the beams will be
  overwritten as soon as the application chooses to switch beams.

Supports up to 64 concurrent TX and RX beams.

common/config/config_cmdline.c

@@ -213,7 +213,7 @@ int config_check_unknown_cmdlineopt(configmodule_interface_t *cfg, char *prefix)
   return unknowndetected;
 } /* config_check_unknown_cmdlineopt */
 
-int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
+int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, const char *prefix)
 {
   int c = cfg->argc;
   int i,j;

common/config/config_common.c

@@ -118,7 +118,7 @@ void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree)
   return ptr;
 }
 
-int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->iptr), 1);
@@ -132,7 +132,7 @@ int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions,
   return status;
 }
 
-int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->i64ptr), 1);
@@ -150,7 +150,7 @@ int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoption
   return status;
 }
 
-int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -167,7 +167,7 @@ int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgopti
   return status;
 }
 
-int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -190,7 +190,7 @@ int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptio
   return status;
 }
 
-int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -210,7 +210,7 @@ int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgo
   return status;
 }
 
-int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->dblptr), 1);
@@ -224,7 +224,7 @@ int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptio
   return status;
 }
 
-int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *ipv4addr)
+int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *ipv4addr)
 {
   config_check_valptr(cfg, cfgoptions, sizeof(*cfgoptions->uptr), 1);
   int rst=inet_pton(AF_INET, ipv4addr,cfgoptions->uptr );
@@ -246,7 +246,7 @@ int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions
   return 0;
 }
 
-int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix)
+int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix)
 {
   int status = 0;
 
@@ -322,7 +322,7 @@ void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, ch
  * @param[in]  prefix    Optional prefix for the parameter name (can be NULL).
  * @return 1 if the default value was set, 0 if ignored, or -1 on error/unsupported type.
  */
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix)
+int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, const char *prefix)
 {
   if( (cfgoption->paramflags & PARAMFLAG_DONOTREAD) != 0) {
     return 0;

common/config/config_common.h

@@ -41,16 +41,16 @@ extern "C"
 #endif
 void config_check_valptr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int elt_sz, int nb_elt);
 /* functions to set a parameter to its default value */
-int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
-int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *prefix);
+int config_setdefault_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_int64(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_intlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_string(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_stringlist(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_double(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
+int config_setdefault_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *prefix);
 void *config_allocate_new(configmodule_interface_t *cfg, int sz, bool autoFree);
 void config_assign_int(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *fullname, int val);
-int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, char *prefix);
+int config_common_getdefault(configmodule_interface_t *cfg, paramdef_t *cfgoption, const char *prefix);
 
 #ifdef __cplusplus
 }

common/config/config_load_configmodule.c

@@ -150,7 +150,7 @@ int config_cmdlineonly_getlist(configmodule_interface_t *cfg,
   return 0;
 }
 
-int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, char *prefix)
+int config_cmdlineonly_get(configmodule_interface_t *cfg, paramdef_t *cfgoptions, int numoptions, const char *prefix)
 {
   int defval;
   int fatalerror=0;

common/config/config_load_configmodule.h

@@ -59,10 +59,10 @@
 #define CONFIG_ABORT          (1<<21)           // config failed,abort execution 
 #define CONFIG_NOOOPT         (1<<22)           // no -O option found when parsing command line
 struct configmodule_interface;
-typedef int (*configmodule_getfunc_t)(struct configmodule_interface *, paramdef_t *, int numparams, char *prefix);
+typedef int (*configmodule_getfunc_t)(struct configmodule_interface *, paramdef_t *, int numparams, const char *prefix);
 typedef int (
     *configmodule_getlistfunc_t)(struct configmodule_interface *, paramlist_def_t *, paramdef_t *, int numparams, char *prefix);
-typedef int (*configmodule_setfunc_t)(paramdef_t *cfgoptions, int numoptions, char *prefix);
+typedef int (*configmodule_setfunc_t)(paramdef_t *cfgoptions, int numoptions, const char *prefix);
 typedef void (*configmodule_endfunc_t)(struct configmodule_interface *cfg);
 
 typedef int (*configmodule_initfunc_t)(struct configmodule_interface *cfg);

common/config/config_paramdesc.h

@@ -105,7 +105,7 @@ typedef union checkedparam {
 #define DEFAULT_EXTRA_SZ 256
 typedef struct paramdef {
   char         optname[MAX_OPTNAME_SIZE]; /* parameter name, can be used as long command line option */
-  char         *helpstr;                  /* help string */
+  const char         *helpstr;                  /* help string */
   unsigned int paramflags;                /* value is a "ored" combination of above PARAMFLAG_XXXX values */
   union { /* pointer to the parameter value, completed by the config module */
     char      **strptr;
@@ -122,7 +122,7 @@ typedef struct paramdef {
     void      *voidptr;
   } ;
   union {                                /* default parameter value, to be used when PARAMFLAG_MANDATORY is not specified */
-    char      *defstrval;
+    const char      *defstrval;
     char      **defstrlistval;
     uint32_t  defuintval;
     int       defintval;
@@ -161,6 +161,50 @@ typedef struct paramdef {
 #define TYPE_LIST       55
 
 #define ANY_IPV4ADDR_STRING "0.0.0.0"
+
+// Macros to simplify defining parameters in paramdef_t arrays in C++ source code
+#define OPTNAME(x) .optname = x
+#define HELPSTR(x) .helpstr = x
+#define PARAMFLAG(x) .paramflags = x
+#define PARAMTYPE(x) .type = x
+#define STRINGPARAM(name, help, flags, ptr, defval)                                                                         \
+  {                                                                                                                         \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .strptr = ptr, .defstrval = defval, PARAMTYPE(TYPE_STRING), .numelt = 0 \
+  }
+#define DOUBLEPARAM(name, help, flags, ptr, defval)                                                                         \
+  {                                                                                                                         \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .dblptr = ptr, .defdblval = defval, PARAMTYPE(TYPE_DOUBLE), .numelt = 0 \
+  }
+#define INTPARAM(name, help, flags, ptr, defval)                                                                       \
+  {                                                                                                                    \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .iptr = ptr, .defintval = defval, PARAMTYPE(TYPE_INT), .numelt = 0 \
+  }
+#define UINT16PARAM(name, help, flags, ptr, defval)                                                                          \
+  {                                                                                                                          \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .u16ptr = ptr, .defuintval = defval, PARAMTYPE(TYPE_UINT16), .numelt = 0 \
+  }
+#define STRLISTPARAM(name, help, flags, ptr, defval)                                                                        \
+  {                                                                                                                         \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .strlistptr = ptr, .defstrlistval = defval, PARAMTYPE(TYPE_STRINGLIST), \
+        .numelt = 0                                                                                                         \
+  }
+#define INT64PARAM(name, help, flags, ptr, defval)                                                                           \
+  {                                                                                                                          \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .i64ptr = ptr, .defint64val = defval, PARAMTYPE(TYPE_INT64), .numelt = 0 \
+  }
+#define INTPARAM(name, help, flags, ptr, defval)                                                                       \
+  {                                                                                                                    \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .iptr = ptr, .defintval = defval, PARAMTYPE(TYPE_INT), .numelt = 0 \
+  }
+#define BOOLPARAM(name, help, flags, ptr, defval)                                                                      \
+  {                                                                                                                    \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .iptr = ptr, .defintval = defval, PARAMTYPE(TYPE_INT), .numelt = 0 \
+  }
+#define UINT64PARAM(name, help, flags, ptr, defval)                                                                          \
+  {                                                                                                                          \
+    OPTNAME(name), HELPSTR(help), PARAMFLAG(flags), .u64ptr = ptr, .defuintval = defval, PARAMTYPE(TYPE_UINT64), .numelt = 0 \
+  }
+
 typedef struct paramlist_def {
   char listname[MAX_OPTNAME_SIZE];
   paramdef_t **paramarray;

common/config/config_userapi.c

@@ -71,7 +71,7 @@ int config_get_processedint(configmodule_interface_t *cfg, paramdef_t *cfgoption
 
   return ret;
 }
-void config_printhelp(paramdef_t *params,int numparams, char *prefix) {
+void config_printhelp(paramdef_t *params,int numparams, const char *prefix) {
   printf("\n-----Help for section %-26s: %03i entries------\n",(prefix==NULL)?"(root section)":prefix,numparams);
 
   for (int i=0 ; i<numparams ; i++) {
@@ -84,7 +84,7 @@ void config_printhelp(paramdef_t *params,int numparams, char *prefix) {
   printf("--------------------------------------------------------------------\n\n");
 }
 
-int config_execcheck(configmodule_interface_t *cfg, paramdef_t *params, int numparams, char *prefix)
+int config_execcheck(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix)
 {
   int st=0;
 
@@ -105,7 +105,7 @@ int config_execcheck(configmodule_interface_t *cfg, paramdef_t *params, int nump
   return st;
 }
 
-int config_paramidx_fromname(paramdef_t *params, int numparams, char *name) {
+int config_paramidx_fromname(paramdef_t *params, int numparams, const char *name) {
   for (int i=0; i<numparams ; i++) {
     if (strcmp(name,params[i].optname) == 0)
       return i;
@@ -115,7 +115,7 @@ int config_paramidx_fromname(paramdef_t *params, int numparams, char *name) {
   return -1;
 }
 
-int config_get(configmodule_interface_t *cfgif, paramdef_t *params, int numparams, char *prefix)
+int config_get(configmodule_interface_t *cfgif, paramdef_t *params, int numparams, const char *prefix)
 {
   int ret= -1;
 

common/config/config_userapi.h

@@ -49,17 +49,17 @@ extern configmodule_interface_t *uniqCfg;
 #define CONFIG_SETRTFLAG(P)   if (config_get_if()) { config_get_if()->rtflags |= P; }
 #define CONFIG_CLEARRTFLAG(P) if (config_get_if()) { config_get_if()->rtflags &= (~P); }
 #define CONFIG_ISPARAMFLAGSET(P,F) ( !!(P.paramflags & F))
-int config_paramidx_fromname(paramdef_t *params, int numparams, char *name);
+int config_paramidx_fromname(paramdef_t *params, int numparams, const char *name);
 
 /* utility functions, to be used by configuration module and/or configuration libraries */
-void config_printhelp(paramdef_t *, int numparams, char *prefix);
-int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *params, int numparams, char *prefix);
-int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, char *ipv4addr);
+void config_printhelp(paramdef_t *, int numparams, const char *prefix);
+int config_process_cmdline(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix);
+int config_assign_ipv4addr(configmodule_interface_t *cfg, paramdef_t *cfgoptions, const char *ipv4addr);
 
 /* apis to get/check parameters, to be used by oai modules, at configuration time */
 #define CONFIG_CHECKALLSECTIONS "ALLSECTIONS"
 int config_check_unknown_cmdlineopt(configmodule_interface_t *cfg, char *prefix);
-int config_get(configmodule_interface_t *cfg, paramdef_t *params, int numparams, char *prefix);
+int config_get(configmodule_interface_t *cfg, paramdef_t *params, int numparams, const char *prefix);
 int config_getlist(configmodule_interface_t *cfg, paramlist_def_t *ParamList, paramdef_t *params, int numparams, char *prefix);
 
 /* apis to set some of the paramdef_t fields before using the get/getlist api's */

common/config/yaml/tests/test_yaml_config.cpp

@@ -411,7 +411,7 @@ TEST(yaml_config, test_read_ipv4) {
   config_yaml_get(cfg, &p, 1, prefix);
   printf("%x\n", addr);
 
-  p.defstrval = strdup("10.0.0.1");
+  p.defstrval = "10.0.0.1";
   strncpy(p.optname, "ipv4_3", sizeof(p.optname) - 1);
   config_yaml_get(cfg, &p, 1, prefix);
   printf("%x\n", addr);
@@ -419,7 +419,6 @@ TEST(yaml_config, test_read_ipv4) {
   config_yaml_end(cfg);
   free(cfg->cfgP[0]);
   end_configmodule(cfg);
-  free(p.defstrval);
 }
 
 TEST(yaml_config, yaml_read_str_as_int) {

common/utils/load_module_shlib.c

@@ -252,7 +252,7 @@ load_module_shlib_exit:
   return ret;
 }
 
-void * get_shlibmodule_fptr(char *modname, char *fname)
+void * get_shlibmodule_fptr(const char *modname, const char *fname)
 {
     for (int i=0; i<loader_data.numshlibs && loader_data.shlibs[i].name != NULL; i++) {
         if ( strcmp(loader_data.shlibs[i].name, modname) == 0) {

common/utils/load_module_shlib.h

@@ -82,7 +82,7 @@ extern loader_data_t loader_data;
 // clang-format on
 
 int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *farray, int numf, void *initfunc_arg);
-void *get_shlibmodule_fptr(char *modname, char *fname);
+void *get_shlibmodule_fptr(const char *modname, const char *fname);
 #define load_module_shlib(M, F, N, I) load_module_version_shlib(M, NULL, F, N, I)
 void loader_reset();
 #endif

common/utils/telnetsrv/telnetsrv.h

@@ -76,7 +76,7 @@ typedef struct webdatadef {
 typedef void(*telnet_printfunc_t)(const char* format, ...);
 typedef int(*cmdfunc_t)(char*, int, telnet_printfunc_t prnt);
 typedef int (*webfunc_t)(char *cmdbuff, int debug, telnet_printfunc_t prnt, ...);
-typedef int (*webfunc_getdata_t)(char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt);
+typedef int (*webfunc_getdata_t)(const char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt);
 typedef int(*qcmdfunc_t)(char*, int, telnet_printfunc_t prnt,void *arg);
 
 #define TELNETSRV_CMDFLAG_PUSHINTPOOLQ (1 << 0) // ask the telnet server to push the command in a thread pool queue
@@ -195,7 +195,7 @@ VT escape sequence definition, for smarter display....
 #define TELNET_ADDCMD_FNAME "add_telnetcmd"
 #define TELNET_POLLCMDQ_FNAME "poll_telnetcmdq"
 #define TELNET_PUSHCMD_FNAME "telnet_pushcmd"
-typedef int(*add_telnetcmd_func_t)(char *, telnetshell_vardef_t *, telnetshell_cmddef_t *);
+typedef int(*add_telnetcmd_func_t)(const char *, telnetshell_vardef_t *, telnetshell_cmddef_t *);
 typedef void(*poll_telnetcmdq_func_t)(void *qid,void *arg);
 typedef void (*push_telnetcmd_func_t)(telnetshell_cmddef_t *cmd, char *cmdbuff, telnet_printfunc_t prnt);
 #ifdef TELNETSERVERCODE