diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2019-02-04 10:57:47 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-02-04 11:22:47 +0000 |
| commit | 19e4cb7f7ec61fc1b502ccfd18e635f5c30ca332 (patch) | |
| tree | 6a5ebf952bb054b735da231cecc52718601e9ff4 | |
| parent | d17e218918a0f9c5df41ce14bbaeea516a4eec1c (diff) | |
NAS-5GS: Align enums and functions.
Change-Id: I9a500f58be913e389880044f5e2068d7b3f535f6
Reviewed-on: https://code.wireshark.org/review/31875
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.h | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-nas_5gs.c | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h index a86847079f..01a24bfe00 100644 --- a/epan/dissectors/packet-gsm_a_common.h +++ b/epan/dissectors/packet-gsm_a_common.h @@ -1628,10 +1628,6 @@ typedef enum DE_NAS_5GS_MM_DE_REG_TYPE, /* 9.11.3.20 De-registration type*/ /* 9.11.3.21 Void */ /* 9.11.3.22 Void*/ - - DE_NAS_5GS_MM_DNN, /* 9.11.3.19 DNN*/ - DE_NAS_5GS_MM_DRX_PAR, /* 9.11.3.20 DRX parameters */ - DE_NAS_5GS_MM_EMRG_NR_LIST, /* 9.11.3.23 Emergency number list */ DE_NAS_5GS_MM_EPS_NAS_MSG_CONT, /* 9.11.3.24 EPS NAS message container */ DE_NAS_5GS_MM_EPS_NAS_SEC_ALGO, /* 9.11.3.25 EPS NAS security algorithms */ @@ -1671,8 +1667,7 @@ typedef enum DE_NAS_5GS_MM_UE_USAGE_SET, /* 9.11.3.55 UE's usage setting */ DE_NAS_5GS_MM_UE_STATUS, /* 9.11.3.56 UE status */ DE_NAS_5GS_MM_UL_DATA_STATUS, /* 9.11.3.57 Uplink data status */ - DE_NAS_5GS_MM_NONE /* NONE */ -} + DE_NAS_5GS_MM_NONE /* NONE */} nas_5gs_mm_elem_idx_t; diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index 2f996d08a1..a9b37b31d7 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -3392,6 +3392,7 @@ static const value_string nas_5gs_mm_elem_strings[] = { { DE_NAS_5GS_MM_REJ_NSSAI, "Rejected NSSAI" }, /* 9.11.3.46 Rejected NSSAI*/ { DE_NAS_5GS_MM_REQ_TYPE, "Request type" }, /* 9.11.3.47 Request type*/ { DE_NAS_5GS_MM_S1_UE_NW_CAP, "S1 UE network capability" }, /* 9.11.3.48 S1 UE network capability*/ + { DE_NAS_5GS_MM_S1_UE_SEC_CAP, "S1 UE security capability" }, /* 9.11.3.48A S1 UE security capability*/ { DE_NAS_5GS_MM_SAL, "Service area list" }, /* 9.11.3.49 Service area list*/ { DE_NAS_5GS_MM_SERV_TYPE, "Service type" }, /* 9.11.3.50 Service type*/ { DE_NAS_5GS_MM_SMS_IND, "SMS indication" }, /* 9.11.3.50A SMS indication */ |