aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-t38.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-t38.c')
-rw-r--r--epan/dissectors/packet-t38.c76
1 files changed, 27 insertions, 49 deletions
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 4527d635b5..b3b6b19cd6 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -68,10 +68,6 @@
void proto_register_t38(void);
-#define PORT_T38 6004
-static guint global_t38_tcp_port = PORT_T38;
-static guint global_t38_udp_port = PORT_T38;
-
static int t38_tap = -1;
/* dissect using the Pre Corrigendum T.38 ASN.1 specification (1998) */
@@ -145,7 +141,7 @@ static int hf_t38_fec_data = -1; /* T_fec_data */
static int hf_t38_fec_data_item = -1; /* OCTET_STRING */
/*--- End of included file: packet-t38-hf.c ---*/
-#line 118 "../../asn1/t38/packet-t38-template.c"
+#line 114 "../../asn1/t38/packet-t38-template.c"
/* T38 setup fields */
static int hf_t38_setup = -1;
@@ -179,7 +175,7 @@ static gint ett_t38_T_fec_info = -1;
static gint ett_t38_T_fec_data = -1;
/*--- End of included file: packet-t38-ett.c ---*/
-#line 138 "../../asn1/t38/packet-t38-template.c"
+#line 134 "../../asn1/t38/packet-t38-template.c"
static gint ett_t38_setup = -1;
static gint ett_data_fragment = -1;
@@ -318,25 +314,25 @@ void t38_add_address(packet_info *pinfo,
*/
g_strlcpy(p_conversation_data->setup_method, setup_method, MAX_T38_SETUP_METHOD_SIZE);
p_conversation_data->setup_frame_number = setup_frame_number;
- p_conversation_data->src_t38_info.reass_ID = 0;
- p_conversation_data->src_t38_info.reass_start_seqnum = -1;
- p_conversation_data->src_t38_info.reass_data_type = 0;
- p_conversation_data->src_t38_info.last_seqnum = -1;
- p_conversation_data->src_t38_info.packet_lost = 0;
- p_conversation_data->src_t38_info.burst_lost = 0;
- p_conversation_data->src_t38_info.time_first_t4_data = 0;
- p_conversation_data->src_t38_info.additional_hdlc_data_field_counter = 0;
- p_conversation_data->src_t38_info.seqnum_prev_data_field = -1;
-
- p_conversation_data->dst_t38_info.reass_ID = 0;
- p_conversation_data->dst_t38_info.reass_start_seqnum = -1;
- p_conversation_data->dst_t38_info.reass_data_type = 0;
- p_conversation_data->dst_t38_info.last_seqnum = -1;
- p_conversation_data->dst_t38_info.packet_lost = 0;
- p_conversation_data->dst_t38_info.burst_lost = 0;
- p_conversation_data->dst_t38_info.time_first_t4_data = 0;
- p_conversation_data->dst_t38_info.additional_hdlc_data_field_counter = 0;
- p_conversation_data->dst_t38_info.seqnum_prev_data_field = -1;
+ p_conversation_data->src_t38_info.reass_ID = 0;
+ p_conversation_data->src_t38_info.reass_start_seqnum = -1;
+ p_conversation_data->src_t38_info.reass_data_type = 0;
+ p_conversation_data->src_t38_info.last_seqnum = -1;
+ p_conversation_data->src_t38_info.packet_lost = 0;
+ p_conversation_data->src_t38_info.burst_lost = 0;
+ p_conversation_data->src_t38_info.time_first_t4_data = 0;
+ p_conversation_data->src_t38_info.additional_hdlc_data_field_counter = 0;
+ p_conversation_data->src_t38_info.seqnum_prev_data_field = -1;
+
+ p_conversation_data->dst_t38_info.reass_ID = 0;
+ p_conversation_data->dst_t38_info.reass_start_seqnum = -1;
+ p_conversation_data->dst_t38_info.reass_data_type = 0;
+ p_conversation_data->dst_t38_info.last_seqnum = -1;
+ p_conversation_data->dst_t38_info.packet_lost = 0;
+ p_conversation_data->dst_t38_info.burst_lost = 0;
+ p_conversation_data->dst_t38_info.time_first_t4_data = 0;
+ p_conversation_data->dst_t38_info.additional_hdlc_data_field_counter = 0;
+ p_conversation_data->dst_t38_info.seqnum_prev_data_field = -1;
}
@@ -982,7 +978,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
/*--- End of included file: packet-t38-fn.c ---*/
-#line 397 "../../asn1/t38/packet-t38-template.c"
+#line 393 "../../asn1/t38/packet-t38-template.c"
/* initialize the tap t38_info and the conversation */
static void
@@ -1145,7 +1141,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
proto_item *it;
proto_tree *tr;
guint32 offset=0;
- tvbuff_t *next_tvb;
+ tvbuff_t *next_tvb;
guint16 ifp_packet_number=1;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
@@ -1323,7 +1319,7 @@ proto_register_t38(void)
"OCTET_STRING", HFILL }},
/*--- End of included file: packet-t38-hfarr.c ---*/
-#line 661 "../../asn1/t38/packet-t38-template.c"
+#line 657 "../../asn1/t38/packet-t38-template.c"
{ &hf_t38_setup,
{ "Stream setup", "t38.setup", FT_STRING, BASE_NONE,
NULL, 0x0, "Stream setup, method and frame number", HFILL }},
@@ -1384,7 +1380,7 @@ proto_register_t38(void)
&ett_t38_T_fec_data,
/*--- End of included file: packet-t38-ettarr.c ---*/
-#line 708 "../../asn1/t38/packet-t38-template.c"
+#line 704 "../../asn1/t38/packet-t38-template.c"
&ett_t38_setup,
&ett_data_fragment,
&ett_data_fragments
@@ -1422,14 +1418,8 @@ proto_register_t38(void)
"be dissected as RTP packet or T.38 packet. If enabled there is a risk that T.38 UDPTL "
"packets with sequence number higher than 32767 may be dissected as RTP.",
&dissect_possible_rtpv2_packets_as_rtp);
- prefs_register_uint_preference(t38_module, "tcp.port",
- "T.38 TCP Port",
- "Set the TCP port for T.38 messages",
- 10, &global_t38_tcp_port);
- prefs_register_uint_preference(t38_module, "udp.port",
- "T.38 UDP Port",
- "Set the UDP port for T.38 messages",
- 10, &global_t38_udp_port);
+ prefs_register_obsolete_preference(t38_module, "tcp.port");
+ prefs_register_obsolete_preference(t38_module, "udp.port");
prefs_register_bool_preference(t38_module, "reassembly",
"Reassemble T.38 PDUs over TPKT over TCP",
"Whether the dissector should reassemble T.38 PDUs spanning multiple TCP segments "
@@ -1454,8 +1444,6 @@ void
proto_reg_handoff_t38(void)
{
static gboolean t38_prefs_initialized = FALSE;
- static guint tcp_port;
- static guint udp_port;
if (!t38_prefs_initialized) {
t38_udp_handle=create_dissector_handle(dissect_t38_udp, proto_t38);
@@ -1466,15 +1454,5 @@ proto_reg_handoff_t38(void)
data_handle = find_dissector("data");
t38_prefs_initialized = TRUE;
}
- else {
- dissector_delete_uint("tcp.port", tcp_port, t38_tcp_handle);
- dissector_delete_uint("udp.port", udp_port, t38_udp_handle);
- }
- tcp_port = global_t38_tcp_port;
- udp_port = global_t38_udp_port;
-
- dissector_add_uint("tcp.port", tcp_port, t38_tcp_handle);
- dissector_add_uint("udp.port", udp_port, t38_udp_handle);
-
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 13:38:02 +0000