diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2003-04-19 20:09:00 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2003-04-19 20:09:00 +0000 |
| commit | 58c20781a0524dab59671c26904faf89ce328645 (patch) | |
| tree | f91ae4ffff5e7f9f454b994498b7f979a35f7aea /packet-m2tp.c | |
| parent | 9cd871da88297e92abc77e847760d1be5a5f42cb (diff) | |
- add INFO column stuff using fence.
- change my e-mail address
svn path=/trunk/; revision=7500
Diffstat (limited to 'packet-m2tp.c')
| -rw-r--r-- | packet-m2tp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/packet-m2tp.c b/packet-m2tp.c index d5678ef964..1bb5ebc26d 100644 --- a/packet-m2tp.c +++ b/packet-m2tp.c @@ -5,7 +5,7 @@ * * Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com> * - * $Id: packet-m2tp.c,v 1.6 2003/01/14 23:53:32 guy Exp $ + * $Id: packet-m2tp.c,v 1.7 2003/04/19 20:09:00 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -272,10 +272,10 @@ dissect_m2tp_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot message_type = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET); message_length = tvb_get_ntohl (common_header_tvb, MESSAGE_LENGTH_OFFSET); - if ((check_col(pinfo->cinfo, COL_INFO)) && (message_class != MESSAGE_CLASS_DATA_MESSAGE)){ - col_append_str(pinfo->cinfo, COL_INFO, - val_to_str(message_class * 256 + message_type, m2tp_message_class_type_acro_values, "reserved")); - col_append_str(pinfo->cinfo, COL_INFO, " "); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(message_class * 256 + message_type, m2tp_message_class_type_acro_values, "reserved")); + if (!(message_class == MESSAGE_CLASS_DATA_MESSAGE && message_type == MESSAGE_TYPE_DATA)) + col_set_fence(pinfo->cinfo, COL_INFO); }; if (m2tp_tree) { @@ -416,9 +416,6 @@ dissect_m2tp_protocol_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parame mtp2_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, protocol_data_length, protocol_data_length); call_dissector(mtp2_handle, mtp2_tvb, pinfo, tree); - if ((check_col(pinfo->cinfo, COL_INFO)) && (!proto_is_protocol_enabled(mtp2_proto_id))) - col_append_str(pinfo->cinfo, COL_INFO, "DATA"); - if (parameter_tree) { proto_item_set_text(parameter_item, "Protocol data (SS7 message)"); proto_item_set_len(parameter_item, proto_item_get_len(parameter_item) - protocol_data_length - padding_length); |