maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Warning

Browse Source
This commit is contained in:
zhenghuangkun
2020-09-11 05:38:30 +00:00
parent 5dc6712cec
commit 2b22daa445
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NGAP/ngap_gNB.c
+3 -2
View File
@@ -471,10 +471,11 @@ static int ngap_gNB_generate_ng_setup_request(
ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.present = NGAP_GNB_ID_PR_gNB_ID; ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.present = NGAP_GNB_ID_PR_gNB_ID;
MACRO_GNB_ID_TO_BIT_STRING(instance_p->gNB_id, MACRO_GNB_ID_TO_BIT_STRING(instance_p->gNB_id,
&ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID); &ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID);
NGAP_INFO("%d -> %02x%02x%02x\n", instance_p->gNB_id, NGAP_INFO("%u -> %02x%02x%02x%02x\n", instance_p->gNB_id,
ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[0], ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[0],
ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[1], ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[1],
ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[2]); ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[2],
ie->value.choice.GlobalRANNodeID.choice.globalGNB_ID.gNB_ID.choice.gNB_ID.buf[3]);
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie); ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
/* optional */ /* optional */
openair3/NGAP/ngap_gNB_defs.h
+1 -1
View File
@@ -245,7 +245,7 @@ typedef struct ngap_gNB_instance_s {
* In our case the gNB is a macro gNB so the id will be 20 bits long. * In our case the gNB is a macro gNB so the id will be 20 bits long.
* For Home gNB id, this field should be 36 bits long. * For Home gNB id, this field should be 36 bits long.
*/ */
uint64_t gNB_id; uint32_t gNB_id;
/* The type of the cell */ /* The type of the cell */
enum cell_type_e cell_type; enum cell_type_e cell_type;
openair3/NGAP/ngap_gNB_handlers.c
+2 -2
View File
@@ -334,7 +334,7 @@ int ngap_gNB_handle_ng_setup_response(uint32_t assoc_id,
for (i = 0; i < ie->value.choice.ServedGUAMIList.list.count; i++) { for (i = 0; i < ie->value.choice.ServedGUAMIList.list.count; i++) {
NGAP_ServedGUAMIItem_t *guami_item_p; NGAP_ServedGUAMIItem_t *guami_item_p;
struct served_guami_s *new_guami_p; struct served_guami_s *new_guami_p;
int j;
guami_item_p = ie->value.choice.ServedGUAMIList.list.array[i]; guami_item_p = ie->value.choice.ServedGUAMIList.list.array[i];
new_guami_p = calloc(1, sizeof(struct served_guami_s)); new_guami_p = calloc(1, sizeof(struct served_guami_s));
STAILQ_INIT(&new_guami_p->served_plmns); STAILQ_INIT(&new_guami_p->served_plmns);
@@ -1008,7 +1008,7 @@ int ngap_gNB_handle_initial_context_request(uint32_t assoc_id,
break; break;
default: default:
NGAP_ERROR("could not found protocolIEs id %d\n", pdusessionTransfer_ies->id); NGAP_ERROR("could not found protocolIEs id %ld\n", pdusessionTransfer_ies->id);
return -1; return -1;
} }
} }
openair3/UTILS/conversions.h
+3 -3
View File
@@ -508,9 +508,9 @@ do { \
do { \ do { \
(bITsTRING)->buf = calloc(4, sizeof(uint8_t)); \ (bITsTRING)->buf = calloc(4, sizeof(uint8_t)); \
(bITsTRING)->buf[0] = ((mACRO) >> 20); \ (bITsTRING)->buf[0] = ((mACRO) >> 20); \
(bITsTRING)->buf[1] = (mACRO) >> 12; \ (bITsTRING)->buf[1] = (mACRO) >> 12; \
(bITsTRING)->buf[3] = (mACRO) >> 4; \ (bITsTRING)->buf[2] = (mACRO) >> 4; \
(bITsTRING)->buf[4] = ((mACRO) & 0x0f) << 4; \ (bITsTRING)->buf[3] = ((mACRO) & 0x0f) << 4; \
(bITsTRING)->size = 4; \ (bITsTRING)->size = 4; \
(bITsTRING)->bits_unused = 4; \ (bITsTRING)->bits_unused = 4; \
} while(0) } while(0)