RFC 4165 uses the same message/parameter formats as draft-12 did so let's
call it RFC 4165. svn path=/trunk/; revision=32953
This commit is contained in:
parent
7436d04550
commit
a12990e603
|
@ -3,7 +3,7 @@
|
|||
* It is hopefully (needs testing) compliant to
|
||||
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m2pa-02.txt
|
||||
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m2pa-08.txt
|
||||
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m2pa-12.txt
|
||||
* http://tools.ietf.org/rfc/rfc4165.txt
|
||||
*
|
||||
* Copyright 2001, 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>,
|
||||
* updated by Michael Tuexen <tuexen [AT] fh-muenster.de>
|
||||
|
@ -54,7 +54,7 @@ static int hf_version = -1;
|
|||
static int hf_spare = -1;
|
||||
static int hf_v2_type = -1;
|
||||
static int hf_v8_type = -1;
|
||||
static int hf_v12_type = -1;
|
||||
static int hf_type = -1;
|
||||
static int hf_class = -1;
|
||||
static int hf_length = -1;
|
||||
static int hf_unused = -1;
|
||||
|
@ -62,7 +62,7 @@ static int hf_bsn = -1;
|
|||
static int hf_fsn = -1;
|
||||
static int hf_v2_status = -1;
|
||||
static int hf_v8_status = -1;
|
||||
static int hf_v12_status = -1;
|
||||
static int hf_status = -1;
|
||||
static int hf_v2_li_spare = -1;
|
||||
static int hf_v8_li_spare = -1;
|
||||
static int hf_v2_li_prio = -1;
|
||||
|
@ -81,17 +81,17 @@ static dissector_handle_t mtp3_handle;
|
|||
typedef enum {
|
||||
M2PA_V02 = 1,
|
||||
M2PA_V08 = 2,
|
||||
M2PA_V12 = 3
|
||||
M2PA_RFC4165 = 3
|
||||
} Version_Type;
|
||||
|
||||
static gint m2pa_version = M2PA_V12;
|
||||
static gint m2pa_version = M2PA_RFC4165;
|
||||
|
||||
#define VERSION_LENGTH 1
|
||||
#define SPARE_LENGTH 1
|
||||
#define CLASS_LENGTH 1
|
||||
#define V2_TYPE_LENGTH 2
|
||||
#define V8_TYPE_LENGTH 1
|
||||
#define V12_TYPE_LENGTH V8_TYPE_LENGTH
|
||||
#define TYPE_LENGTH V8_TYPE_LENGTH
|
||||
#define LENGTH_LENGTH 4
|
||||
#define UNUSED_LENGTH 1
|
||||
#define BSN_LENGTH 3
|
||||
|
@ -104,7 +104,7 @@ static gint m2pa_version = M2PA_V12;
|
|||
CLASS_LENGTH + V8_TYPE_LENGTH + LENGTH_LENGTH + \
|
||||
UNUSED_LENGTH + BSN_LENGTH + UNUSED_LENGTH + \
|
||||
FSN_LENGTH)
|
||||
#define V12_HEADER_LENGTH V8_HEADER_LENGTH
|
||||
#define HEADER_LENGTH V8_HEADER_LENGTH
|
||||
|
||||
#define HEADER_OFFSET 0
|
||||
#define VERSION_OFFSET HEADER_OFFSET
|
||||
|
@ -112,9 +112,9 @@ static gint m2pa_version = M2PA_V12;
|
|||
#define CLASS_OFFSET (SPARE_OFFSET + SPARE_LENGTH)
|
||||
#define V2_TYPE_OFFSET (SPARE_OFFSET + SPARE_LENGTH)
|
||||
#define V8_TYPE_OFFSET (CLASS_OFFSET + CLASS_LENGTH)
|
||||
#define V12_TYPE_OFFSET V8_TYPE_OFFSET
|
||||
#define TYPE_OFFSET V8_TYPE_OFFSET
|
||||
#define V8_LENGTH_OFFSET (V8_TYPE_OFFSET + V8_TYPE_LENGTH)
|
||||
#define V12_LENGTH_OFFSET V8_LENGTH_OFFSET
|
||||
#define LENGTH_OFFSET V8_LENGTH_OFFSET
|
||||
#define V2_LENGTH_OFFSET (V2_TYPE_OFFSET + V2_TYPE_LENGTH)
|
||||
#define FIRST_UNUSED_OFFSET (V8_LENGTH_OFFSET + LENGTH_LENGTH)
|
||||
#define BSN_OFFSET (FIRST_UNUSED_OFFSET + UNUSED_LENGTH)
|
||||
|
@ -145,13 +145,13 @@ static const value_string v8_message_type_values[] = {
|
|||
{ V8_LINK_STATUS_TYPE, "Link Status" },
|
||||
{ 0, NULL } };
|
||||
|
||||
#define V12_USER_DATA_TYPE V8_USER_DATA_TYPE
|
||||
#define V12_LINK_STATUS_TYPE V8_LINK_STATUS_TYPE
|
||||
#define USER_DATA_TYPE V8_USER_DATA_TYPE
|
||||
#define LINK_STATUS_TYPE V8_LINK_STATUS_TYPE
|
||||
|
||||
static const value_string v12_message_type_values[] = {
|
||||
{ V12_USER_DATA_TYPE, "User Data" },
|
||||
{ V12_LINK_STATUS_TYPE, "Link Status" },
|
||||
{ 0, NULL } };
|
||||
static const value_string message_type_values[] = {
|
||||
{ USER_DATA_TYPE, "User Data" },
|
||||
{ LINK_STATUS_TYPE, "Link Status" },
|
||||
{ 0, NULL } };
|
||||
|
||||
static void
|
||||
dissect_v2_header(tvbuff_t *header_tvb, packet_info *pinfo, proto_tree *m2pa_tree)
|
||||
|
@ -195,7 +195,7 @@ dissect_v8_header(tvbuff_t *header_tvb, packet_info *pinfo, proto_tree *m2pa_tre
|
|||
}
|
||||
|
||||
static void
|
||||
dissect_v12_header(tvbuff_t *header_tvb, packet_info *pinfo, proto_tree *m2pa_tree)
|
||||
dissect_header(tvbuff_t *header_tvb, packet_info *pinfo, proto_tree *m2pa_tree)
|
||||
{
|
||||
guint8 message_type;
|
||||
|
||||
|
@ -208,8 +208,8 @@ dissect_v12_header(tvbuff_t *header_tvb, packet_info *pinfo, proto_tree *m2pa_tr
|
|||
proto_tree_add_item(m2pa_tree, hf_version, header_tvb, VERSION_OFFSET, VERSION_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_spare, header_tvb, SPARE_OFFSET, SPARE_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_class, header_tvb, CLASS_OFFSET, CLASS_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_v12_type, header_tvb, V12_TYPE_OFFSET, V12_TYPE_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_length, header_tvb, V12_LENGTH_OFFSET, LENGTH_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_type, header_tvb, TYPE_OFFSET, TYPE_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_length, header_tvb, LENGTH_OFFSET, LENGTH_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_unused, header_tvb, FIRST_UNUSED_OFFSET, UNUSED_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_bsn, header_tvb, BSN_OFFSET, BSN_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_unused, header_tvb, SECOND_UNUSED_OFFSET, UNUSED_LENGTH, ENC_BIG_ENDIAN);
|
||||
|
@ -281,7 +281,7 @@ dissect_v8_user_data_message(tvbuff_t *message_data_tvb, packet_info *pinfo, pro
|
|||
#define PRI_LENGTH 1
|
||||
|
||||
static void
|
||||
dissect_v12_user_data_message(tvbuff_t *message_data_tvb, packet_info *pinfo, proto_item *m2pa_item, proto_tree *m2pa_tree, proto_tree *tree)
|
||||
dissect_user_data_message(tvbuff_t *message_data_tvb, packet_info *pinfo, proto_item *m2pa_item, proto_tree *m2pa_tree, proto_tree *tree)
|
||||
{
|
||||
proto_item *m2pa_li_item;
|
||||
proto_tree *m2pa_li_tree;
|
||||
|
@ -295,7 +295,7 @@ dissect_v12_user_data_message(tvbuff_t *message_data_tvb, packet_info *pinfo, pr
|
|||
proto_tree_add_item(m2pa_li_tree, hf_pri_spare, message_data_tvb, PRI_OFFSET, PRI_LENGTH, ENC_BIG_ENDIAN);
|
||||
|
||||
/* Re-adjust length of M2PA item since it will be dissected as MTP3 */
|
||||
proto_item_set_len(m2pa_item, V12_HEADER_LENGTH + PRI_LENGTH);
|
||||
proto_item_set_len(m2pa_item, HEADER_LENGTH + PRI_LENGTH);
|
||||
}
|
||||
|
||||
payload_tvb = tvb_new_subset_remaining(message_data_tvb, MTP3_OFFSET);
|
||||
|
@ -351,7 +351,7 @@ dissect_v8_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, p
|
|||
proto_tree_add_item(m2pa_tree, hf_filler, message_data_tvb, FILLER_OFFSET, filler_length, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
static const value_string v12_link_status_values[] = {
|
||||
static const value_string link_status_values[] = {
|
||||
{ 1, "Alignment" },
|
||||
{ 2, "Proving Normal" },
|
||||
{ 3, "Proving Emergency" },
|
||||
|
@ -364,16 +364,16 @@ static const value_string v12_link_status_values[] = {
|
|||
{ 0, NULL } };
|
||||
|
||||
static void
|
||||
dissect_v12_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, proto_tree *m2pa_tree)
|
||||
dissect_link_status_message(tvbuff_t *message_data_tvb, packet_info *pinfo, proto_tree *m2pa_tree)
|
||||
{
|
||||
guint16 filler_length;
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ", val_to_str(tvb_get_ntohl(message_data_tvb, STATUS_OFFSET), v12_link_status_values, "Unknown"));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ", val_to_str(tvb_get_ntohl(message_data_tvb, STATUS_OFFSET), link_status_values, "Unknown"));
|
||||
|
||||
filler_length = tvb_length(message_data_tvb) - STATUS_LENGTH;
|
||||
|
||||
proto_tree_add_item(m2pa_tree, hf_v12_status, message_data_tvb, STATUS_OFFSET, STATUS_LENGTH, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(m2pa_tree, hf_status, message_data_tvb, STATUS_OFFSET, STATUS_LENGTH, ENC_BIG_ENDIAN);
|
||||
if (filler_length > 0)
|
||||
proto_tree_add_item(m2pa_tree, hf_filler, message_data_tvb, FILLER_OFFSET, filler_length, ENC_BIG_ENDIAN);
|
||||
}
|
||||
|
@ -452,27 +452,27 @@ dissect_v8_message_data(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m
|
|||
}
|
||||
}
|
||||
|
||||
#define V12_MESSAGE_DATA_OFFSET (HEADER_OFFSET + V12_HEADER_LENGTH)
|
||||
#define MESSAGE_DATA_OFFSET (HEADER_OFFSET + HEADER_LENGTH)
|
||||
|
||||
static void
|
||||
dissect_v12_message_data(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2pa_item, proto_tree *m2pa_tree, proto_tree *tree)
|
||||
dissect_message_data(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2pa_item, proto_tree *m2pa_tree, proto_tree *tree)
|
||||
{
|
||||
guint32 length, message_data_length, actual_length;
|
||||
guint8 type;
|
||||
tvbuff_t *message_data_tvb;
|
||||
|
||||
length = tvb_get_ntohl(message_tvb, V12_LENGTH_OFFSET);
|
||||
message_data_length = length - V12_HEADER_LENGTH;
|
||||
message_data_tvb = tvb_new_subset(message_tvb, V12_MESSAGE_DATA_OFFSET, message_data_length, message_data_length);
|
||||
type = tvb_get_guint8(message_tvb, V12_TYPE_OFFSET);
|
||||
length = tvb_get_ntohl(message_tvb, LENGTH_OFFSET);
|
||||
message_data_length = length - HEADER_LENGTH;
|
||||
message_data_tvb = tvb_new_subset(message_tvb, MESSAGE_DATA_OFFSET, message_data_length, message_data_length);
|
||||
type = tvb_get_guint8(message_tvb, TYPE_OFFSET);
|
||||
|
||||
|
||||
switch(type) {
|
||||
case V12_USER_DATA_TYPE:
|
||||
dissect_v12_user_data_message(message_data_tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
case USER_DATA_TYPE:
|
||||
dissect_user_data_message(message_data_tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
break;
|
||||
case V12_LINK_STATUS_TYPE:
|
||||
dissect_v12_link_status_message(message_data_tvb, pinfo, m2pa_tree);
|
||||
case LINK_STATUS_TYPE:
|
||||
dissect_link_status_message(message_data_tvb, pinfo, m2pa_tree);
|
||||
break;
|
||||
default:
|
||||
dissect_unknown_message(message_data_tvb, m2pa_tree);
|
||||
|
@ -506,10 +506,10 @@ dissect_v8_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2pa_i
|
|||
}
|
||||
|
||||
static void
|
||||
dissect_v12_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2pa_item, proto_tree *m2pa_tree, proto_tree *tree)
|
||||
dissect_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2pa_item, proto_tree *m2pa_tree, proto_tree *tree)
|
||||
{
|
||||
dissect_v12_header(message_tvb, pinfo, m2pa_tree);
|
||||
dissect_v12_message_data(message_tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
dissect_header(message_tvb, pinfo, m2pa_tree);
|
||||
dissect_message_data(message_tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -526,8 +526,8 @@ dissect_m2pa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
case M2PA_V08:
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2PA (ID 08)");
|
||||
break;
|
||||
case M2PA_V12:
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2PA (ID 12)");
|
||||
case M2PA_RFC4165:
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2PA");
|
||||
break;
|
||||
};
|
||||
|
||||
|
@ -546,8 +546,8 @@ dissect_m2pa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
case M2PA_V08:
|
||||
dissect_v8_message(tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
break;
|
||||
case M2PA_V12:
|
||||
dissect_v12_message(tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
case M2PA_RFC4165:
|
||||
dissect_message(tvb, pinfo, m2pa_item, m2pa_tree, tree);
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
@ -560,7 +560,7 @@ proto_register_m2pa(void)
|
|||
{ &hf_spare, { "Spare", "m2pa.spare", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} },
|
||||
{ &hf_v2_type, { "Message Type", "m2pa.type", FT_UINT16, BASE_HEX, VALS(v2_message_type_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_v8_type, { "Message Type", "m2pa.type", FT_UINT8, BASE_DEC, VALS(v8_message_type_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_v12_type, { "Message Type", "m2pa.type", FT_UINT8, BASE_DEC, VALS(v12_message_type_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_type, { "Message Type", "m2pa.type", FT_UINT8, BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_class, { "Message Class", "m2pa.class", FT_UINT8, BASE_DEC, VALS(message_class_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_length, { "Message length", "m2pa.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} },
|
||||
{ &hf_unused, { "Unused", "m2pa.unused", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} },
|
||||
|
@ -574,7 +574,7 @@ proto_register_m2pa(void)
|
|||
{ &hf_pri_prio, { "Priority", "m2pa.priority", FT_UINT8, BASE_HEX, NULL, PRIORITY_MASK, NULL, HFILL} },
|
||||
{ &hf_v2_status, { "Link Status", "m2pa.status", FT_UINT32, BASE_DEC, VALS(v2_link_status_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_v8_status, { "Link Status", "m2pa.status", FT_UINT32, BASE_DEC, VALS(v8_link_status_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_v12_status, { "Link Status", "m2pa.status", FT_UINT32, BASE_DEC, VALS(v12_link_status_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_status, { "Link Status", "m2pa.status", FT_UINT32, BASE_DEC, VALS(link_status_values), 0x0, NULL, HFILL} },
|
||||
{ &hf_filler, { "Filler", "m2pa.filler", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} },
|
||||
{ &hf_unknown_data, { "Unknown Data", "m2pa.unknown_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} },
|
||||
{ &hf_undecode_data,{ "Undecoded data", "m2pa.undecoded_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL} }
|
||||
|
@ -586,9 +586,9 @@ proto_register_m2pa(void)
|
|||
};
|
||||
|
||||
static enum_val_t m2pa_version_options[] = {
|
||||
{ "draft-2", "Internet Draft version 2", M2PA_V02 },
|
||||
{ "draft-8", "Internet Draft version 8", M2PA_V08 },
|
||||
{ "draft-12", "Internet Draft version 12", M2PA_V12 },
|
||||
{ "draft-2", "Internet Draft version 2", M2PA_V02 },
|
||||
{ "draft-8", "Internet Draft version 8", M2PA_V08 },
|
||||
{ "RFC4165", "RFC 4165", M2PA_RFC4165 },
|
||||
{ NULL, NULL, 0 }
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue