diff options
| -rw-r--r-- | epan/dissectors/packet-diameter.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-diameter.h | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-diameter_3gpp.c | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index b86977331d..c55f8f0868 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -331,14 +331,12 @@ static const char *avpflags_str[] = { "VMP", }; -#define DIAM_APPID_3GPP_S6A_S6D 16777251 - #define SUBSCRIPTION_ID_TYPE_E164 0 #define SUBSCRIPTION_ID_TYPE_IMSI 1 #define SUBSCRIPTION_ID_TYPE_SIP_URI 2 #define SUBSCRIPTION_ID_TYPE_NAI 3 #define SUBSCRIPTION_ID_TYPE_PRIVATE 4 -#define SUBSCRIPTION_ID_TYPE_UNKNOWN (guint32)-1; +#define SUBSCRIPTION_ID_TYPE_UNKNOWN (guint32)-1 static guint32 subscription_id_type; static void @@ -474,7 +472,10 @@ dissect_diameter_user_name(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, application_id = diam_sub_dis->application_id; } - if (application_id == DIAM_APPID_3GPP_S6A_S6D) { + switch (application_id) { + case DIAM_APPID_3GPP_S6A_S6D: + case DIAM_APPID_3GPP_SLH: + case DIAM_APPID_3GPP_S7A: str_len = tvb_reported_length(tvb); dissect_e212_utf8_imsi(tvb, pinfo, tree, 0, str_len); return str_len; diff --git a/epan/dissectors/packet-diameter.h b/epan/dissectors/packet-diameter.h index 82e3b09624..1b9ef39fcb 100644 --- a/epan/dissectors/packet-diameter.h +++ b/epan/dissectors/packet-diameter.h @@ -44,3 +44,10 @@ typedef struct _diam_sub_dis_t { guint32 vendor_id; char *avp_str; } diam_sub_dis_t; + +#define DIAM_APPID_3GPP_CX 16777216 +#define DIAM_APPID_3GPP_GX 16777238 +#define DIAM_APPID_3GPP_S6A_S6D 16777251 +#define DIAM_APPID_3GPP_S13 16777252 +#define DIAM_APPID_3GPP_SLH 16777291 +#define DIAM_APPID_3GPP_S7A 16777308 diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 8025e66319..b3971a4c8a 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -185,10 +185,6 @@ static gint diameter_3gpp_idr_flags_ett = -1; /* Dissector handles */ static dissector_handle_t xml_handle; -#define DIAM_APPID_3GPP_S6A_S6D 16777251 -#define DIAM_APPID_3GPP_CX 16777216 -#define DIAM_APPID_3GPP_GX 16777238 - /* AVP Code: 23 3GPP-MS-TimeZone * 3GPP TS 29.061 */ |