Hi All,

  Find attached a couple of changes for t38:
- Use the dissector to reassemble t30 frames
- Dissect t30 protocol
- Move the "Fax t38 analysis" to the "VoIP Calls". Now when selecting
"Statistics"->"Fax t38 analysis" option, there is a message that
redirect the user to use the "Voip calls" instead. We may keep this
option for one release, and then remove it ?
- Added in the "Voip calls" the ability to detect a t38 call if there
are not signaling associated with it. For example, when using "Decode
as.." to dissect t38 packets, it is possible to use the "Voip calls" to                                                      analyze that call.
- Display "SDP (t38)" in the "Voip calls graph" for SDP t38 sessions.

Regards
Alejandro Vaquero



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

1 files changed, 36 insertions, 10 deletions

diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h
index e740643d27..5fe9257951 100644
--- a/epan/dissectors/packet-t38.h
+++ b/epan/dissectors/packet-t38.h
@@ -26,26 +26,46 @@
  */
 
 #define MAX_T38_DATA_ITEMS 4
+#define MAX_T38_DESC 128
+
 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];
+	guint32 setup_frame_number;
+	guint32 Data_Field_field_type_value;
+	guint8	t30_Facsimile_Control;
+	gchar   desc[MAX_T38_DESC]; /* Description used to be displayed in the frame label Graph Anlaysis */
+	gchar   desc_comment[MAX_T38_DESC]; /* Description used to be displayed in the Comment Graph Anlaysis */
+	double time_first_t4_data; 
+	guint32 frame_num_first_t4_data;
 } t38_packet_info;
 
 
-/* Info to save in T38 conversation / packet-info */
 #define MAX_T38_SETUP_METHOD_SIZE 7
-struct _t38_conversation_info
+
+
+/* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */
+typedef struct _t38_conv_info
 {
-	gchar   method[MAX_T38_SETUP_METHOD_SIZE + 1];
-	guint32 frame_number;
-};
+	guint32 reass_ID;
+	int reass_start_seqnum;
+	guint32 reass_data_type;
+	gint32 last_seqnum; /* used to avoid duplicated seq num shown in the Graph Analysis */
+	guint32 packet_lost;
+	guint32 burst_lost;
+	double time_first_t4_data; 
+} t38_conv_info;
+
+/* Info to save the State to reassemble Data (e.g. HDLC) and the Setup (e.g. SDP) in T38 conversations */
+typedef struct _t38_conv
+{
+	gchar   setup_method[MAX_T38_SETUP_METHOD_SIZE + 1];
+	guint32 setup_frame_number;
+	t38_conv_info src_t38_info;
+	t38_conv_info dst_t38_info;
+} t38_conv;
 
 /* Add an T38 conversation with the given details */
 void t38_add_address(packet_info *pinfo,
@@ -54,3 +74,9 @@ void t38_add_address(packet_info *pinfo,
                      const gchar *setup_method, guint32 setup_frame_number);
 
 ETH_VAR_IMPORT const value_string t30_indicator_vals[];
+ETH_VAR_IMPORT const value_string t30_facsimile_control_field_vals[];
+ETH_VAR_IMPORT const value_string t30_facsimile_control_field_vals_short[];
+ETH_VAR_IMPORT const value_string t30_data_vals[];
+
+
+