osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Anders Broman 2019-02-04 10:57:47 +01:00 committed by Anders Broman
parent d17e218918
commit 19e4cb7f7e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-gsm_a_common.h
View File

@ -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;

1
epan/dissectors/packet-nas_5gs.c
View File

@ -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 */