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
wangjie
OpenXG-RAN
Commits
27413fc4
Commit
27413fc4
authored
Nov 20, 2020
by
masayuki.harada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge miss.
parent
cf41c788
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
82 deletions
+48
-82
openair2/COMMON/tasks_def.h
openair2/COMMON/tasks_def.h
+1
-2
openair2/X2AP/x2ap_common.h
openair2/X2AP/x2ap_common.h
+1
-1
openair3/S1AP/s1ap_eNB.c
openair3/S1AP/s1ap_eNB.c
+46
-79
No files found.
openair2/COMMON/tasks_def.h
View file @
27413fc4
...
@@ -47,8 +47,7 @@ TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)
...
@@ -47,8 +47,7 @@ TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)
TASK_DEF
(
TASK_UDP
,
TASK_PRIORITY_MED
,
1000
)
TASK_DEF
(
TASK_UDP
,
TASK_PRIORITY_MED
,
1000
)
// GTP_V1U task
// GTP_V1U task
TASK_DEF
(
TASK_GTPV1_U
,
TASK_PRIORITY_MED
,
1000
)
TASK_DEF
(
TASK_GTPV1_U
,
TASK_PRIORITY_MED
,
1000
)
//TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED, 200)
TASK_DEF
(
TASK_S1AP
,
TASK_PRIORITY_MED
,
200
)
TASK_DEF
(
TASK_S1AP
,
TASK_PRIORITY_MED
,
2000
)
TASK_DEF
(
TASK_CU_F1
,
TASK_PRIORITY_MED
,
200
)
TASK_DEF
(
TASK_CU_F1
,
TASK_PRIORITY_MED
,
200
)
TASK_DEF
(
TASK_DU_F1
,
TASK_PRIORITY_MED
,
200
)
TASK_DEF
(
TASK_DU_F1
,
TASK_PRIORITY_MED
,
200
)
/// M3ap task, acts as both source and target
/// M3ap task, acts as both source and target
...
...
openair2/X2AP/x2ap_common.h
View file @
27413fc4
...
@@ -84,7 +84,7 @@ extern int asn1_xer_print;
...
@@ -84,7 +84,7 @@ extern int asn1_xer_print;
break; \
break; \
} \
} \
} \
} \
/* if (mandatory) DevAssert(ie != NULL); \*/
\
if (mandatory) DevAssert(ie != NULL);
\
} while(0)
} while(0)
/** \brief Function callback prototype.
/** \brief Function callback prototype.
...
...
openair3/S1AP/s1ap_eNB.c
View file @
27413fc4
...
@@ -121,9 +121,6 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
...
@@ -121,9 +121,6 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
local_ip_addr
,
local_ip_addr
,
sizeof
(
*
local_ip_addr
));
sizeof
(
*
local_ip_addr
));
S1AP_INFO
(
"[eNB %d] check the mme registration state
\n
"
,
instance_p
->
instance
);
S1AP_INFO
(
"[eNB %d] check the mme registration state
\n
"
,
instance_p
->
instance
);
// mme = NULL;
//
// if ( mme == NULL ) {
/* Create new MME descriptor */
/* Create new MME descriptor */
s1ap_mme_data_p
=
calloc
(
1
,
sizeof
(
*
s1ap_mme_data_p
));
s1ap_mme_data_p
=
calloc
(
1
,
sizeof
(
*
s1ap_mme_data_p
));
DevAssert
(
s1ap_mme_data_p
!=
NULL
);
DevAssert
(
s1ap_mme_data_p
!=
NULL
);
...
@@ -143,33 +140,12 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
...
@@ -143,33 +140,12 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
* but not yet associated.
* but not yet associated.
*/
*/
RB_INSERT
(
s1ap_mme_map
,
&
instance_p
->
s1ap_mme_head
,
s1ap_mme_data_p
);
RB_INSERT
(
s1ap_mme_map
,
&
instance_p
->
s1ap_mme_head
,
s1ap_mme_data_p
);
// s1ap_mme_data_p->state = S1AP_ENB_STATE_WAITING;
s1ap_mme_data_p
->
state
=
S1AP_ENB_STATE_DISCONNECTED
;
s1ap_mme_data_p
->
state
=
S1AP_ENB_STATE_DISCONNECTED
;
memcpy
(
&
(
s1ap_mme_data_p
->
mme_ip_address
),
mme_ip_address
,
sizeof
(
net_ip_address_t
)
);
memcpy
(
&
(
s1ap_mme_data_p
->
mme_ip_address
),
mme_ip_address
,
sizeof
(
net_ip_address_t
)
);
s1ap_mme_data_p
->
overload_state
=
S1AP_NO_OVERLOAD
;
s1ap_mme_data_p
->
overload_state
=
S1AP_NO_OVERLOAD
;
s1ap_mme_data_p
->
sctp_req_cnt
++
;
s1ap_mme_data_p
->
sctp_req_cnt
++
;
s1ap_mme_data_p
->
timer_id
=
S1AP_TIMERID_INIT
;
s1ap_mme_data_p
->
timer_id
=
S1AP_TIMERID_INIT
;
// instance_p->s1ap_mme_nb ++;
instance_p
->
s1ap_mme_pending_nb
++
;
instance_p
->
s1ap_mme_pending_nb
++
;
// } else if (mme->state == S1AP_ENB_STATE_WAITING) {
// instance_p->s1ap_mme_pending_nb ++;
// sctp_new_association_req_p->ulp_cnx_id = mme->cnx_id;
// S1AP_INFO("[eNB %d] MME already registered, retrive the data (state %d, cnx %d, mme_nb %d, mme_pending_nb %d)\n",
// instance_p->instance,
// mme->state, mme->cnx_id,
// instance_p->s1ap_mme_nb, instance_p->s1ap_mme_pending_nb);
// /*s1ap_mme_data_p->cnx_id = mme->cnx_id;
// sctp_new_association_req_p->ulp_cnx_id = mme->cnx_id;
//
// s1ap_mme_data_p->assoc_id = -1;
// s1ap_mme_data_p->s1ap_eNB_instance = instance_p;
// */
// } else {
// S1AP_WARN("[eNB %d] MME already registered but not in the waiting state, retrive the data (state %d, cnx %d, mme_nb %d, mme_pending_nb %d)\n",
// instance_p->instance,
// mme->state, mme->cnx_id,
// instance_p->s1ap_mme_nb, instance_p->s1ap_mme_pending_nb);
// }
itti_send_msg_to_task
(
TASK_SCTP
,
instance_p
->
instance
,
message_p
);
itti_send_msg_to_task
(
TASK_SCTP
,
instance_p
->
instance
,
message_p
);
}
}
...
@@ -238,8 +214,6 @@ void s1ap_eNB_handle_register_eNB(instance_t instance, s1ap_register_enb_req_t *
...
@@ -238,8 +214,6 @@ void s1ap_eNB_handle_register_eNB(instance_t instance, s1ap_register_enb_req_t *
s1ap_register_eNB
->
eNB_id
);
s1ap_register_eNB
->
eNB_id
);
}
}
// DevCheck(s1ap_register_eNB->nb_mme <= S1AP_MAX_NB_MME_IP_ADDRESS,
// S1AP_MAX_NB_MME_IP_ADDRESS, s1ap_register_eNB->nb_mme, 0);
if
(
s1ap_register_eNB
->
nb_mme
>
S1AP_MAX_NB_MME_IP_ADDRESS
)
if
(
s1ap_register_eNB
->
nb_mme
>
S1AP_MAX_NB_MME_IP_ADDRESS
)
{
{
S1AP_ERROR
(
"Invalid MME number = %d
\n
"
,
s1ap_register_eNB
->
nb_mme
);
S1AP_ERROR
(
"Invalid MME number = %d
\n
"
,
s1ap_register_eNB
->
nb_mme
);
...
@@ -413,14 +387,6 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
...
@@ -413,14 +387,6 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
s1ap_mme_data_p
->
state
=
S1AP_ENB_STATE_DISCONNECTED
;
s1ap_mme_data_p
->
state
=
S1AP_ENB_STATE_DISCONNECTED
;
}
}
}
}
// if (sctp_new_association_resp->sctp_state != SCTP_STATE_ESTABLISHED) {
// S1AP_WARN("Received unsuccessful result for SCTP association (%u), instance %d, cnx_id %u\n",
// sctp_new_association_resp->sctp_state,
// instance,
// sctp_new_association_resp->ulp_cnx_id);
// s1ap_handle_s1_setup_message(s1ap_mme_data_p, sctp_new_association_resp->sctp_state == SCTP_STATE_SHUTDOWN);
// return;
// }
else
else
{
{
/* Update parameters */
/* Update parameters */
...
@@ -435,6 +401,7 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
...
@@ -435,6 +401,7 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
return
;
return
;
}
}
}
}
}
static
static
void
s1ap_eNB_handle_sctp_data_ind
(
sctp_data_ind_t
*
sctp_data_ind
)
{
void
s1ap_eNB_handle_sctp_data_ind
(
sctp_data_ind_t
*
sctp_data_ind
)
{
...
...
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