osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

fix #480: Change defaults for all reassembling settings to ON 

I've changed all settings I could find to TRUE. It might be reasonable to change some protocol settings back to FALSE, if reassembling fails very often.

svn path=/trunk/; revision=16048
This commit is contained in:
Ulf Lamping 2005-09-28 22:15:38 +00:00
parent f9a96d8a16
commit 9a42ef9536
16 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-clnp.c
View File

@ -376,8 +376,8 @@ static GHashTable *cotp_reassembled_table = NULL;
/* options */
static guint tp_nsap_selector = NSEL_TP;
static gboolean always_decode_transport = FALSE;
static gboolean clnp_reassemble = FALSE;
static gboolean cotp_reassemble = FALSE;
static gboolean clnp_reassemble = TRUE;
static gboolean cotp_reassemble = TRUE;
static gint32 tsap_display = TSAP_DISPLAY_AUTO;
const enum_val_t tsap_display_options[] = {

2
epan/dissectors/packet-dcerpc.c
View File

@ -536,7 +536,7 @@ static gboolean dcerpc_cn_desegment = TRUE;
reassembly of co dcerpc fragments will not work for the case where TCP/SMB frames
are coming in out of sequence, but that will hurt in a lot of other places as well.
*/
static gboolean dcerpc_reassemble = FALSE;
static gboolean dcerpc_reassemble = TRUE;
static GHashTable *dcerpc_co_fragment_table = NULL;
static GHashTable *dcerpc_co_reassemble_table = NULL;
static GHashTable *dcerpc_cl_reassemble_table = NULL;

4
epan/dissectors/packet-http.c
View File

@ -107,14 +107,14 @@ static dissector_handle_t http_handle;
* desegmentation of HTTP headers
* (when we are over TCP or another protocol providing the desegmentation API)
*/
static gboolean http_desegment_headers = FALSE;
static gboolean http_desegment_headers = TRUE;
/*
* desegmentation of HTTP bodies
* (when we are over TCP or another protocol providing the desegmentation API)
* TODO let the user filter on content-type the bodies he wants desegmented
*/
static gboolean http_desegment_body = FALSE;
static gboolean http_desegment_body = TRUE;
/*
* De-chunking of content-encoding: chunk entity bodies.

2
epan/dissectors/packet-ip.c
View File

@ -63,7 +63,7 @@ static void dissect_icmp(tvbuff_t *, packet_info *, proto_tree *);
static gboolean g_ip_dscp_actif = TRUE;
/* Defragment fragmented IP datagrams */
static gboolean ip_defragment = FALSE;
static gboolean ip_defragment = TRUE;
/* Place IP summary in proto tree */
static gboolean ip_summary_in_tree = TRUE;

2
epan/dissectors/packet-ipv6.c
View File

@ -100,7 +100,7 @@ static dissector_handle_t data_handle;
static dissector_table_t ip_dissector_table;
/* Reassemble fragmented datagrams */
static gboolean ipv6_reassemble = FALSE;
static gboolean ipv6_reassemble = TRUE;
#ifndef offsetof
#define offsetof(type, member) ((size_t)(&((type *)0)->member))

2
epan/dissectors/packet-ldp.c
View File

@ -238,7 +238,7 @@ static int tcp_port = 0;
static int udp_port = 0;
/* desegmentation of LDP over TCP */
static gboolean ldp_desegment = FALSE;
static gboolean ldp_desegment = TRUE;
/* Add your functions here */

2
epan/dissectors/packet-mq.c
View File

@ -364,7 +364,7 @@ static dissector_handle_t data_handle;
static heur_dissector_list_t mq_heur_subdissector_list;
static gboolean mq_desegment = TRUE;
static gboolean mq_reassembly = FALSE;
static gboolean mq_reassembly = TRUE;
static GHashTable *mq_fragment_table = NULL;
static GHashTable *mq_reassembled_table = NULL;

2
epan/dissectors/packet-ndmp.c
View File

@ -270,7 +270,7 @@ struct ndmp_header {
static gboolean ndmp_desegment = TRUE;
/* defragmentation of fragmented NDMP records */
static gboolean ndmp_defragment = FALSE;
static gboolean ndmp_defragment = TRUE;
#define NDMP_MESSAGE_REQUEST 0x00
#define NDMP_MESSAGE_REPLY 0x01

2
epan/dissectors/packet-rpc.c
View File

@ -67,7 +67,7 @@
static gboolean rpc_desegment = TRUE;
/* defragmentation of fragmented RPC over TCP records */
static gboolean rpc_defragment = FALSE;
static gboolean rpc_defragment = TRUE;
/* try to dissect RPC packets for programs that are not known
* (proprietary ones) by ethereal.

4
epan/dissectors/packet-rtsp.c
View File

@ -77,14 +77,14 @@ void proto_reg_handoff_rtsp(void);
* desegmentation of RTSP headers
* (when we are over TCP or another protocol providing the desegmentation API)
*/
static gboolean rtsp_desegment_headers = FALSE;
static gboolean rtsp_desegment_headers = TRUE;
/*
* desegmentation of RTSP bodies
* (when we are over TCP or another protocol providing the desegmentation API)
* TODO let the user filter on content-type the bodies he wants desegmented
*/
static gboolean rtsp_desegment_body = FALSE;
static gboolean rtsp_desegment_body = TRUE;
/* http://www.iana.org/assignments/port-numberslists two rtsp ports */
#define TCP_PORT_RTSP 554

4
epan/dissectors/packet-sip.c
View File

@ -411,13 +411,13 @@ static gboolean strict_sip_version = TRUE;
* desegmentation of SIP headers
* (when we are over TCP or another protocol providing the desegmentation API)
*/
static gboolean sip_desegment_headers = FALSE;
static gboolean sip_desegment_headers = TRUE;
/*
* desegmentation of SIP bodies
* (when we are over TCP or another protocol providing the desegmentation API)
*/
static gboolean sip_desegment_body = FALSE;
static gboolean sip_desegment_body = TRUE;
static gboolean dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, gboolean is_heur, gboolean use_reassembly);

4
epan/dissectors/packet-smb.c
View File

@ -815,8 +815,8 @@ gboolean sid_name_snooping = FALSE;
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
These are needed by the reassembly of SMB Transaction payload and DCERPC over SMB
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
static gboolean smb_trans_reassembly = FALSE;
gboolean smb_dcerpc_reassembly = FALSE;
static gboolean smb_trans_reassembly = TRUE;
gboolean smb_dcerpc_reassembly = TRUE;
static GHashTable *smb_trans_fragment_table = NULL;

2
epan/dissectors/packet-smpp.c
View File

@ -212,7 +212,7 @@ static gint ett_opt_param = -1;
static gint ett_dcs = -1;
/* Reassemble SMPP TCP segments */
static gboolean reassemble_over_tcp = FALSE;
static gboolean reassemble_over_tcp = TRUE;
/*
* Value-arrays for field-contents

2
epan/dissectors/packet-sna.c
View File

@ -300,7 +300,7 @@ static gint ett_sna_control_0e = -1;
static dissector_handle_t data_handle;
/* Defragment fragmented SNA BIUs*/
static gboolean sna_defragment = FALSE;
static gboolean sna_defragment = TRUE;
static GHashTable *sna_fragment_table = NULL;
static GHashTable *sna_reassembled_table = NULL;

2
epan/dissectors/packet-x25.c
View File

@ -216,7 +216,7 @@ static dissector_handle_t data_handle;
/* Preferences */
static gboolean payload_is_qllc_sna = FALSE;
static gboolean reassemble_x25 = FALSE;
static gboolean reassemble_x25 = TRUE;
/* Reassembly of X.25 */

2
plugins/opsi/packet-opsi.c
View File

@ -786,7 +786,7 @@ proto_register_opsi(void)
/* We activate the desegmentation / reassembly feature */
opsi_module = prefs_register_protocol(proto_opsi, NULL);
prefs_register_bool_preference(opsi_module, "desegment_opsi_messages",
"Desegment all OPSI messages spanning multiple TCP segments",
"Reassemble OPSI messages spanning multiple TCP segments",
"Whether the OPSI dissector should desegment all messages spanning multiple TCP segments",
&opsi_desegment);
}