* print routines
*/
int proto_media = -1;
+static heur_dissector_list_t heur_subdissector_list;
static void
dissect_media(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree)
{
int bytes;
+ if (dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) {
+ return;
+ }
+
/* Add media type to the INFO column if it is visible */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", pinfo->match_string);
"media" /* abbrev */
);
register_dissector("media", dissect_media, proto_media);
+ register_heur_dissector_list("media", &heur_subdissector_list);
+
/*
* "Media" is used to dissect something whose normal dissector
#include <epan/dtd.h>
#include <epan/report_err.h>
#include <epan/filesystem.h>
+#include <epan/prefs.h>
typedef struct _xml_ns_t {
/* the name of this namespace */
/* parser definitions */
static tvbparse_wanted_t* want;
static tvbparse_wanted_t* want_ignore;
+static tvbparse_wanted_t* want_heur;
static GHashTable* xmpli_names;
static GHashTable* media_types;
static xml_ns_t unknown_ns = {"unknown","?",-1,-1,-1,NULL,NULL,NULL};
static xml_ns_t* root_ns;
+static gboolean pref_heuristic = FALSE;
+
#define XML_CDATA -1000
#define XML_SCOPED_NAME -1001
"application/resource-lists+xml",
};
-
static void
dissect_xml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
while(( tok = tvbparse_get(tt, want) )) ;
}
+static gboolean dissect_xml_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+ if ( pref_heuristic && tvbparse_peek(tvbparse_init(tvb,0,-1,NULL,want_ignore), want_heur)) {
+ dissect_xml(tvb, pinfo, tree);
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+}
static void after_token(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
GPtrArray* stack = tvbparse_data;
tvbparse_not_chars(-1,1,0," \t\r\n",NULL,NULL,unrecognized_token),
NULL);
+ want_heur = tvbparse_set_oneof(-1, NULL, NULL, NULL,
+ want_comment,
+ want_xmlpi,
+ want_doctype_start,
+ want_dtd_tag,
+ want_tag,
+ NULL);
}
#endif
}
+static void apply_prefs(void) {
+ if (pref_heuristic) {
+ heur_dissector_add("http", dissect_xml_heur, xml_ns.hf_tag);
+ heur_dissector_add("media", dissect_xml_heur, xml_ns.hf_tag);
+ }
+}
+
void
proto_register_xml(void) {
-
static gint *ett_base[] = {
&unknown_ns.ett,
&xml_ns.ett,
{ &unknown_ns.hf_cdata, {"CDATA", "xml.cdata", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
{ &unknown_ns.hf_tag, {"Tag", "xml.tag", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
{ &xml_ns.hf_cdata, {"Unknown", "xml.unknown", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }}
- };
+ };
+ module_t* xml_module;
hf_arr = g_array_new(FALSE,FALSE,sizeof(hf_register_info));
ett_arr = g_array_new(FALSE,FALSE,sizeof(gint*));
proto_register_field_array(xml_ns.hf_tag, (hf_register_info*)hf_arr->data, hf_arr->len);
proto_register_subtree_array((gint**)ett_arr->data, ett_arr->len);
-
+
+ xml_module = prefs_register_protocol(xml_ns.hf_tag,apply_prefs);
+ prefs_register_bool_preference(xml_module, "heuristic", "Use Heuristics",
+ "Try to recognize XML for unknown HTTP media types",
+ &pref_heuristic);
+
g_array_free(hf_arr,FALSE);
g_array_free(ett_arr,TRUE);
xml_handle = find_dissector("xml");
g_hash_table_foreach(media_types,add_dissector_media,NULL);
-
+
}
#define TVBPARSE_DEBUG_FIND 0x00000100
#define TVBPARSE_DEBUG_NEWTOK 0x00000080
#define TVBPARSE_DEBUG_IGNORE 0x00000040
-/*#define TVBPARSE_DEBUG_ 0x00000020
-#define TVBPARSE_DEBUG_ 0x00000010
+#define TVBPARSE_DEBUG_PEEK 0x00000020
+/*#define TVBPARSE_DEBUG_ 0x00000010
#define TVBPARSE_DEBUG_ 0x00000008
#define TVBPARSE_DEBUG_ 0x00000004
#define TVBPARSE_DEBUG_ 0x00000002
}
+gboolean tvbparse_peek(tvbparse_t* tt,
+ const tvbparse_wanted_t* wanted) {
+ tvbparse_elem_t* tok = NULL;
+ int consumed;
+ int offset = tt->offset;
+
+#ifdef TVBPARSE_DEBUG
+ if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_PEEK) g_warning("tvbparse_peek: ENTER offset=%i",offset);
+#endif
+
+ offset += ignore(tt,offset);
+
+#ifdef TVBPARSE_DEBUG
+ if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_PEEK) g_warning("tvbparse_peek: after ignore offset=%i",offset);
+#endif
+
+ consumed = wanted->condition(tt,offset,wanted,&tok);
+
+ if (consumed >= 0) {
+#ifdef TVBPARSE_DEBUG
+ if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_PEEK) g_warning("tvbparse_peek: GOT len=%i",consumed);
+#endif
+ return TRUE;
+ } else {
+#ifdef TVBPARSE_DEBUG
+ if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_PEEK) g_warning("tvbparse_peek: NOT GOT");
+#endif
+ return FALSE;
+ }
+
+}
+
tvbparse_elem_t* tvbparse_get(tvbparse_t* tt,
const tvbparse_wanted_t* wanted) {
tvbparse_elem_t* tok = NULL;