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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
lizhongxiao
OpenXG-RAN
Commits
c074d146
Commit
c074d146
authored
Aug 31, 2022
by
jperaldi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
issue#75 need to respect on ACP port interface the same logic. SysInd port management updated
parent
8c74bd92
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
84 additions
and
3 deletions
+84
-3
common/utils/ocp_itti/intertask_interface.h
common/utils/ocp_itti/intertask_interface.h
+1
-0
openair3/SS/ss_eNB_sysind_task.c
openair3/SS/ss_eNB_sysind_task.c
+79
-3
openair3/SS/ss_eNB_sysind_task.h
openair3/SS/ss_eNB_sysind_task.h
+1
-0
targets/COMMON/create_tasks.c
targets/COMMON/create_tasks.c
+3
-0
No files found.
common/utils/ocp_itti/intertask_interface.h
View file @
c074d146
...
...
@@ -329,6 +329,7 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SYSIND, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SYSIND_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_VNG, TASK_PRIORITY_MED, 200, NULL, NULL) \
...
...
openair3/SS/ss_eNB_sysind_task.c
View file @
c074d146
...
...
@@ -141,6 +141,67 @@ static void ss_send_sysind_data(ss_system_ind_t *p_ind)
}
/*
* Function : ss_eNB_read_from_sysind_socket
* Description: Function to received message from SYSIND Socket
* In :
* req - Request received from the TTCN
* Out:
* newState: No impack on the State
*
*/
static
bool
isConnected
=
false
;
static
inline
void
ss_eNB_read_from_sysind_socket
(
acpCtx_t
ctx
)
{
size_t
msgSize
=
size
;
//2
while
(
1
)
{
int
userId
=
acpRecvMsg
(
ctx
,
&
msgSize
,
buffer
);
LOG_A
(
ENB_SS
,
"[SS_SYSIND] Received msgSize=%d, userId=%d
\n
"
,
(
int
)
msgSize
,
userId
);
// Error handling
if
(
userId
<
0
)
{
if
(
userId
==
-
ACP_ERR_SERVICE_NOT_MAPPED
)
{
// Message not mapped to user id,
// this error should not appear on server side for the messages received from clients
}
else
if
(
userId
==
-
ACP_ERR_SIDL_FAILURE
)
{
// Server returned service error,
// this error should not appear on server side for the messages received from clients
SidlStatus
sidlStatus
=
-
1
;
acpGetMsgSidlStatus
(
msgSize
,
buffer
,
&
sidlStatus
);
}
else
if
(
userId
==
-
ACP_PEER_DISCONNECTED
){
LOG_A
(
GNB_APP
,
"[SS_SYSIND] Peer ordered shutdown
\n
"
);
isConnected
=
false
;
}
else
if
(
userId
==
-
ACP_PEER_CONNECTED
){
LOG_A
(
GNB_APP
,
"[SS_SYSIND] Peer connection established
\n
"
);
isConnected
=
true
;
}
else
{
LOG_A
(
ENB_SS
,
"[SS_SYSIND] Invalid userId: %d
\n
"
,
userId
);
break
;
}
}
if
(
userId
==
0
)
{
// No message (timeout on socket)
if
(
isConnected
==
true
)
{
break
;
}
}
}
}
/*
* Function : ss_eNB_sysind_init
* Description: Function handles for initilization of SYSIND task
...
...
@@ -262,14 +323,29 @@ void *ss_eNB_sysind_process_itti_msg(void *notUsed)
*/
void
*
ss_eNB_sysind_task
(
void
*
arg
)
{
ss_eNB_sysind_init
();
while
(
1
)
{
(
void
)
ss_eNB_sysind_process_itti_msg
(
NULL
);
}
acpFree
(
buffer
);
return
NULL
;
}
/*
* Function : ss_eNB_sysind_acp_task
* Description: Funtion Handles the SYSIND ACP Task
* In :
* req :
* Out:
* newState: No impact on state machine.
*
*/
void
*
ss_eNB_sysind_acp_task
(
void
*
arg
)
{
ss_eNB_sysind_init
();
while
(
1
)
{
ss_eNB_read_from_sysind_socket
(
ctx_sysind_g
);
}
acpFree
(
buffer
);
}
openair3/SS/ss_eNB_sysind_task.h
View file @
c074d146
...
...
@@ -4,5 +4,6 @@
void
ss_eNB_sysind_init
(
void
);
void
*
ss_eNB_sysind_process_itti_msg
(
void
*
);
void
*
ss_eNB_sysind_task
(
void
*
arg
);
void
*
ss_eNB_sysind_acp_task
(
void
*
arg
);
#endif
/* SS_ENB_SYSIND_TASK_H_ */
targets/COMMON/create_tasks.c
View file @
c074d146
...
...
@@ -74,6 +74,9 @@ int create_tasks(uint32_t enb_nb) {
rc
=
itti_create_task
(
TASK_SS_SYSIND
,
ss_eNB_sysind_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for SS SYSIND failed
\n
"
);
rc
=
itti_create_task
(
TASK_SS_SYSIND_ACP
,
ss_eNB_sysind_acp_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for SS SYSIND ACP failed
\n
"
);
rc
=
itti_create_task
(
TASK_SS_SRB
,
ss_eNB_srb_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for SS SRB failed
\n
"
);
...
...
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