#include <dirent.h>
#endif
-#include <ctype.h>
-#include <stdlib.h>
#include <string.h>
-#include <stdarg.h>
#include <errno.h>
-#include <stdio.h>
-
#include <glib.h>
+
+#include <wsutil/str_util.h>
+
#include <epan/emem.h>
#include <epan/packet.h>
-#include <epan/strutil.h>
#include <epan/tvbparse.h>
#include <epan/dtd.h>
#include <epan/report_err.h>
#include <epan/prefs.h>
#include <epan/garrayfix.h>
-typedef struct _xml_ns_t {
- /* the name of this namespace */
- gchar* name;
-
- /* its fully qualified name */
- gchar* fqn;
-
- /* the contents of the whole element from <> to </> */
- int hf_tag;
-
- /* chunks of cdata from <> to </> excluding sub tags */
- int hf_cdata;
-
- /* the subtree for its sub items */
- gint ett;
-
- GHashTable* attributes;
- /* key: the attribute name
- value: hf_id of what's between quotes */
-
- /* the namespace's namespaces */
- GHashTable* elements;
- /* key: the element name
- value: the child namespace */
-
- GPtrArray* element_names;
- /* imported directly from the parser and used while building the namespace */
-
-} xml_ns_t;
-
-typedef struct {
- proto_tree* tree;
- proto_item* item;
- proto_item* last_item;
- xml_ns_t* ns;
- int start_offset;
-} xml_frame_t;
+#include "packet-xml.h"
struct _attr_reg_data {
GArray* hf;
static gboolean pref_heuristic_media = FALSE;
static gboolean pref_heuristic_tcp = FALSE;
+static gboolean pref_heuristic_udp = FALSE;
static gboolean pref_heuristic_media_save = FALSE;
static gboolean pref_heuristic_tcp_save = FALSE;
+static gboolean pref_heuristic_udp_save = FALSE;
static range_t *global_xml_tcp_range = NULL;
static range_t *xml_tcp_range = NULL;
+static gboolean pref_heuristic_unicode = FALSE;
+
#define XML_CDATA -1000
#define XML_SCOPED_NAME -1001
-GArray* hf_arr;
-GArray* ett_arr;
+static GArray* hf_arr;
+static GArray* ett_arr;
static const gchar* default_media_types[] = {
"text/xml",
"application/rls-services+xml",
"application/smil",
"application/simple-filter+xml",
+ "application/simservs+xml",
"application/soap+xml",
+ "application/vnd.etsi.aoc+xml",
+ "application/vnd.etsi.cug+xml",
+ "application/vnd.etsi.iptvcommand+xml",
+ "application/vnd.etsi.iptvdiscovery+xml",
+ "application/vnd.etsi.iptvprofile+xml",
+ "application/vnd.etsi.iptvsad-bc+xml",
+ "application/vnd.etsi.iptvsad-cod+xml",
+ "application/vnd.etsi.iptvsad-npvr+xml",
+ "application/vnd.etsi.iptvueprofile+xml",
+ "application/vnd.etsi.mcid+xml",
+ "application/vnd.etsi.sci+xml",
+ "application/vnd.etsi.simservs+xml",
+ "application/vnd.3gpp.cw+xml",
"application/vnd.wv.csp+xml",
"application/vnd.wv.csp.xml",
"application/watcherinfo+xml",
"application/x-wms-logconnectstats",
"application/x-wms-logplaystats",
"application/x-wms-sendevent",
+ "application/rss+xml",
"image/svg+xml",
};
+static void insert_xml_frame(xml_frame_t *parent, xml_frame_t *new_child) {
+ new_child->first_child = NULL;
+ new_child->last_child = NULL;
+
+ new_child->parent = parent;
+ new_child->next_sibling = NULL;
+ new_child->prev_sibling = NULL;
+ if (parent == NULL) return; /* root */
+
+ if (parent->first_child == NULL) { /* the 1st child */
+ parent->first_child = new_child;
+ } else { /* following children */
+ parent->last_child->next_sibling = new_child;
+ new_child->prev_sibling = parent->last_child;
+ }
+ parent->last_child = new_child;
+}
+
static void
dissect_xml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
tvbparse_t* tt;
- tvbparse_elem_t* tok = NULL;
static GPtrArray* stack = NULL;
xml_frame_t* current_frame;
char* colinfo_str;
-
- if(!tree) return;
if (stack != NULL)
g_ptr_array_free(stack,TRUE);
stack = g_ptr_array_new();
current_frame = ep_alloc(sizeof(xml_frame_t));
+ current_frame->type = XML_FRAME_ROOT;
+ current_frame->name = NULL;
+ current_frame->name_orig_case = NULL;
+ current_frame->value = NULL;
+ insert_xml_frame(NULL, current_frame);
g_ptr_array_add(stack,current_frame);
tt = tvbparse_init(tvb,0,-1,stack,want_ignore);
colinfo_str = "/XML";
} else {
colinfo_str = ep_strdup_printf("/%s",root_ns->name);
- g_strup(colinfo_str);
+ ascii_strup_inplace(colinfo_str);
}
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_append_str(pinfo->cinfo, COL_PROTOCOL, colinfo_str);
+ col_append_str(pinfo->cinfo, COL_PROTOCOL, colinfo_str);
current_frame->ns = root_ns;
current_frame->tree = proto_item_add_subtree(current_frame->item,current_frame->ns->ett);
current_frame->last_item = current_frame->item;
- while(( tok = tvbparse_get(tt, want) )) ;
+ while(tvbparse_get(tt, want)) ;
+
+ pinfo->private_data = current_frame; /* pass XML structure to the dissector calling XML */
}
static gboolean dissect_xml_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
- if ( (pref_heuristic_media || pref_heuristic_tcp)
- && tvbparse_peek(tvbparse_init(tvb,0,-1,NULL,want_ignore), want_heur)) {
- dissect_xml(tvb, pinfo, tree);
- return TRUE;
- } else {
- return FALSE;
- }
+ if (pref_heuristic_media || pref_heuristic_tcp || pref_heuristic_udp) {
+ if (tvbparse_peek(tvbparse_init(tvb,0,-1,NULL,want_ignore), want_heur)) {
+ dissect_xml(tvb, pinfo, tree);
+ return TRUE;
+ } else if (pref_heuristic_unicode) {
+ const guint8 *data = tvb_get_ephemeral_unicode_string(tvb, 0, tvb_length(tvb)/2, ENC_LITTLE_ENDIAN);
+ tvbuff_t *unicode_tvb = tvb_new_child_real_data(tvb, data, tvb_length(tvb)/2, tvb_length(tvb)/2);
+ if (tvbparse_peek(tvbparse_init(unicode_tvb,0,-1,NULL,want_ignore), want_heur)) {
+ add_new_data_source(pinfo, unicode_tvb, "UTF8");
+ dissect_xml(unicode_tvb, pinfo, tree);
+ return TRUE;
+ }
+ }
+ }
+ return FALSE;
+}
+
+xml_frame_t *xml_get_tag(xml_frame_t *frame, const gchar *name) {
+ xml_frame_t *tag = NULL;
+
+ xml_frame_t *xml_item = frame->first_child;
+ while (xml_item) {
+ if (xml_item->type == XML_FRAME_TAG) {
+ if (!name) { /* get the 1st tag */
+ tag = xml_item;
+ break;
+ } else if (xml_item->name_orig_case && !strcmp(xml_item->name_orig_case, name)) {
+ tag = xml_item;
+ break;
+ }
+ }
+ xml_item = xml_item->next_sibling;
+ }
+
+ return tag;
+}
+
+xml_frame_t *xml_get_attrib(xml_frame_t *frame, const gchar *name) {
+ xml_frame_t *attr = NULL;
+
+ xml_frame_t *xml_item = frame->first_child;
+ while (xml_item) {
+ if ((xml_item->type == XML_FRAME_ATTRIB) &&
+ xml_item->name_orig_case && !strcmp(xml_item->name_orig_case, name)) {
+ attr = xml_item;
+ break;
+ }
+ xml_item = xml_item->next_sibling;
+ }
+
+ return attr;
+}
+
+xml_frame_t *xml_get_cdata(xml_frame_t *frame) {
+ xml_frame_t *cdata = NULL;
+
+ xml_frame_t *xml_item = frame->first_child;
+ while (xml_item) {
+ if (xml_item->type == XML_FRAME_CDATA) {
+ cdata = xml_item;
+ break;
+ }
+ xml_item = xml_item->next_sibling;
+ }
+
+ return cdata;
}
static void after_token(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
GPtrArray* stack = tvbparse_data;
xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
int hfid;
+ gboolean is_cdata = FALSE;
proto_item* pi;
+ xml_frame_t* new_frame;
if (tok->id == XML_CDATA) {
hfid = current_frame->ns ? current_frame->ns->hf_cdata : xml_ns.hf_cdata;
+ is_cdata = TRUE;
} else if ( tok->id > 0) {
hfid = tok->id;
} else {
proto_item_set_text(pi, "%s",
tvb_format_text(tok->tvb,tok->offset,tok->len));
+
+ if (is_cdata) {
+ new_frame = ep_alloc(sizeof(xml_frame_t));
+ new_frame->type = XML_FRAME_CDATA;
+ new_frame->name = NULL;
+ new_frame->name_orig_case = NULL;
+ new_frame->value = tvb_new_subset(tok->tvb, tok->offset, tok->len, tok->len);
+ insert_xml_frame(current_frame, new_frame);
+ new_frame->item = pi;
+ new_frame->last_item = pi;
+ new_frame->tree = NULL;
+ new_frame->start_offset = tok->offset;
+ new_frame->ns = NULL;
+ }
}
static void before_xmpli(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
proto_item* pi;
proto_tree* pt;
tvbparse_elem_t* name_tok = tok->sub->next;
- gchar* name = (gchar*)tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
+ gchar* name = tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
xml_ns_t* ns = g_hash_table_lookup(xmpli_names,name);
+ xml_frame_t* new_frame;
int hf_tag;
gint ett;
- g_strdown(name);
+ ascii_strdown_inplace(name);
if (!ns) {
hf_tag = hf_xmlpi;
ett = ett_xmpli;
pt = proto_item_add_subtree(pi,ett);
- current_frame = ep_alloc(sizeof(xml_frame_t));
- current_frame->item = pi;
- current_frame->last_item = pi;
- current_frame->tree = pt;
- current_frame->start_offset = tok->offset;
- current_frame->ns = ns;
+ new_frame = ep_alloc(sizeof(xml_frame_t));
+ new_frame->type = XML_FRAME_XMPLI;
+ new_frame->name = name;
+ new_frame->name_orig_case = name;
+ new_frame->value = NULL;
+ insert_xml_frame(current_frame, new_frame);
+ new_frame->item = pi;
+ new_frame->last_item = pi;
+ new_frame->tree = pt;
+ new_frame->start_offset = tok->offset;
+ new_frame->ns = ns;
- g_ptr_array_add(stack,current_frame);
+ g_ptr_array_add(stack,new_frame);
}
xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
proto_tree_add_text(current_frame->tree,
- tok->tvb, tok->offset, tok->len,
+ tok->tvb, tok->offset, tok->len, "%s",
tvb_format_text(tok->tvb,tok->offset,tok->len));
if (stack->len > 1) {
GPtrArray* stack = tvbparse_data;
xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
tvbparse_elem_t* name_tok = tok->sub->next;
- gchar* root_name;
- gchar* name;
+ gchar* root_name;
+ gchar *name = NULL, *name_orig_case = NULL;
xml_ns_t* ns;
xml_frame_t* new_frame;
proto_item* pi;
proto_tree* pt;
if (name_tok->sub->id == XML_SCOPED_NAME) {
- tvbparse_elem_t* root_tok = name_tok->sub->sub;
- tvbparse_elem_t* leaf_tok = name_tok->sub->sub->next->next;
- xml_ns_t* nameroot_ns;
+ tvbparse_elem_t* root_tok = name_tok->sub->sub;
+ tvbparse_elem_t* leaf_tok = name_tok->sub->sub->next->next;
+ xml_ns_t* nameroot_ns;
- root_name = (gchar*)tvb_get_ephemeral_string(root_tok->tvb,root_tok->offset,root_tok->len);
- name = (gchar*)tvb_get_ephemeral_string(leaf_tok->tvb,leaf_tok->offset,leaf_tok->len);
+ root_name = (gchar*)tvb_get_ephemeral_string(root_tok->tvb,root_tok->offset,root_tok->len);
+ name = (gchar*)tvb_get_ephemeral_string(leaf_tok->tvb,leaf_tok->offset,leaf_tok->len);
+ name_orig_case = name;
- nameroot_ns = g_hash_table_lookup(xml_ns.elements,root_name);
+ nameroot_ns = g_hash_table_lookup(xml_ns.elements,root_name);
- if(nameroot_ns) {
- ns = g_hash_table_lookup(nameroot_ns->elements,name);
- if (!ns) {
- ns = &unknown_ns;
- }
- } else {
- ns = &unknown_ns;
- }
+ if(nameroot_ns) {
+ ns = g_hash_table_lookup(nameroot_ns->elements,name);
+ if (!ns) {
+ ns = &unknown_ns;
+ }
+ } else {
+ ns = &unknown_ns;
+ }
- } else {
- name = (gchar*)tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
- g_strdown(name);
+ } else {
+ name = tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
+ name_orig_case = ep_strdup(name);
+ ascii_strdown_inplace(name);
- if(current_frame->ns) {
+ if(current_frame->ns) {
ns = g_hash_table_lookup(current_frame->ns->elements,name);
if (!ns) {
} else {
ns = &unknown_ns;
}
- }
+ }
- pi = proto_tree_add_item(current_frame->tree,ns->hf_tag,tok->tvb,tok->offset,tok->len,FALSE);
+ pi = proto_tree_add_item(current_frame->tree,ns->hf_tag,tok->tvb,tok->offset,tok->len,FALSE);
proto_item_set_text(pi, "%s", tvb_format_text(tok->tvb,tok->offset,(name_tok->offset - tok->offset) + name_tok->len));
pt = proto_item_add_subtree(pi,ns->ett);
new_frame = ep_alloc(sizeof(xml_frame_t));
+ new_frame->type = XML_FRAME_TAG;
+ new_frame->name = name;
+ new_frame->name_orig_case = name_orig_case;
+ new_frame->value = NULL;
+ insert_xml_frame(current_frame, new_frame);
new_frame->item = pi;
new_frame->last_item = pi;
new_frame->tree = pt;
static void before_dtd_doctype(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok){
GPtrArray* stack = tvbparse_data;
xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
+ xml_frame_t* new_frame;
tvbparse_elem_t* name_tok = tok->sub->next->next->next->sub->sub;
proto_tree* dtd_item = proto_tree_add_item(current_frame->tree, hf_doctype,
- name_tok->tvb, name_tok->offset, name_tok->len, FALSE);
+ name_tok->tvb, name_tok->offset, name_tok->len, ENC_ASCII|ENC_NA);
proto_item_set_text(dtd_item,"%s",tvb_format_text(tok->tvb,tok->offset,tok->len));
- current_frame = ep_alloc(sizeof(xml_frame_t));
- current_frame->item = dtd_item;
- current_frame->last_item = dtd_item;
- current_frame->tree = proto_item_add_subtree(dtd_item,ett_dtd);
- current_frame->start_offset = tok->offset;
- current_frame->ns = NULL;
+ new_frame = ep_alloc(sizeof(xml_frame_t));
+ new_frame->type = XML_FRAME_DTD_DOCTYPE;
+ new_frame->name = (gchar*)tvb_get_ephemeral_string(name_tok->tvb,name_tok->offset,name_tok->len);
+ new_frame->name_orig_case = new_frame->name;
+ new_frame->value = NULL;
+ insert_xml_frame(current_frame, new_frame);
+ new_frame->item = dtd_item;
+ new_frame->last_item = dtd_item;
+ new_frame->tree = proto_item_add_subtree(dtd_item,ett_dtd);
+ new_frame->start_offset = tok->offset;
+ new_frame->ns = NULL;
- g_ptr_array_add(stack,current_frame);
+ g_ptr_array_add(stack,new_frame);
}
static void pop_stack(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok _U_) {
static void after_attrib(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok) {
GPtrArray* stack = tvbparse_data;
xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
- gchar* name = (gchar*)tvb_get_ephemeral_string(tok->sub->tvb,tok->sub->offset,tok->sub->len);
- tvbparse_elem_t* value = tok->sub->next->next->data;
+ gchar *name = NULL, *name_orig_case = NULL;
+ tvbparse_elem_t* value;
+ tvbparse_elem_t* value_part = tok->sub->next->next->data;
int* hfidp;
int hfid;
+ proto_item* pi;
+ xml_frame_t* new_frame;
+
+ name = tvb_get_ephemeral_string(tok->sub->tvb,tok->sub->offset,tok->sub->len);
+ name_orig_case = ep_strdup(name);
+ ascii_strdown_inplace(name);
- g_strdown(name);
if(current_frame->ns && (hfidp = g_hash_table_lookup(current_frame->ns->attributes,name) )) {
hfid = *hfidp;
+ value = value_part;
} else {
hfid = hf_unknowwn_attrib;
value = tok;
}
- current_frame->last_item = proto_tree_add_item(current_frame->tree,hfid,value->tvb,value->offset,value->len,FALSE);
- proto_item_set_text(current_frame->last_item, "%s", tvb_format_text(tok->tvb,tok->offset,tok->len));
+ pi = proto_tree_add_item(current_frame->tree,hfid,value->tvb,value->offset,value->len,FALSE);
+ proto_item_set_text(pi, "%s", tvb_format_text(tok->tvb,tok->offset,tok->len));
+
+ current_frame->last_item = pi;
+
+ new_frame = ep_alloc(sizeof(xml_frame_t));
+ new_frame->type = XML_FRAME_ATTRIB;
+ new_frame->name = name;
+ new_frame->name_orig_case = name_orig_case;
+ new_frame->value = tvb_new_subset(value_part->tvb, value_part->offset, value_part->len, value_part->len);
+ insert_xml_frame(current_frame, new_frame);
+ new_frame->item = pi;
+ new_frame->last_item = pi;
+ new_frame->tree = NULL;
+ new_frame->start_offset = tok->offset;
+ new_frame->ns = NULL;
}
static void init_xml_parser(void) {
- tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
- tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
-
- tvbparse_wanted_t* want_scoped_name = tvbparse_set_seq(XML_SCOPED_NAME, NULL, NULL, NULL,
- want_name,
- tvbparse_char(-1,":",NULL,NULL,NULL),
- want_name,
- NULL);
-
- tvbparse_wanted_t* want_tag_name = tvbparse_set_oneof(0, NULL, NULL, NULL,
- want_scoped_name,
- want_name,
- NULL);
-
- tvbparse_wanted_t* want_attrib_value = tvbparse_set_oneof(0, NULL, NULL, get_attrib_value,
- tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\"','\\'),
- tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\'','\\'),
- tvbparse_chars(-1,1,0,"0123456789",NULL,NULL,NULL),
- want_name,
- NULL);
+ tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz.-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
+ tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz.-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
+
+ tvbparse_wanted_t* want_scoped_name = tvbparse_set_seq(XML_SCOPED_NAME, NULL, NULL, NULL,
+ want_name,
+ tvbparse_char(-1,":",NULL,NULL,NULL),
+ want_name,
+ NULL);
+
+ tvbparse_wanted_t* want_tag_name = tvbparse_set_oneof(0, NULL, NULL, NULL,
+ want_scoped_name,
+ want_name,
+ NULL);
+
+ tvbparse_wanted_t* want_attrib_value = tvbparse_set_oneof(0, NULL, NULL, get_attrib_value,
+ tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\"','\\'),
+ tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb,'\'','\\'),
+ tvbparse_chars(-1,1,0,"0123456789",NULL,NULL,NULL),
+ want_name,
+ NULL);
tvbparse_wanted_t* want_attributes = tvbparse_one_or_more(-1, NULL, NULL, NULL,
- tvbparse_set_seq(-1, NULL, NULL, after_attrib,
- want_attr_name,
- tvbparse_char(-1,"=",NULL,NULL,NULL),
- want_attrib_value,
- NULL));
+ tvbparse_set_seq(-1, NULL, NULL, after_attrib,
+ want_attr_name,
+ tvbparse_char(-1,"=",NULL,NULL,NULL),
+ want_attrib_value,
+ NULL));
tvbparse_wanted_t* want_stoptag = tvbparse_set_oneof(-1,NULL,NULL,NULL,
- tvbparse_char(-1, ">", NULL, NULL, after_open_tag),
- tvbparse_string(-1, "/>", NULL, NULL, after_closed_tag),
- NULL);
+ tvbparse_char(-1, ">", NULL, NULL, after_open_tag),
+ tvbparse_string(-1, "/>", NULL, NULL, after_closed_tag),
+ NULL);
tvbparse_wanted_t* want_stopxmlpi = tvbparse_string(-1,"?>",NULL,NULL,after_xmlpi);
- tvbparse_wanted_t* want_comment = tvbparse_set_seq(hf_comment,NULL,NULL,after_token,
- tvbparse_string(-1,"<!--",NULL,NULL,NULL),
- tvbparse_until(-1,NULL,NULL,NULL,
- tvbparse_string(-1,"-->",NULL,NULL,NULL),
- TP_UNTIL_INCLUDE),
- NULL);
-
- tvbparse_wanted_t* want_xmlpi = tvbparse_set_seq(hf_xmlpi,NULL,before_xmpli,NULL,
- tvbparse_string(-1,"<?",NULL,NULL,NULL),
- want_name,
- tvbparse_set_oneof(-1,NULL,NULL,NULL,
- want_stopxmlpi,
- tvbparse_set_seq(-1,NULL,NULL,NULL,
- want_attributes,
- want_stopxmlpi,
- NULL),
- NULL),
- NULL);
-
- tvbparse_wanted_t* want_closing_tag = tvbparse_set_seq(0,NULL,NULL,after_untag,
- tvbparse_char(-1, "<", NULL, NULL, NULL),
- tvbparse_char(-1, "/", NULL, NULL, NULL),
- want_tag_name,
- tvbparse_char(-1, ">", NULL, NULL, NULL),
- NULL);
-
- tvbparse_wanted_t* want_doctype_start = tvbparse_set_seq(-1,NULL,before_dtd_doctype,NULL,
- tvbparse_char(-1,"<",NULL,NULL,NULL),
- tvbparse_char(-1,"!",NULL,NULL,NULL),
- tvbparse_casestring(-1,"DOCTYPE",NULL,NULL,NULL),
- tvbparse_set_oneof(-1,NULL,NULL,NULL,
- tvbparse_set_seq(-1,NULL,NULL,NULL,
- want_name,
- tvbparse_char(-1,"[",NULL,NULL,NULL),
- NULL),
- tvbparse_set_seq(-1,NULL,NULL,pop_stack,
- want_name,
- tvbparse_set_oneof(-1,NULL,NULL,NULL,
- tvbparse_casestring(-1,"PUBLIC",NULL,NULL,NULL),
- tvbparse_casestring(-1,"SYSTEM",NULL,NULL,NULL),
- NULL),
- tvbparse_until(-1,NULL,NULL,NULL,
- tvbparse_char(-1,">",NULL,NULL,NULL),
- TP_UNTIL_INCLUDE),
- NULL),
- NULL),
- NULL);
-
- tvbparse_wanted_t* want_dtd_tag = tvbparse_set_seq(hf_dtd_tag,NULL,NULL,after_token,
- tvbparse_char(-1,"<",NULL,NULL,NULL),
- tvbparse_char(-1,"!",NULL,NULL,NULL),
- tvbparse_until(-1,NULL,NULL,NULL,
- tvbparse_char(-1, ">", NULL, NULL, NULL),
- TP_UNTIL_INCLUDE),
- NULL);
-
- tvbparse_wanted_t* want_tag = tvbparse_set_seq(-1, NULL, before_tag, NULL,
- tvbparse_char(-1,"<",NULL,NULL,NULL),
- want_tag_name,
- tvbparse_set_oneof(-1,NULL,NULL,NULL,
- tvbparse_set_seq(-1,NULL,NULL,NULL,
- want_attributes,
- want_stoptag,
- NULL),
- want_stoptag,
- NULL),
- NULL);
-
- tvbparse_wanted_t* want_dtd_close = tvbparse_set_seq(-1,NULL,NULL,after_dtd_close,
- tvbparse_char(-1,"]",NULL,NULL,NULL),
- tvbparse_char(-1,">",NULL,NULL,NULL),
- NULL);
-
- want_ignore = tvbparse_chars(-1,1,0," \t\r\n",NULL,NULL,NULL);
+ tvbparse_wanted_t* want_comment = tvbparse_set_seq(hf_comment,NULL,NULL,after_token,
+ tvbparse_string(-1,"<!--",NULL,NULL,NULL),
+ tvbparse_until(-1,NULL,NULL,NULL,
+ tvbparse_string(-1,"-->",NULL,NULL,NULL),
+ TP_UNTIL_INCLUDE),
+ NULL);
+
+ tvbparse_wanted_t* want_xmlpi = tvbparse_set_seq(hf_xmlpi,NULL,before_xmpli,NULL,
+ tvbparse_string(-1,"<?",NULL,NULL,NULL),
+ want_name,
+ tvbparse_set_oneof(-1,NULL,NULL,NULL,
+ want_stopxmlpi,
+ tvbparse_set_seq(-1,NULL,NULL,NULL,
+ want_attributes,
+ want_stopxmlpi,
+ NULL),
+ NULL),
+ NULL);
+
+ tvbparse_wanted_t* want_closing_tag = tvbparse_set_seq(0,NULL,NULL,after_untag,
+ tvbparse_char(-1, "<", NULL, NULL, NULL),
+ tvbparse_char(-1, "/", NULL, NULL, NULL),
+ want_tag_name,
+ tvbparse_char(-1, ">", NULL, NULL, NULL),
+ NULL);
+
+ tvbparse_wanted_t* want_doctype_start = tvbparse_set_seq(-1,NULL,before_dtd_doctype,NULL,
+ tvbparse_char(-1,"<",NULL,NULL,NULL),
+ tvbparse_char(-1,"!",NULL,NULL,NULL),
+ tvbparse_casestring(-1,"DOCTYPE",NULL,NULL,NULL),
+ tvbparse_set_oneof(-1,NULL,NULL,NULL,
+ tvbparse_set_seq(-1,NULL,NULL,NULL,
+ want_name,
+ tvbparse_char(-1,"[",NULL,NULL,NULL),
+ NULL),
+ tvbparse_set_seq(-1,NULL,NULL,pop_stack,
+ want_name,
+ tvbparse_set_oneof(-1,NULL,NULL,NULL,
+ tvbparse_casestring(-1,"PUBLIC",NULL,NULL,NULL),
+ tvbparse_casestring(-1,"SYSTEM",NULL,NULL,NULL),
+ NULL),
+ tvbparse_until(-1,NULL,NULL,NULL,
+ tvbparse_char(-1,">",NULL,NULL,NULL),
+ TP_UNTIL_INCLUDE),
+ NULL),
+ NULL),
+ NULL);
+
+ tvbparse_wanted_t* want_dtd_tag = tvbparse_set_seq(hf_dtd_tag,NULL,NULL,after_token,
+ tvbparse_char(-1,"<",NULL,NULL,NULL),
+ tvbparse_char(-1,"!",NULL,NULL,NULL),
+ tvbparse_until(-1,NULL,NULL,NULL,
+ tvbparse_char(-1, ">", NULL, NULL, NULL),
+ TP_UNTIL_INCLUDE),
+ NULL);
+
+ tvbparse_wanted_t* want_tag = tvbparse_set_seq(-1, NULL, before_tag, NULL,
+ tvbparse_char(-1,"<",NULL,NULL,NULL),
+ want_tag_name,
+ tvbparse_set_oneof(-1,NULL,NULL,NULL,
+ tvbparse_set_seq(-1,NULL,NULL,NULL,
+ want_attributes,
+ want_stoptag,
+ NULL),
+ want_stoptag,
+ NULL),
+ NULL);
+
+ tvbparse_wanted_t* want_dtd_close = tvbparse_set_seq(-1,NULL,NULL,after_dtd_close,
+ tvbparse_char(-1,"]",NULL,NULL,NULL),
+ tvbparse_char(-1,">",NULL,NULL,NULL),
+ NULL);
+
+ want_ignore = tvbparse_chars(-1,1,0," \t\r\n",NULL,NULL,NULL);
want = tvbparse_set_oneof(-1, NULL, NULL, NULL,
- want_comment,
- want_xmlpi,
- want_closing_tag,
- want_doctype_start,
- want_dtd_close,
- want_dtd_tag,
- want_tag,
- tvbparse_not_chars(XML_CDATA,1,0,"<",NULL,NULL,after_token),
- 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);
+ want_comment,
+ want_xmlpi,
+ want_closing_tag,
+ want_doctype_start,
+ want_dtd_close,
+ want_dtd_tag,
+ want_tag,
+ tvbparse_not_chars(XML_CDATA,1,0,"<",NULL,NULL,after_token),
+ 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);
}
hfri.hfinfo.display = BASE_NONE;
hfri.hfinfo.strings = NULL;
hfri.hfinfo.bitmask = 0x0;
- hfri.hfinfo.blurb = "";
+ hfri.hfinfo.blurb = NULL;
hfri.hfinfo.id = 0;
hfri.hfinfo.parent = 0;
- hfri.hfinfo.ref_count = 0;
+ hfri.hfinfo.ref_type = HF_REF_TYPE_NONE;
hfri.hfinfo.bitshift = 0;
hfri.hfinfo.same_name_next = NULL;
hfri.hfinfo.same_name_prev = NULL;
}
static void destroy_dtd_data(dtd_build_data_t* dtd_data) {
+ g_free(dtd_data->proto_name);
+ g_free(dtd_data->media_type);
+ g_free(dtd_data->description);
+ g_free(dtd_data->proto_root);
- if(dtd_data->proto_name) g_free(dtd_data->proto_name);
- if(dtd_data->media_type) g_free(dtd_data->media_type);
- if(dtd_data->description) g_free(dtd_data->description);
- if(dtd_data->proto_root) g_free(dtd_data->proto_root);
-
- g_string_free(dtd_data->error,TRUE);
-
+ g_string_free(dtd_data->error,TRUE);
while(dtd_data->elements->len) {
dtd_named_list_t* nl = g_ptr_array_remove_index_fast(dtd_data->elements,0);
g_ptr_array_free(dtd_data->attributes,TRUE);
g_free(dtd_data);
-
}
-
static void copy_attrib_item(gpointer k, gpointer v _U_, gpointer p) {
gchar* key = g_strdup(k);
int* value = g_malloc(sizeof(int));
GString* s = g_string_new(proto_name);
gchar* str;
g_string_append(s,".");
-
+
for (i = 1; i < hier->len; i++) {
- g_string_sprintfa(s, "%s.",(gchar*)g_ptr_array_index(hier,i));
+ g_string_append_printf(s, "%s.",(gchar*)g_ptr_array_index(hier,i));
}
g_string_append(s,name);
static xml_ns_t* make_xml_hier(gchar* elem_name,
- xml_ns_t* root,
- GHashTable* elements,
- GPtrArray* hier,
- GString* error,
- GArray* hfs,
- GArray* etts,
- char* proto_name) {
+ xml_ns_t* root,
+ GHashTable* elements,
+ GPtrArray* hier,
+ GString* error,
+ GArray* hfs,
+ GArray* etts,
+ char* proto_name) {
xml_ns_t* new;
xml_ns_t* orig;
gchar* fqn;
gint* ett_p;
struct _attr_reg_data d;
- gboolean recurred = FALSE;
- guint i;
+ gboolean recurred = FALSE;
+ guint i;
- if ( g_str_equal(elem_name,root->name) ) {
- return NULL;
- }
+ if ( g_str_equal(elem_name,root->name) ) {
+ return NULL;
+ }
if (! ( orig = g_hash_table_lookup(elements,elem_name) )) {
- g_string_sprintfa(error,"element '%s' is not defined\n", elem_name);
+ g_string_append_printf(error,"element '%s' is not defined\n", elem_name);
return NULL;
}
- for (i = 0; i < hier->len; i++) {
- if( strcmp(elem_name,(gchar*) g_ptr_array_index(hier,i) ) == 0 ) {
- recurred = TRUE;
- }
- }
+ for (i = 0; i < hier->len; i++) {
+ if( strcmp(elem_name,(gchar*) g_ptr_array_index(hier,i) ) == 0 ) {
+ recurred = TRUE;
+ }
+ }
- if (recurred) {
- return NULL;
- }
+ if (recurred) {
+ return NULL;
+ }
fqn = fully_qualified_name(hier,elem_name,proto_name);
new = duplicate_element(orig);
new->fqn = fqn;
- add_xml_field(hfs, &(new->hf_tag), g_strdup(elem_name), fqn);
+ add_xml_field(hfs, &(new->hf_tag), g_strdup(elem_name), fqn);
add_xml_field(hfs, &(new->hf_cdata), g_strdup(elem_name), fqn);
ett_p = &new->ett;
gchar* child_name = g_ptr_array_remove_index(new->element_names,0);
xml_ns_t* child_element = NULL;
- g_ptr_array_add(hier,elem_name);
- child_element = make_xml_hier(child_name, root, elements, hier,error,hfs,etts,proto_name);
- g_ptr_array_remove_index_fast(hier,hier->len - 1);
+ g_ptr_array_add(hier,elem_name);
+ child_element = make_xml_hier(child_name, root, elements, hier,error,hfs,etts,proto_name);
+ g_ptr_array_remove_index_fast(hier,hier->len - 1);
if (child_element) {
g_hash_table_insert(new->elements,child_element->name,child_element);
}
- }
+ }
g_ptr_array_free(new->element_names,TRUE);
new->element_names = NULL;
}
static gboolean free_both(gpointer k, gpointer v, gpointer p _U_) {
- g_free(k);
- g_free(v);
- return TRUE;
+ g_free(k);
+ g_free(v);
+ return TRUE;
}
static gboolean free_elements(gpointer k _U_, gpointer v, gpointer p _U_) {
- xml_ns_t* e = v;
- g_free(e->name);
- g_hash_table_foreach_remove(e->attributes,free_both,NULL);
- g_hash_table_destroy(e->attributes);
- g_hash_table_destroy(e->elements);
-
- while (e->element_names->len) {
- g_free(g_ptr_array_remove_index(e->element_names,0));
- }
+ xml_ns_t* e = v;
+ g_free(e->name);
+ g_hash_table_foreach_remove(e->attributes,free_both,NULL);
+ g_hash_table_destroy(e->attributes);
+ g_hash_table_destroy(e->elements);
+
+ while (e->element_names->len) {
+ g_free(g_ptr_array_remove_index(e->element_names,0));
+ }
- g_ptr_array_free(e->element_names,TRUE);
- g_free(e);
+ g_ptr_array_free(e->element_names,TRUE);
+ g_free(e);
- return TRUE;
+ return TRUE;
}
static void register_dtd(dtd_build_data_t* dtd_data, GString* errors) {
GArray* etts;
GPtrArray* hier;
gchar* curr_name;
- GPtrArray* element_names = g_ptr_array_new();
+ GPtrArray* element_names = g_ptr_array_new();
- /* we first populate elements with the those coming from the parser */
+ /* we first populate elements with the those coming from the parser */
while(dtd_data->elements->len) {
dtd_named_list_t* nl = g_ptr_array_remove_index(dtd_data->elements,0);
xml_ns_t* element = g_malloc(sizeof(xml_ns_t));
/* we will use the first element found as root in case no other one was given. */
if (root_name == NULL)
- root_name = g_strdup(nl->name);
+ root_name = g_strdup(nl->name);
element->name = nl->name;
element->element_names = nl->list;
element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
element->elements = g_hash_table_new(g_str_hash,g_str_equal);
- if( g_hash_table_lookup(elements,element->name) ) {
- g_string_sprintfa(errors,"element %s defined more than once\n", element->name);
- free_elements(NULL,element,NULL);
- } else {
- g_hash_table_insert(elements,element->name,element);
- g_ptr_array_add(element_names,g_strdup(element->name));
+ if( g_hash_table_lookup(elements,element->name) ) {
+ g_string_append_printf(errors,"element %s defined more than once\n", element->name);
+ free_elements(NULL,element,NULL);
+ } else {
+ g_hash_table_insert(elements,element->name,element);
+ g_ptr_array_add(element_names,g_strdup(element->name));
}
g_free(nl);
dtd_named_list_t* nl = g_ptr_array_remove_index(dtd_data->attributes,0);
xml_ns_t* element = g_hash_table_lookup(elements,nl->name);
- if (!element) {
- g_string_sprintfa(errors,"element %s is not defined\n", nl->name);
+ if (element) {
+ while(nl->list->len) {
+ gchar* name = g_ptr_array_remove_index(nl->list,0);
+ int* id_p = g_malloc(sizeof(int));
- goto next_attribute;
+ *id_p = -1;
+ g_hash_table_insert(element->attributes,name,id_p);
+ }
}
-
- while(nl->list->len) {
- gchar* name = g_ptr_array_remove_index(nl->list,0);
- int* id_p = g_malloc(sizeof(int));
-
- *id_p = -1;
- g_hash_table_insert(element->attributes,name,id_p);
+ else {
+ g_string_append_printf(errors,"element %s is not defined\n", nl->name);
}
-next_attribute:
g_free(nl->name);
g_ptr_array_free(nl->list,TRUE);
g_free(nl);
}
- /* if a proto_root is defined in the dtd we'll use that as root */
+ /* if a proto_root is defined in the dtd we'll use that as root */
if( dtd_data->proto_root ) {
- if(root_name)
- g_free(root_name);
- root_name = g_strdup(dtd_data->proto_root);
+ g_free(root_name);
+ root_name = g_strdup(dtd_data->proto_root);
}
- /* we use a stack with the names to avoid recurring infinitelly */
+ /* we use a stack with the names to avoid recurring infinitelly */
hier = g_ptr_array_new();
- /*
- * if a proto name was given in the dtd the dtd will be used as a protocol
- * or else the dtd will be loaded as a branch of the xml namespace
- */
+ /*
+ * if a proto name was given in the dtd the dtd will be used as a protocol
+ * or else the dtd will be loaded as a branch of the xml namespace
+ */
if( ! dtd_data->proto_name ) {
hfs = hf_arr;
etts = ett_arr;
g_ptr_array_add(hier,g_strdup("xml"));
- root_element = &xml_ns;
} else {
- /*
- * if we were given a proto_name the namespace will be registered
- * as an indipendent protocol with its own hf and ett arrays.
- */
- hfs = g_array_new(FALSE,FALSE,sizeof(hf_register_info));
- etts = g_array_new(FALSE,FALSE,sizeof(gint*));
+ /*
+ * if we were given a proto_name the namespace will be registered
+ * as an independent protocol with its own hf and ett arrays.
+ */
+ hfs = g_array_new(FALSE,FALSE,sizeof(hf_register_info));
+ etts = g_array_new(FALSE,FALSE,sizeof(gint*));
}
- /* the root element of the dtd's namespace */
+ /* the root element of the dtd's namespace */
root_element = g_malloc(sizeof(xml_ns_t));
- root_element->name = g_strdup(root_name);
- root_element->fqn = dtd_data->proto_name ? g_strdup(dtd_data->proto_name) : root_element->name;
- root_element->hf_tag = -1;
- root_element->hf_cdata = -1;
- root_element->ett = -1;
- root_element->elements = g_hash_table_new(g_str_hash,g_str_equal);
- root_element->element_names = element_names;
+ root_element->name = g_strdup(root_name);
+ root_element->fqn = dtd_data->proto_name ? g_strdup(dtd_data->proto_name) : root_element->name;
+ root_element->hf_tag = -1;
+ root_element->hf_cdata = -1;
+ root_element->ett = -1;
+ root_element->elements = g_hash_table_new(g_str_hash,g_str_equal);
+ root_element->element_names = element_names;
- /*
- * we can either create a namespace as a flat namespace
- * in which all the elements are at the root level
- * or we can create a recursive namespace
- */
- if (dtd_data->recursion) {
- xml_ns_t* orig_root;
+ /*
+ * we can either create a namespace as a flat namespace
+ * in which all the elements are at the root level
+ * or we can create a recursive namespace
+ */
+ if (dtd_data->recursion) {
+ xml_ns_t* orig_root;
- make_xml_hier(root_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
+ make_xml_hier(root_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
- g_hash_table_insert(root_element->elements,root_element->name,root_element);
+ g_hash_table_insert(root_element->elements,root_element->name,root_element);
- orig_root = g_hash_table_lookup(elements,root_name);
+ orig_root = g_hash_table_lookup(elements,root_name);
- /* if the root element was defined copy its attrlist to the child */
- if(orig_root) {
- struct _attr_reg_data d;
+ /* if the root element was defined copy its attrlist to the child */
+ if(orig_root) {
+ struct _attr_reg_data d;
- d.basename = dtd_data->proto_name;
- d.hf = hfs;
+ d.basename = dtd_data->proto_name;
+ d.hf = hfs;
- root_element->attributes = copy_attributes_hash(orig_root->attributes);
- g_hash_table_foreach(root_element->attributes,add_xml_attribute_names,&d);
- } else {
- root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
- }
+ root_element->attributes = copy_attributes_hash(orig_root->attributes);
+ g_hash_table_foreach(root_element->attributes,add_xml_attribute_names,&d);
+ } else {
+ root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
+ }
- /* we then create all the sub hierachies to catch the recurred cases */
- g_ptr_array_add(hier,root_name);
+ /* we then create all the sub hierachies to catch the recurred cases */
+ g_ptr_array_add(hier,root_name);
- while(root_element->element_names->len) {
- curr_name = g_ptr_array_remove_index(root_element->element_names,0);
+ while(root_element->element_names->len) {
+ curr_name = g_ptr_array_remove_index(root_element->element_names,0);
- if( ! g_hash_table_lookup(root_element->elements,curr_name) ) {
- xml_ns_t* new = make_xml_hier(curr_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
- g_hash_table_insert(root_element->elements,new->name,new);
- }
+ if( ! g_hash_table_lookup(root_element->elements,curr_name) ) {
+ xml_ns_t* new = make_xml_hier(curr_name, root_element, elements,hier,errors,hfs,etts,dtd_data->proto_name);
+ g_hash_table_insert(root_element->elements,new->name,new);
+ }
- g_free(curr_name);
- }
+ g_free(curr_name);
+ }
- } else {
- /* a flat namespace */
- g_ptr_array_add(hier,root_name);
+ } else {
+ /* a flat namespace */
+ g_ptr_array_add(hier,root_name);
- root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
+ root_element->attributes = g_hash_table_new(g_str_hash,g_str_equal);
- while(root_element->element_names->len) {
- xml_ns_t* new;
- gint* ett_p;
- struct _attr_reg_data d;
+ while(root_element->element_names->len) {
+ xml_ns_t* new;
+ gint* ett_p;
+ struct _attr_reg_data d;
- curr_name = g_ptr_array_remove_index(root_element->element_names,0);
- new = duplicate_element(g_hash_table_lookup(elements,curr_name));
- new->fqn = fully_qualified_name(hier, curr_name, root_name);
+ curr_name = g_ptr_array_remove_index(root_element->element_names,0);
+ new = duplicate_element(g_hash_table_lookup(elements,curr_name));
+ new->fqn = fully_qualified_name(hier, curr_name, root_name);
- add_xml_field(hfs, &(new->hf_tag), curr_name, new->fqn);
- add_xml_field(hfs, &(new->hf_cdata), curr_name, new->fqn);
+ add_xml_field(hfs, &(new->hf_tag), curr_name, new->fqn);
+ add_xml_field(hfs, &(new->hf_cdata), curr_name, new->fqn);
- d.basename = new->fqn;
- d.hf = hfs;
+ d.basename = new->fqn;
+ d.hf = hfs;
- g_hash_table_foreach(new->attributes,add_xml_attribute_names,&d);
+ g_hash_table_foreach(new->attributes,add_xml_attribute_names,&d);
- ett_p = &new->ett;
- g_array_append_val(etts,ett_p);
+ ett_p = &new->ett;
+ g_array_append_val(etts,ett_p);
- g_ptr_array_free(new->element_names,TRUE);
+ g_ptr_array_free(new->element_names,TRUE);
- g_hash_table_insert(root_element->elements,new->name,new);
- }
- }
+ g_hash_table_insert(root_element->elements,new->name,new);
+ }
+ }
- g_ptr_array_free(element_names,TRUE);
+ g_ptr_array_free(element_names,TRUE);
g_ptr_array_free(hier,TRUE);
- /*
- * if we were given a proto_name the namespace will be registered
- * as an indipendent protocol.
- */
+ /*
+ * if we were given a proto_name the namespace will be registered
+ * as an independent protocol.
+ */
if( dtd_data->proto_name ) {
- gint* ett_p;
+ gint* ett_p;
if ( ! dtd_data->description) {
dtd_data->description = g_strdup(root_name);
}
- ett_p = &root_element->ett;
- g_array_append_val(etts,ett_p);
+ ett_p = &root_element->ett;
+ g_array_append_val(etts,ett_p);
- add_xml_field(hfs, &root_element->hf_cdata, root_element->name, root_element->fqn);
+ add_xml_field(hfs, &root_element->hf_cdata, root_element->name, root_element->fqn);
root_element->hf_tag = proto_register_protocol(dtd_data->description, dtd_data->proto_name, dtd_data->proto_name);
proto_register_field_array(root_element->hf_tag, (hf_register_info*)g_array_data(hfs), hfs->len);
g_array_free(etts,TRUE);
}
- g_hash_table_insert(xml_ns.elements,root_element->name,root_element);
+ g_hash_table_insert(xml_ns.elements,root_element->name,root_element);
- g_hash_table_foreach_remove(elements,free_elements,NULL);
- g_hash_table_destroy(elements);
+ g_hash_table_foreach_remove(elements,free_elements,NULL);
+ g_hash_table_destroy(elements);
destroy_dtd_data(dtd_data);
-
- if (root_name)
- g_free(root_name);
+ g_free(root_name);
}
-#if GLIB_MAJOR_VERSION < 2
-# define DIRECTORY_T DIR
-# define FILE_T struct dirent
-# define OPENDIR_OP(name) opendir(name)
-# define DIRGETNEXT_OP(dir) readdir(dir)
-# define GETFNAME_OP(file) (gchar *)file->d_name
-# define CLOSEDIR_OP(dir) closedir(dir)
-#else /* GLIB 2 */
# define DIRECTORY_T GDir
# define FILE_T gchar
# define OPENDIR_OP(name) g_dir_open(name, 0, dummy)
# define DIRGETNEXT_OP(dir) g_dir_read_name(dir)
# define GETFNAME_OP(file) (file);
# define CLOSEDIR_OP(dir) g_dir_close(dir)
-#endif
static void init_xml_names(void) {
xml_ns_t* xmlpi_xml_ns;
const gchar* filename;
gchar* dirname;
-#if GLIB_MAJOR_VERSION >= 2
GError** dummy = g_malloc(sizeof(GError *));
*dummy = NULL;
-#endif
xmpli_names = g_hash_table_new(g_str_hash,g_str_equal);
media_types = g_hash_table_new(g_str_hash,g_str_equal);
xmlpi_xml_ns->elements = NULL;
- dirname = get_persconffile_path("dtds", FALSE);
+ dirname = get_persconffile_path("dtds", FALSE, FALSE);
if (test_for_directory(dirname) != EISDIR) {
/* Although dir isn't a directory it may still use memory */
if (test_for_directory(dirname) == EISDIR) {
- if ((dir = OPENDIR_OP(dirname)) != NULL) {
- while ((file = DIRGETNEXT_OP(dir)) != NULL) {
- guint namelen;
- filename = GETFNAME_OP(file);
+ if ((dir = OPENDIR_OP(dirname)) != NULL) {
+ while ((file = DIRGETNEXT_OP(dir)) != NULL) {
+ guint namelen;
+ filename = GETFNAME_OP(file);
- namelen = strlen(filename);
- if ( namelen > 4 && ( g_strcasecmp(filename+(namelen-4),".dtd") == 0 ) ) {
- GString* errors = g_string_new("");
- GString* preparsed = dtd_preparse(dirname, filename, errors);
- dtd_build_data_t* dtd_data;
+ namelen = (int)strlen(filename);
+ if ( namelen > 4 && ( g_ascii_strcasecmp(filename+(namelen-4),".dtd") == 0 ) ) {
+ GString* errors = g_string_new("");
+ GString* preparsed = dtd_preparse(dirname, filename, errors);
+ dtd_build_data_t* dtd_data;
- if (errors->len) {
- report_failure("Dtd Preparser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
- continue;
- }
+ if (errors->len) {
+ report_failure("Dtd Preparser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
+ continue;
+ }
- dtd_data = dtd_parse(preparsed);
+ dtd_data = dtd_parse(preparsed);
- g_string_free(preparsed,TRUE);
+ g_string_free(preparsed,TRUE);
- if (dtd_data->error->len) {
- report_failure("Dtd Parser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,dtd_data->error->str);
- destroy_dtd_data(dtd_data);
- continue;
- }
+ if (dtd_data->error->len) {
+ report_failure("Dtd Parser in file %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,dtd_data->error->str);
+ destroy_dtd_data(dtd_data);
+ continue;
+ }
- register_dtd(dtd_data,errors);
+ register_dtd(dtd_data,errors);
- if (errors->len) {
- report_failure("Dtd Registration in file: %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
- g_string_free(errors,TRUE);
- continue;
- }
- }
- }
+ if (errors->len) {
+ report_failure("Dtd Registration in file: %s%c%s: %s",dirname,G_DIR_SEPARATOR,filename,errors->str);
+ g_string_free(errors,TRUE);
+ continue;
+ }
+ }
+ }
- CLOSEDIR_OP(dir);
- }
+ CLOSEDIR_OP(dir);
+ }
}
+ g_free(dirname);
+
for(i=0;i<array_length(default_media_types);i++) {
if( ! g_hash_table_lookup(media_types,default_media_types[i]) ) {
g_hash_table_insert(media_types,(gpointer)default_media_types[i],&xml_ns);
g_hash_table_foreach(xmpli_names,add_xmlpi_namespace,"xml.xmlpi");
-#if GLIB_MAJOR_VERSION >= 2
g_free(dummy);
-#endif
}
static void range_delete_xml_tcp_callback(guint32 port) {
- dissector_delete("tcp.port", port, xml_handle);
+ dissector_delete_uint("tcp.port", port, xml_handle);
}
static void range_add_xml_tcp_callback(guint32 port) {
- dissector_add("tcp.port", port, xml_handle);
+ dissector_add_uint("tcp.port", port, xml_handle);
}
static void apply_prefs(void) {
pref_heuristic_media_save = FALSE;
}
}
-
- if (pref_heuristic_tcp_save != pref_heuristic_tcp ) {
+
+ if (pref_heuristic_tcp_save != pref_heuristic_tcp ) {
if (pref_heuristic_tcp) {
heur_dissector_add("tcp", dissect_xml_heur, xml_ns.hf_tag);
pref_heuristic_tcp_save = TRUE;
pref_heuristic_tcp_save = FALSE;
}
}
-
+
+ if (pref_heuristic_udp_save != pref_heuristic_udp ) {
+ if (pref_heuristic_udp) {
+ heur_dissector_add("udp", dissect_xml_heur, xml_ns.hf_tag);
+ pref_heuristic_udp_save = TRUE;
+ } else {
+ heur_dissector_delete("udp", dissect_xml_heur, xml_ns.hf_tag);
+ pref_heuristic_udp_save = FALSE;
+ }
+ }
+
range_foreach(xml_tcp_range, range_delete_xml_tcp_callback);
g_free(xml_tcp_range);
xml_tcp_range = range_copy(global_xml_tcp_range);
- range_foreach(xml_tcp_range, range_add_xml_tcp_callback);
+ range_foreach(xml_tcp_range, range_add_xml_tcp_callback);
}
void
};
static hf_register_info hf_base[] = {
- { &hf_xmlpi, {"XMLPI", "xml.xmlpi", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
- { &hf_comment, {"Comment", "xml.comment", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
- { &hf_unknowwn_attrib, {"Attribute", "xml.attribute", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
- { &hf_doctype, {"Doctype", "xml.doctype", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
- { &hf_dtd_tag, {"DTD Tag", "xml.dtdtag", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
- { &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 }}
+ { &hf_xmlpi, {"XMLPI", "xml.xmlpi", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &hf_comment, {"Comment", "xml.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &hf_unknowwn_attrib, {"Attribute", "xml.attribute", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &hf_doctype, {"Doctype", "xml.doctype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &hf_dtd_tag, {"DTD Tag", "xml.dtdtag", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &unknown_ns.hf_cdata, {"CDATA", "xml.cdata", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &unknown_ns.hf_tag, {"Tag", "xml.tag", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+ { &xml_ns.hf_cdata, {"Unknown", "xml.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}
};
module_t* xml_module;
proto_register_subtree_array((gint**)g_array_data(ett_arr), ett_arr->len);
xml_module = prefs_register_protocol(xml_ns.hf_tag,apply_prefs);
- prefs_register_bool_preference(xml_module, "heuristic", "Use Heuristics for media types",
+ prefs_register_bool_preference(xml_module, "heuristic", "Use Heuristics for media types",
"Try to recognize XML for unknown media types",
&pref_heuristic_media);
- prefs_register_bool_preference(xml_module, "heuristic_tcp", "Use Heuristics for tcp",
+ prefs_register_bool_preference(xml_module, "heuristic_tcp", "Use Heuristics for TCP",
"Try to recognize XML for unknown TCP ports",
&pref_heuristic_tcp);
prefs_register_range_preference(xml_module, "tcp.port", "TCP Ports",
"TCP Ports range",
&global_xml_tcp_range, 65535);
-
- g_array_free(hf_arr,FALSE);
- g_array_free(ett_arr,TRUE);
+ prefs_register_bool_preference(xml_module, "heuristic_udp", "Use Heuristics for UDP",
+ "Try to recognize XML for unknown UDP ports",
+ &pref_heuristic_udp);
+ prefs_register_bool_preference(xml_module, "heuristic_unicode", "Use Unicode in heuristics",
+ "Try to recognize XML encoded in Unicode (UCS-2)",
+ &pref_heuristic_unicode);
+
+ g_array_free(hf_arr,FALSE);
+ g_array_free(ett_arr,TRUE);
register_dissector("xml", dissect_xml, xml_ns.hf_tag);
git.samba.org / obnox / wireshark / wip.git / blobdiff