Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-RAN
Commits
8ad4895f
Commit
8ad4895f
authored
Mar 15, 2021
by
frtabu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add common option telnetclt
parent
de87c02e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
16 deletions
+21
-16
executables/softmodem-common.c
executables/softmodem-common.c
+7
-3
executables/softmodem-common.h
executables/softmodem-common.h
+14
-13
No files found.
executables/softmodem-common.c
View file @
8ad4895f
...
@@ -86,7 +86,7 @@ char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr) {
...
@@ -86,7 +86,7 @@ char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr) {
void
get_common_options
(
uint32_t
execmask
)
{
void
get_common_options
(
uint32_t
execmask
)
{
uint32_t
online_log_messages
=
0
;
uint32_t
online_log_messages
=
0
;
uint32_t
glog_level
=
0
;
uint32_t
glog_level
=
0
;
uint32_t
start_telnetsrv
=
0
;
uint32_t
start_telnetsrv
=
0
,
start_telnetclt
=
0
;
uint32_t
noS1
=
0
,
nokrnmod
=
0
,
nonbiot
=
0
;
uint32_t
noS1
=
0
,
nokrnmod
=
0
,
nonbiot
=
0
;
uint32_t
rfsim
=
0
,
basicsim
=
0
,
do_forms
=
0
;
uint32_t
rfsim
=
0
,
basicsim
=
0
,
do_forms
=
0
;
char
*
logmem_filename
=
NULL
;
char
*
logmem_filename
=
NULL
;
...
@@ -99,11 +99,11 @@ void get_common_options(uint32_t execmask) {
...
@@ -99,11 +99,11 @@ void get_common_options(uint32_t execmask) {
sizeof
(
cmdline_logparams
)
/
sizeof
(
paramdef_t
));
sizeof
(
cmdline_logparams
)
/
sizeof
(
paramdef_t
));
config_get
(
cmdline_logparams
,
sizeof
(
cmdline_logparams
)
/
sizeof
(
paramdef_t
),
NULL
);
config_get
(
cmdline_logparams
,
sizeof
(
cmdline_logparams
)
/
sizeof
(
paramdef_t
),
NULL
);
if
(
config_isparamset
(
cmdline_logparams
,
CMDLINE_ONLINELOG_IDX
))
{
if
(
config_isparamset
(
cmdline_logparams
,
config_paramidx_fromname
(
cmdline_logparams
,
numparams
,
CONFIG_FLOG_OPT
)
))
{
set_glog_onlinelog
(
online_log_messages
);
set_glog_onlinelog
(
online_log_messages
);
}
}
if
(
config_isparamset
(
cmdline_logparams
,
CMDLINE_GLOGLEVEL_IDX
))
{
if
(
config_isparamset
(
cmdline_logparams
,
config_paramidx_fromname
(
cmdline_logparams
,
numparams
,
CONFIG_LOGL_OPT
)
))
{
set_glog
(
glog_level
);
set_glog
(
glog_level
);
}
}
...
@@ -111,6 +111,10 @@ void get_common_options(uint32_t execmask) {
...
@@ -111,6 +111,10 @@ void get_common_options(uint32_t execmask) {
load_module_shlib
(
"telnetsrv"
,
NULL
,
0
,
NULL
);
load_module_shlib
(
"telnetsrv"
,
NULL
,
0
,
NULL
);
}
}
if
(
start_telnetclt
)
{
set_softmodem_optmask
(
SOFTMODEM_TELNETCLT_BIT
);
}
if
(
logmem_filename
!=
NULL
&&
strlen
(
logmem_filename
)
>
0
)
{
if
(
logmem_filename
!=
NULL
&&
strlen
(
logmem_filename
)
>
0
)
{
log_mem_filename
=
&
logmem_filename
[
0
];
log_mem_filename
=
&
logmem_filename
[
0
];
log_mem_flag
=
1
;
log_mem_flag
=
1
;
...
...
executables/softmodem-common.h
View file @
8ad4895f
...
@@ -153,23 +153,22 @@ extern "C"
...
@@ -153,23 +153,22 @@ extern "C"
#define CONFIG_HLP_LOGV "Set the global log verbosity \n"
#define CONFIG_HLP_LOGV "Set the global log verbosity \n"
#define CONFIG_HLP_TELN "Start embedded telnet server \n"
#define CONFIG_HLP_TELN "Start embedded telnet server \n"
#define CONFIG_HLP_MSC "Enable the MSC tracing utility \n"
#define CONFIG_HLP_MSC "Enable the MSC tracing utility \n"
/*----------------------------------------------------------------------------------------------------------------------------*/
#define CONFIG_FLOG_OPT "R"
#define CONFIG_LOGL_OPT "g"
/*-------------------------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters for LOG utility */
/* command line parameters for LOG utility */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*----------------------------------------------------------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------------------------------------------------------
---------------------
*/
#define START_MSC softmodem_params.start_msc
#define START_MSC softmodem_params.start_msc
#define CMDLINE_LOGPARAMS_DESC { \
#define CMDLINE_LOGPARAMS_DESC { \
{
"R" , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages,
defintval:1, TYPE_INT, 0}, \
{
CONFIG_FLOG_OPT , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages,
defintval:1, TYPE_INT, 0}, \
{
"g" , CONFIG_HLP_LOGL, 0, uptr:&glog_level,
defintval:0, TYPE_UINT, 0}, \
{
CONFIG_LOGL_OPT , CONFIG_HLP_LOGL, 0, uptr:&glog_level,
defintval:0, TYPE_UINT, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
{"msc", CONFIG_HLP_MSC, PARAMFLAG_BOOL, uptr:&START_MSC, defintval:0, TYPE_UINT, 0}, \
{"msc", CONFIG_HLP_MSC, PARAMFLAG_BOOL, uptr:&START_MSC, defintval:0, TYPE_UINT, 0}, \
{"log-mem", NULL, 0, strptr:(char **)&logmem_filename, defstrval:NULL, TYPE_STRING, 0}, \
{"log-mem", NULL, 0, strptr:(char **)&logmem_filename, defstrval:NULL, TYPE_STRING, 0}, \
{"telnetclt", NULL, 0, uptr:&start_telnetclt, defstrval:NULL, TYPE_UINT, 0}, \
}
}
#define CMDLINE_ONLINELOG_IDX 0
#define CMDLINE_GLOGLEVEL_IDX 1
#define CMDLINE_GLOGVERBO_IDX 2
#define CMDLINE_STARTTELN_IDX 3
/* check function for global log level */
/* check function for global log level */
#define CMDLINE_LOGPARAMS_CHECK_DESC { \
#define CMDLINE_LOGPARAMS_CHECK_DESC { \
...
@@ -190,6 +189,7 @@ extern "C"
...
@@ -190,6 +189,7 @@ extern "C"
#define SOFTMODEM_SIML1_BIT (1<<12)
#define SOFTMODEM_SIML1_BIT (1<<12)
#define SOFTMODEM_DOFORMS_BIT (1<<15)
#define SOFTMODEM_DOFORMS_BIT (1<<15)
#define SOFTMODEM_RECPLAY_BIT (1<<16)
#define SOFTMODEM_RECPLAY_BIT (1<<16)
#define SOFTMODEM_TELNETCLT_BIT (1<<17)
#define SOFTMODEM_ENB_BIT (1<<20)
#define SOFTMODEM_ENB_BIT (1<<20)
#define SOFTMODEM_GNB_BIT (1<<21)
#define SOFTMODEM_GNB_BIT (1<<21)
#define SOFTMODEM_4GUE_BIT (1<<22)
#define SOFTMODEM_4GUE_BIT (1<<22)
...
@@ -206,6 +206,7 @@ extern "C"
...
@@ -206,6 +206,7 @@ extern "C"
#define IS_SOFTMODEM_SIML1 ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)
#define IS_SOFTMODEM_SIML1 ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)
#define IS_SOFTMODEM_DOFORMS ( get_softmodem_optmask() & SOFTMODEM_DOFORMS_BIT)
#define IS_SOFTMODEM_DOFORMS ( get_softmodem_optmask() & SOFTMODEM_DOFORMS_BIT)
#define IS_SOFTMODEM_IQPLAYER ( get_softmodem_optmask() & SOFTMODEM_RECPLAY_BIT)
#define IS_SOFTMODEM_IQPLAYER ( get_softmodem_optmask() & SOFTMODEM_RECPLAY_BIT)
#define IS_SOFTMODEM_TELNETCLT_BIT ( get_softmodem_optmask() & SOFTMODEM_TELNETCLT_BIT)
#define IS_SOFTMODEM_ENB_BIT ( get_softmodem_optmask() & SOFTMODEM_ENB_BIT)
#define IS_SOFTMODEM_ENB_BIT ( get_softmodem_optmask() & SOFTMODEM_ENB_BIT)
#define IS_SOFTMODEM_GNB_BIT ( get_softmodem_optmask() & SOFTMODEM_GNB_BIT)
#define IS_SOFTMODEM_GNB_BIT ( get_softmodem_optmask() & SOFTMODEM_GNB_BIT)
#define IS_SOFTMODEM_4GUE_BIT ( get_softmodem_optmask() & SOFTMODEM_4GUE_BIT)
#define IS_SOFTMODEM_4GUE_BIT ( get_softmodem_optmask() & SOFTMODEM_4GUE_BIT)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment