From Alejandro Vaquero:

 New "Fax T38 Analysis" added to the "Statistics" menu to:

- Reassemble the HDLC t30 frames and dissect the header.
- Analyze the UPDTLPacket seq num for packet lost
- Stats of V.x Data:
    - Count the Data bytes
    - Duration
    - Wrong seq num
    - Max Burst of packet lost


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16073 f5534014-38df-0310-8fa8-9805f1628bb7

3 files changed, 103 insertions, 2 deletions

diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 512046f290..ab03a8a090 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -51,6 +51,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/tap.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -67,6 +68,8 @@
 static guint global_t38_tcp_port = PORT_T38;
 static guint global_t38_udp_port = PORT_T38;
 
+static int t38_tap = -1;
+
 /*
 * Variables to allow for proper deletion of dissector registration when
 * the user changes port from the gui.
@@ -171,6 +174,13 @@ static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 /* Preferences bool to control whether or not setup info should be shown */
 static gboolean global_t38_show_setup_info = TRUE;
 
+/* Can tap up to 4 T38 packets within same packet */
+/* We only tap the primary part, not the redundancy */
+#define MAX_T38_MESSAGES_IN_PACKET 4
+static t38_packet_info t38_info_arr[MAX_T38_MESSAGES_IN_PACKET];
+static int t38_info_current=0;
+static t38_packet_info *t38_info=NULL;
+
 /* Set up an T38 conversation */
 void t38_add_address(packet_info *pinfo,
                      address *addr, int port,
@@ -292,7 +302,7 @@ static const per_choice_t t30_indicator_choice[] = {
 	{ 0, NULL, 0, NULL }
 };
 
-static const value_string t30_indicator_vals[] = {
+const value_string t30_indicator_vals[] = {
 	{ 0, "no-signal" },
 	{ 1, "cng" },
 	{ 2, "ced" },
@@ -330,6 +340,11 @@ dissect_t38_t30_indicator(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
         col_append_fstr(pinfo->cinfo, COL_INFO, " t30ind: %s",
          val_to_str(T30ind_value,t30_indicator_vals,"<unknown>"));
 	}
+
+	/* info for tap */
+	if (primary_part)
+		t38_info->t30ind_value = T30ind_value;
+
 	return offset;
 }
 
@@ -397,6 +412,12 @@ dissect_t38_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
         col_append_fstr(pinfo->cinfo, COL_INFO, " data:%s:",
          val_to_str(Data_value,data_vals,"<unknown>"));
 	}
+
+	
+	/* info for tap */
+	if (primary_part)
+		t38_info->data_value = Data_value;
+
 	return offset;
 }
 
@@ -419,6 +440,10 @@ dissect_t38_Type_of_msg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto
                               ett_t38_Type_of_msg, Type_of_msg_choice,
                               &Type_of_msg_value);
 
+  /* info for tap */
+  if (primary_part)
+    t38_info->type_msg = Type_of_msg_value;
+
   return offset;
 }
 
@@ -511,6 +536,16 @@ dissect_t38_Data_Field_field_type(tvbuff_t *tvb, int offset, packet_info *pinfo,
          val_to_str(Data_Field_field_type_value,Data_Field_field_type_vals,"<unknown>"));
 	}
 
+	/* info for tap */
+	if (primary_part) {
+		if ( (t38_info->t38_info_data_item_index < MAX_T38_DATA_ITEMS) && (t38_info->t38_info_data_item_index >= 0) ){ /*sanity check */
+			t38_info->data_type[t38_info->t38_info_data_item_index] = Data_Field_field_type_value;
+
+			if (t38_info->t38_info_data_item_index++ == MAX_T38_DATA_ITEMS-1) t38_info->t38_info_data_item_index = 1;
+		}
+	}
+
+
     return offset;
 }
 
@@ -535,6 +570,16 @@ dissect_t38_Data_Field_field_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
                tvb_bytes_to_str(value_tvb,0,7));
         }
 	}
+
+
+	/* info for tap */
+	if (primary_part) {
+		if ( (t38_info->t38_info_data_item_index <= MAX_T38_DATA_ITEMS) && (t38_info->t38_info_data_item_index > 0) ){ /*sanity check */
+			t38_info->data_len[t38_info->t38_info_data_item_index-1] = value_len;
+			t38_info->data[t38_info->t38_info_data_item_index-1] = tvb_memdup(value_tvb,0,value_len);
+		}
+	}
+
 	return offset;
 }
 
@@ -591,6 +636,10 @@ dissect_t38_seq_number(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 	offset=dissect_per_constrained_integer(tvb, offset, pinfo,
 		tree, hf_t38_seq_number, 0, 65535,
 		&seq_number, NULL, FALSE);
+	
+	/* info for tap */
+	if (primary_part)
+		t38_info->seq_num = seq_number;
 
       if (check_col(pinfo->cinfo, COL_INFO)){
         col_append_fstr(pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
@@ -630,7 +679,8 @@ dissect_t38_secondary_ifp_packets(tvbuff_t *tvb, int offset, packet_info *pinfo,
 {
     /* When the field-data is not present, we MUST offset 1 byte*/
     if((Data_Field_field_type_value != 0) &&
-       (Data_Field_field_type_value != 6))
+       (Data_Field_field_type_value != 6) &&
+	   (Data_Field_field_type_value != 7))
     {
         offset=offset+8;
     }
@@ -745,6 +795,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_item *it;
 	proto_tree *tr;
 	guint32 offset=0;
+	int i;
 
 	/*
 	 * XXX - heuristic to check for misidentified packets.
@@ -757,6 +808,25 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		}
 	}
 
+	/* tap info */
+	t38_info_current++;
+	if (t38_info_current==MAX_T38_MESSAGES_IN_PACKET) {
+		t38_info_current=0;
+	}
+	t38_info = &t38_info_arr[t38_info_current];
+
+	t38_info->seq_num = 0;
+	t38_info->type_msg = 0;
+	t38_info->data_value = 0;
+	t38_info->t30ind_value =0;
+
+	t38_info->t38_info_data_item_index = 0;
+	for (i=0; i<MAX_T38_DATA_ITEMS; i++) {
+		t38_info->data_type[i] = 0;
+		t38_info->data[i] = NULL;
+		t38_info->data_len[i] = 0;
+	}
+
 	if (check_col(pinfo->cinfo, COL_PROTOCOL)){
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
 	}
@@ -794,6 +864,18 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
 		}
 	}
+	
+	/* if is a valid t38 packet, add to tap */
+	if (!pinfo->in_error_pkt)
+		tap_queue_packet(t38_tap, pinfo, t38_info);
+	else { /* if not, free the data */
+		for (i=0; i<MAX_T38_DATA_ITEMS; i++) {
+			t38_info->data_type[i] = 0;
+			g_free(t38_info->data[i]);
+			t38_info->data[i] = NULL;
+			t38_info->data_len[i] = 0;
+		}
+	}
 }
 
 static void
@@ -1037,6 +1119,8 @@ proto_register_t38(void)
 	proto_register_subtree_array(ett, array_length(ett));
 	register_dissector("t38", dissect_t38, proto_t38);
 
+	t38_tap = register_tap("t38");
+
 	t38_module = prefs_register_protocol(proto_t38, proto_reg_handoff_t38);
 	prefs_register_bool_preference(t38_module, "use_pre_corrigendum_asn1_specification",
 	    "Use the Pre-Corrigendum ASN.1 specification",
diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h
index 49b1421d18..e740643d27 100644
--- a/epan/dissectors/packet-t38.h
+++ b/epan/dissectors/packet-t38.h
@@ -25,6 +25,20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#define MAX_T38_DATA_ITEMS 4
+typedef struct _t38_packet_info {
+	guint16 seq_num;	/* UDPTLPacket sequence number */
+	guint32 type_msg;	/* 0=t30-indicator    1=data */
+	guint32 t30ind_value;
+	guint32 data_value;	/* standard and speed */
+
+	int t38_info_data_item_index; /* this will have the number of Data Items in the packet and is used as the index when decoding the packet */
+	guint32 data_type[MAX_T38_DATA_ITEMS];
+	guint8 *data[MAX_T38_DATA_ITEMS];
+	gint data_len[MAX_T38_DATA_ITEMS];
+} t38_packet_info;
+
+
 /* Info to save in T38 conversation / packet-info */
 #define MAX_T38_SETUP_METHOD_SIZE 7
 struct _t38_conversation_info
@@ -38,3 +52,5 @@ void t38_add_address(packet_info *pinfo,
                      address *addr, int port,
                      int other_port,
                      const gchar *setup_method, guint32 setup_frame_number);
+
+ETH_VAR_IMPORT const value_string t30_indicator_vals[];
diff --git a/epan/libethereal.def b/epan/libethereal.def
index 797bb92280..b85c264a0b 100644
--- a/epan/libethereal.def
+++ b/epan/libethereal.def
@@ -557,6 +557,7 @@ stats_tree_reset
 stats_tree_tick_pivot
 stats_tree_tick_range
 string_to_name_resolve
+t30_indicator_vals		DATA
 T_h323_message_body_vals	DATA
 tap_push_tapped_queue
 tap_queue_init