From dcfdd76113ce9c887c120c948ca19e665634a81e Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Thu, 18 May 2017 15:35:00 +0200
Subject: [PATCH] minor: warnings removal
It seems that ciphering_algorithm is "unsigned int" in RRC Rel10
and "unsigned long" in RRC Rel14 (as processed by asn1c)
Let's force it to unsigned long in the log to avoid compilation-time
warnings.
---
openair2/RRC/LITE/rrc_eNB_S1AP.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 1ec7cc44e8..f3c22abeff 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -290,7 +290,7 @@ rrc_eNB_process_security(
"[eNB %d] NAS security_capabilities.encryption_algorithms %u AS ciphering_algorithm %lu NAS security_capabilities.integrity_algorithms %u AS integrity_algorithm %u\n",
ctxt_pP->module_id,
ue_context_pP->ue_context.security_capabilities.encryption_algorithms,
- ue_context_pP->ue_context.ciphering_algorithm,
+ (unsigned long)ue_context_pP->ue_context.ciphering_algorithm,
ue_context_pP->ue_context.security_capabilities.integrity_algorithms,
ue_context_pP->ue_context.integrity_algorithm);
/* Select relevant algorithms */
@@ -312,7 +312,7 @@ rrc_eNB_process_security(
ctxt_pP->module_id,
ue_context_pP->ue_context.rnti,
security_capabilities_pP,
- cipheringAlgorithm,
+ (unsigned long)cipheringAlgorithm,
integrityProtAlgorithm,
changed ? "changed" : "same");
--
GitLab