Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Worker.N
openairinterface5G
Commits
f45256c6
Commit
f45256c6
authored
8 years ago
by
Cédric Roux
Browse files
Options
Downloads
Patches
Plain Diff
fix LOG_X macros - addendum
I forgot one file in the previous commit
parent
f2f32f53
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openair3/S1AP/s1ap_eNB_nas_procedures.c
+8
-4
8 additions, 4 deletions
openair3/S1AP/s1ap_eNB_nas_procedures.c
with
8 additions
and
4 deletions
openair3/S1AP/s1ap_eNB_nas_procedures.c
+
8
−
4
View file @
f45256c6
...
@@ -288,9 +288,13 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id,
...
@@ -288,9 +288,13 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id,
downlink_NAS_transport_p
->
eNB_UE_S1AP_ID
,
downlink_NAS_transport_p
->
eNB_UE_S1AP_ID
,
downlink_NAS_transport_p
->
mme_ue_s1ap_id
);
downlink_NAS_transport_p
->
mme_ue_s1ap_id
);
S1AP_ERROR
(
"[SCTP %d] Received NAS downlink message for non existing UE context eNB_UE_S1AP_ID: 0x%"
PRIx32
" %u
\n
"
,
/* TODO: fix this log - the original version is suspicious (twice downlink_NAS_transport_p->eNB_UE_S1AP_ID?) */
/*S1AP_ERROR("[SCTP %d] Received NAS downlink message for non existing UE context eNB_UE_S1AP_ID: 0x%"PRIx32" %u\n",
assoc_id,
assoc_id,
downlink_NAS_transport_p->eNB_UE_S1AP_ID,
downlink_NAS_transport_p->eNB_UE_S1AP_ID,
downlink_NAS_transport_p->eNB_UE_S1AP_ID);*/
S1AP_ERROR
(
"[SCTP %d] Received NAS downlink message for non existing UE context eNB_UE_S1AP_ID: 0x%lx
\n
"
,
assoc_id
,
downlink_NAS_transport_p
->
eNB_UE_S1AP_ID
);
downlink_NAS_transport_p
->
eNB_UE_S1AP_ID
);
return
-
1
;
return
-
1
;
}
}
...
@@ -311,7 +315,7 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id,
...
@@ -311,7 +315,7 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id,
}
else
{
}
else
{
/* We already have a mme ue s1ap id check the received is the same */
/* We already have a mme ue s1ap id check the received is the same */
if
(
ue_desc_p
->
mme_ue_s1ap_id
!=
downlink_NAS_transport_p
->
mme_ue_s1ap_id
)
{
if
(
ue_desc_p
->
mme_ue_s1ap_id
!=
downlink_NAS_transport_p
->
mme_ue_s1ap_id
)
{
S1AP_ERROR
(
"[SCTP %d] Mismatch in MME UE S1AP ID (0x%
"
PRIx32
"
!= 0x%"
PRIx32
"
)
\n
"
,
S1AP_ERROR
(
"[SCTP %d] Mismatch in MME UE S1AP ID (0x%
lx
!= 0x%"
PRIx32
"
\n
"
,
assoc_id
,
assoc_id
,
downlink_NAS_transport_p
->
mme_ue_s1ap_id
,
downlink_NAS_transport_p
->
mme_ue_s1ap_id
,
ue_desc_p
->
mme_ue_s1ap_id
ue_desc_p
->
mme_ue_s1ap_id
...
@@ -579,7 +583,7 @@ int s1ap_eNB_initial_ctxt_resp(
...
@@ -579,7 +583,7 @@ int s1ap_eNB_initial_ctxt_resp(
new_item
->
transportLayerAddress
.
size
=
initial_ctxt_resp_p
->
e_rabs
[
i
].
eNB_addr
.
length
;
new_item
->
transportLayerAddress
.
size
=
initial_ctxt_resp_p
->
e_rabs
[
i
].
eNB_addr
.
length
;
new_item
->
transportLayerAddress
.
bits_unused
=
0
;
new_item
->
transportLayerAddress
.
bits_unused
=
0
;
S1AP_DEBUG
(
"initial_ctxt_resp_p: e_rab ID %d, enb_addr %d.%d.%d.%d, SIZE %d
\n
"
,
S1AP_DEBUG
(
"initial_ctxt_resp_p: e_rab ID %
l
d, enb_addr %d.%d.%d.%d, SIZE %d
\n
"
,
new_item
->
e_RAB_ID
,
new_item
->
e_RAB_ID
,
new_item
->
transportLayerAddress
.
buf
[
0
],
new_item
->
transportLayerAddress
.
buf
[
0
],
new_item
->
transportLayerAddress
.
buf
[
1
],
new_item
->
transportLayerAddress
.
buf
[
1
],
...
@@ -778,7 +782,7 @@ int s1ap_eNB_e_rab_setup_resp(instance_t instance,
...
@@ -778,7 +782,7 @@ int s1ap_eNB_e_rab_setup_resp(instance_t instance,
new_item
->
transportLayerAddress
.
size
=
e_rab_setup_resp_p
->
e_rabs
[
i
].
eNB_addr
.
length
;
new_item
->
transportLayerAddress
.
size
=
e_rab_setup_resp_p
->
e_rabs
[
i
].
eNB_addr
.
length
;
new_item
->
transportLayerAddress
.
bits_unused
=
0
;
new_item
->
transportLayerAddress
.
bits_unused
=
0
;
S1AP_DEBUG
(
"e_rab_setup_resp: e_rab ID %d, teid %u, enb_addr %d.%d.%d.%d, SIZE %d
\n
"
,
S1AP_DEBUG
(
"e_rab_setup_resp: e_rab ID %
l
d, teid %u, enb_addr %d.%d.%d.%d, SIZE %d
\n
"
,
new_item
->
e_RAB_ID
,
new_item
->
e_RAB_ID
,
e_rab_setup_resp_p
->
e_rabs
[
i
].
gtp_teid
,
e_rab_setup_resp_p
->
e_rabs
[
i
].
gtp_teid
,
new_item
->
transportLayerAddress
.
buf
[
0
],
new_item
->
transportLayerAddress
.
buf
[
0
],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment