From 6cb20185fa1d9287bcab31f66e5b2cacef1954d7 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 22 Dec 2023 17:08:47 +0100 Subject: [PATCH] cosmetic: mme: emm-*.c fix trailing whitespace --- src/mme/emm-build.c | 46 +++++++++++++++++++++---------------------- src/mme/emm-handler.c | 38 +++++++++++++++++------------------ src/mme/emm-sm.c | 6 +++--- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/mme/emm-build.c b/src/mme/emm-build.c index ed31f8ccc..297e11fd9 100644 --- a/src/mme/emm-build.c +++ b/src/mme/emm-build.c @@ -30,7 +30,7 @@ ogs_pkbuf_t *emm_build_attach_accept( ogs_nas_eps_message_t message; ogs_pkbuf_t *pkbuf = NULL; ogs_nas_eps_attach_accept_t *attach_accept = &message.emm.attach_accept; - ogs_nas_eps_attach_result_t *eps_attach_result = + ogs_nas_eps_attach_result_t *eps_attach_result = &attach_accept->eps_attach_result; ogs_nas_gprs_timer_t *t3412_value = &attach_accept->t3412_value; ogs_nas_gprs_timer_t *t3402_value = &attach_accept->t3402_value; @@ -48,7 +48,7 @@ ogs_pkbuf_t *emm_build_attach_accept( ogs_assert(esmbuf); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -68,7 +68,7 @@ ogs_pkbuf_t *emm_build_attach_accept( * * HSS IMSI[x] Network-Access-Mode[2] > serve EPS_ONLY_ATTACH[1] * - * HSS IMSI[x] Network-Access-Mode[0] && request EPS_ONLY_ATTACH[1] + * HSS IMSI[x] Network-Access-Mode[0] && request EPS_ONLY_ATTACH[1] * > serve EPS_ONLY_ATTACH[1] * * HSS IMSI[x] Network-Access-Mode[0] && @@ -197,7 +197,7 @@ ogs_pkbuf_t *emm_build_attach_accept( OGS_NAS_EPS_ATTACH_ACCEPT_T3423_VALUE_PRESENT; } - attach_accept->presencemask |= + attach_accept->presencemask |= OGS_NAS_EPS_ATTACH_ACCEPT_EPS_NETWORK_FEATURE_SUPPORT_PRESENT; if (ogs_global_conf()->parameter.use_openair == false) { eps_network_feature_support->length = 2; @@ -264,7 +264,7 @@ ogs_pkbuf_t *emm_build_attach_reject( ogs_pkbuf_t *emm_build_identity_request(mme_ue_t *mme_ue) { ogs_nas_eps_message_t message; - ogs_nas_eps_identity_request_t *identity_request = + ogs_nas_eps_identity_request_t *identity_request = &message.emm.identity_request; ogs_assert(mme_ue); @@ -283,7 +283,7 @@ ogs_pkbuf_t *emm_build_identity_request(mme_ue_t *mme_ue) ogs_pkbuf_t *emm_build_authentication_request(mme_ue_t *mme_ue) { ogs_nas_eps_message_t message; - ogs_nas_eps_authentication_request_t *authentication_request = + ogs_nas_eps_authentication_request_t *authentication_request = &message.emm.authentication_request; ogs_assert(mme_ue); @@ -299,7 +299,7 @@ ogs_pkbuf_t *emm_build_authentication_request(mme_ue_t *mme_ue) mme_ue->rand, OGS_RAND_LEN); memcpy(authentication_request->authentication_parameter_autn.autn, mme_ue->autn, OGS_AUTN_LEN); - authentication_request->authentication_parameter_autn.length = + authentication_request->authentication_parameter_autn.length = OGS_AUTN_LEN; return ogs_nas_eps_plain_encode(&message); @@ -320,13 +320,13 @@ ogs_pkbuf_t *emm_build_authentication_reject(void) ogs_pkbuf_t *emm_build_security_mode_command(mme_ue_t *mme_ue) { ogs_nas_eps_message_t message; - ogs_nas_eps_security_mode_command_t *security_mode_command = + ogs_nas_eps_security_mode_command_t *security_mode_command = &message.emm.security_mode_command; ogs_nas_security_algorithms_t *selected_nas_security_algorithms = &security_mode_command->selected_nas_security_algorithms; ogs_nas_key_set_identifier_t *nas_key_set_identifier = &security_mode_command->nas_key_set_identifier; - ogs_nas_ue_security_capability_t *replayed_ue_security_capabilities = + ogs_nas_ue_security_capability_t *replayed_ue_security_capabilities = &security_mode_command->replayed_ue_security_capabilities; ogs_nas_imeisv_request_t *imeisv_request = &security_mode_command->imeisv_request; @@ -338,7 +338,7 @@ ogs_pkbuf_t *emm_build_security_mode_command(mme_ue_t *mme_ue) ogs_assert(mme_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_NEW_SECURITY_CONTEXT; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -359,10 +359,10 @@ ogs_pkbuf_t *emm_build_security_mode_command(mme_ue_t *mme_ue) replayed_ue_security_capabilities->eea = mme_ue->ue_network_capability.eea; replayed_ue_security_capabilities->eia = mme_ue->ue_network_capability.eia; replayed_ue_security_capabilities->uea = mme_ue->ue_network_capability.uea; - replayed_ue_security_capabilities->uia = + replayed_ue_security_capabilities->uia = mme_ue->ue_network_capability.uia & 0x7f; - replayed_ue_security_capabilities->gea = - (mme_ue->ms_network_capability.gea1 << 6) | + replayed_ue_security_capabilities->gea = + (mme_ue->ms_network_capability.gea1 << 6) | mme_ue->ms_network_capability.extended_gea; replayed_ue_security_capabilities->length = @@ -453,7 +453,7 @@ ogs_pkbuf_t *emm_build_detach_request(mme_ue_t *mme_ue) ogs_assert(mme_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -473,7 +473,7 @@ ogs_pkbuf_t *emm_build_detach_accept(mme_ue_t *mme_ue) ogs_assert(mme_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -486,7 +486,7 @@ ogs_pkbuf_t *emm_build_detach_accept(mme_ue_t *mme_ue) ogs_pkbuf_t *emm_build_tau_accept(mme_ue_t *mme_ue) { ogs_nas_eps_message_t message; - ogs_nas_eps_tracking_area_update_accept_t *tau_accept = + ogs_nas_eps_tracking_area_update_accept_t *tau_accept = &message.emm.tracking_area_update_accept; ogs_nas_eps_mobile_identity_t *nas_guti = &tau_accept->guti; ogs_nas_gprs_timer_t *t3412_value = &tau_accept->t3412_value; @@ -499,7 +499,7 @@ ogs_pkbuf_t *emm_build_tau_accept(mme_ue_t *mme_ue) ogs_assert(mme_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -628,7 +628,7 @@ ogs_pkbuf_t *emm_build_tau_reject( ogs_nas_emm_cause_t emm_cause, mme_ue_t *mme_ue) { ogs_nas_eps_message_t message; - ogs_nas_eps_tracking_area_update_reject_t *tau_reject = + ogs_nas_eps_tracking_area_update_reject_t *tau_reject = &message.emm.tracking_area_update_reject; ogs_assert(mme_ue); @@ -664,7 +664,7 @@ ogs_pkbuf_t *emm_build_service_reject( ogs_pkbuf_t *emm_build_cs_service_notification(mme_ue_t *mme_ue) { ogs_nas_eps_message_t message; - ogs_nas_eps_cs_service_notification_t *cs_service_notification = + ogs_nas_eps_cs_service_notification_t *cs_service_notification = &message.emm.cs_service_notification; ogs_nas_paging_identity_t *paging_identity = &cs_service_notification->paging_identity; @@ -672,7 +672,7 @@ ogs_pkbuf_t *emm_build_cs_service_notification(mme_ue_t *mme_ue) ogs_assert(mme_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -683,7 +683,7 @@ ogs_pkbuf_t *emm_build_cs_service_notification(mme_ue_t *mme_ue) paging_identity->identity = OGS_NAS_PAGING_IDENTITY_TMSI; ogs_debug(" Paging Identity[%d]", paging_identity->identity); - /* FIXME : What optional filed should be included in this message? */ + /* FIXME : What optional filed should be included in this message? */ return nas_eps_security_encode(mme_ue, &message); } @@ -692,7 +692,7 @@ ogs_pkbuf_t *emm_build_downlink_nas_transport( mme_ue_t *mme_ue, uint8_t *buffer, uint8_t length) { ogs_nas_eps_message_t message; - ogs_nas_eps_downlink_nas_transport_t *downlink_nas_transport = + ogs_nas_eps_downlink_nas_transport_t *downlink_nas_transport = &message.emm.downlink_nas_transport; ogs_nas_eps_message_container_t *nas_message_container = &downlink_nas_transport->nas_message_container; @@ -700,7 +700,7 @@ ogs_pkbuf_t *emm_build_downlink_nas_transport( ogs_assert(mme_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; diff --git a/src/mme/emm-handler.c b/src/mme/emm-handler.c index 6dd4a9ea9..868167b41 100644 --- a/src/mme/emm-handler.c +++ b/src/mme/emm-handler.c @@ -155,7 +155,7 @@ int emm_handle_attach_request(mme_ue_t *mme_ue, /* Store UE specific information */ if (attach_request->presencemask & OGS_NAS_EPS_ATTACH_REQUEST_LAST_VISITED_REGISTERED_TAI_PRESENT) { - ogs_nas_eps_tai_t *last_visited_registered_tai = + ogs_nas_eps_tai_t *last_visited_registered_tai = &attach_request->last_visited_registered_tai; ogs_nas_to_plmn_id(&mme_ue->last_visited_plmn_id, @@ -164,13 +164,13 @@ int emm_handle_attach_request(mme_ue_t *mme_ue, ogs_plmn_id_hexdump(&mme_ue->last_visited_plmn_id)); } - memcpy(&mme_ue->ue_network_capability, + memcpy(&mme_ue->ue_network_capability, &attach_request->ue_network_capability, sizeof(attach_request->ue_network_capability)); if (attach_request->presencemask & OGS_NAS_EPS_ATTACH_REQUEST_MS_NETWORK_CAPABILITY_PRESENT) { - memcpy(&mme_ue->ms_network_capability, + memcpy(&mme_ue->ms_network_capability, &attach_request->ms_network_capability, sizeof(attach_request->ms_network_capability)); } @@ -204,7 +204,7 @@ int emm_handle_attach_request(mme_ue_t *mme_ue, eps_mobile_identity->length); return OGS_ERROR; } - memcpy(&mme_ue->nas_mobile_identity_imsi, + memcpy(&mme_ue->nas_mobile_identity_imsi, &eps_mobile_identity->imsi, eps_mobile_identity->length); emm_cause = emm_cause_from_access_control(mme_ue); @@ -237,7 +237,7 @@ int emm_handle_attach_request(mme_ue_t *mme_ue, nas_guti.mme_gid, nas_guti.mme_code, nas_guti.m_tmsi, - MME_UE_HAVE_IMSI(mme_ue) + MME_UE_HAVE_IMSI(mme_ue) ? mme_ue->imsi_bcd : "Unknown IMSI"); break; default: @@ -263,7 +263,7 @@ int emm_handle_attach_complete( ogs_nas_time_zone_t *local_time_zone = &emm_information->local_time_zone; ogs_nas_time_zone_and_time_t *universal_time_and_local_time_zone = &emm_information->universal_time_and_local_time_zone; - ogs_nas_daylight_saving_time_t *network_daylight_saving_time = + ogs_nas_daylight_saving_time_t *network_daylight_saving_time = &emm_information->network_daylight_saving_time; struct timeval tv; @@ -295,7 +295,7 @@ int emm_handle_attach_complete( } memset(&message, 0, sizeof(message)); - message.h.security_header_type = + message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -398,7 +398,7 @@ int emm_handle_identity_response( ogs_assert(r != OGS_ERROR); return OGS_ERROR; } - memcpy(&mme_ue->nas_mobile_identity_imsi, + memcpy(&mme_ue->nas_mobile_identity_imsi, &mobile_identity->imsi, mobile_identity->length); emm_cause = emm_cause_from_access_control(mme_ue); @@ -470,11 +470,11 @@ int emm_handle_detach_request( switch (detach_request->detach_type.value) { /* 0 0 1 : EPS detach */ - case OGS_NAS_DETACH_TYPE_FROM_UE_EPS_DETACH: + case OGS_NAS_DETACH_TYPE_FROM_UE_EPS_DETACH: ogs_debug(" EPS Detach"); break; /* 0 1 0 : IMSI detach */ - case OGS_NAS_DETACH_TYPE_FROM_UE_IMSI_DETACH: + case OGS_NAS_DETACH_TYPE_FROM_UE_IMSI_DETACH: ogs_debug(" IMSI Detach"); break; case 6: /* 1 1 0 : reserved */ @@ -483,7 +483,7 @@ int emm_handle_detach_request( detach_request->detach_type.value); break; /* 0 1 1 : combined EPS/IMSI detach */ - case OGS_NAS_DETACH_TYPE_FROM_UE_COMBINED_EPS_IMSI_DETACH: + case OGS_NAS_DETACH_TYPE_FROM_UE_COMBINED_EPS_IMSI_DETACH: ogs_debug(" Combined EPS/IMSI Detach"); default: /* all other values */ break; @@ -637,30 +637,30 @@ int emm_handle_tau_request(mme_ue_t *mme_ue, /* Store UE specific information */ if (tau_request->presencemask & OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST_LAST_VISITED_REGISTERED_TAI_PRESENT) { - ogs_nas_eps_tai_t *last_visited_registered_tai = + ogs_nas_eps_tai_t *last_visited_registered_tai = &tau_request->last_visited_registered_tai; ogs_nas_to_plmn_id(&mme_ue->last_visited_plmn_id, &last_visited_registered_tai->nas_plmn_id); ogs_debug(" Visited_PLMN_ID:%06x", ogs_plmn_id_hexdump(&mme_ue->last_visited_plmn_id)); - } + } if (tau_request->presencemask & OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST_UE_NETWORK_CAPABILITY_PRESENT) { - memcpy(&mme_ue->ue_network_capability, + memcpy(&mme_ue->ue_network_capability, &tau_request->ue_network_capability, sizeof(tau_request->ue_network_capability)); } if (tau_request->presencemask & OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST_MS_NETWORK_CAPABILITY_PRESENT) { - memcpy(&mme_ue->ms_network_capability, + memcpy(&mme_ue->ms_network_capability, &tau_request->ms_network_capability, sizeof(tau_request->ms_network_capability)); } - /* TODO: + /* TODO: * 1) Consider if MME is changed or not. * 2) Consider if SGW is changed or not. */ @@ -677,12 +677,12 @@ int emm_handle_tau_request(mme_ue_t *mme_ue, nas_guti.mme_gid, nas_guti.mme_code, nas_guti.m_tmsi, - MME_UE_HAVE_IMSI(mme_ue) + MME_UE_HAVE_IMSI(mme_ue) ? mme_ue->imsi_bcd : "Unknown"); break; default: ogs_error("Not implemented[%d]", eps_mobile_identity->imsi.type); - + return OGS_OK; } @@ -713,7 +713,7 @@ int emm_handle_extended_service_request(mme_ue_t *mme_ue, mme_ue->nas_eps.ksi = service_type->nas_key_set_identifier; ogs_debug(" OGS_NAS_EPS TYPE[%d] KSI[%d]", mme_ue->nas_eps.type, mme_ue->nas_eps.ksi); - + /* * ATTACH_REQUEST * TAU_REQUEST diff --git a/src/mme/emm-sm.c b/src/mme/emm-sm.c index cd6d41246..b1ce78098 100644 --- a/src/mme/emm-sm.c +++ b/src/mme/emm-sm.c @@ -868,7 +868,7 @@ static void common_register_state(ogs_fsm_t *s, mme_event_t *e, MME_UE_S1AP_ID = enb_ue->mme_ue_s1ap_id; ENB_UE_S1AP_ID = enb_ue->enb_ue_s1ap_id; - r = s1ap_send_error_indication(enb_ue->enb, + r = s1ap_send_error_indication(enb_ue->enb, &MME_UE_S1AP_ID, &ENB_UE_S1AP_ID, S1AP_Cause_PR_transport, S1AP_CauseTransport_transport_resource_unavailable); @@ -906,7 +906,7 @@ void emm_state_authentication(ogs_fsm_t *s, mme_event_t *e) ogs_assert(s); ogs_assert(e); - + mme_sm_debug(e); mme_ue = e->mme_ue; @@ -961,7 +961,7 @@ void emm_state_authentication(ogs_fsm_t *s, mme_event_t *e) ogs_nas_eps_authentication_failure_t *authentication_failure = &message->emm.authentication_failure; ogs_nas_authentication_failure_parameter_t - *authentication_failure_parameter = + *authentication_failure_parameter = &authentication_failure-> authentication_failure_parameter;