diff options
-rw-r--r-- | epan/dissectors/packet-clnp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-http.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ip.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ipv6.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ldp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-mq.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ndmp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtsp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-sip.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-smb.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-smpp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sna.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-x25.c | 2 | ||||
-rw-r--r-- | plugins/opsi/packet-opsi.c | 2 |
16 files changed, 21 insertions, 21 deletions
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 974e832395..4d543e12a9 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -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[] = { diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 15ad13d7a6..a4760e7fab 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -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; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index fc538eff07..f1542bd5e2 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -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. diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index b05bedfa1d..08c1e24765 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -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; diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index b8706d168d..4bdcb2ca1a 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -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)) diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index bb3ec4ae2e..d92c5f21ae 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -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 */ diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 6dacbc0da1..3c458d641e 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -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; diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 4a70e2d8d1..632a4a2070 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -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 diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 7b8b22ff73..3e8844b780 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -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. diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 46cd8921fd..3587e22c6d 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -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 diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 94fe2801b9..dd2176a05d 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -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); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 22514d9d6b..d17e4dd5a3 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -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; diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 8c5c5380dc..c1fbc68119 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -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 diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index e340a9d5b9..e652974f38 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -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; diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 8724b54a58..0e11c5fcc3 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -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 */ diff --git a/plugins/opsi/packet-opsi.c b/plugins/opsi/packet-opsi.c index ef36a040e4..41cfd5aa96 100644 --- a/plugins/opsi/packet-opsi.c +++ b/plugins/opsi/packet-opsi.c @@ -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); } |