diff options
-rw-r--r-- | epan/dissectors/packet-xmpp-conference.c | 62 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp-core.c | 94 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp-gtalk.c | 176 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp-jingle.c | 202 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp-other.c | 241 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp-utils.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-xmpp-utils.h | 6 |
7 files changed, 398 insertions, 399 deletions
diff --git a/epan/dissectors/packet-xmpp-conference.c b/epan/dissectors/packet-xmpp-conference.c index 666f2a548a..843ca2a4c8 100644 --- a/epan/dissectors/packet-xmpp-conference.c +++ b/epan/dissectors/packet-xmpp-conference.c @@ -53,8 +53,8 @@ xmpp_conferece_info_advert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *cinfo_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"isfocus", -1, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"isfocus", NULL, TRUE, TRUE, NULL, NULL} }; cinfo_item = proto_tree_add_item(tree, hf_xmpp_conf_info, tvb, element->offset, element->length, @@ -75,11 +75,11 @@ xmpp_conference_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e xmpp_array_t *state_array = xmpp_ep_init_array_t(state_enums, array_length(state_enums)); xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"entity", -1, TRUE, TRUE, NULL, NULL}, - {"state", -1, FALSE, TRUE, xmpp_val_enum_list, state_array}, - {"version", -1, FALSE, TRUE, NULL, NULL}, - {"sid", hf_xmpp_conf_info_sid, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"entity", NULL, TRUE, TRUE, NULL, NULL}, + {"state", NULL, FALSE, TRUE, xmpp_val_enum_list, state_array}, + {"version", NULL, FALSE, TRUE, NULL, NULL}, + {"sid", &hf_xmpp_conf_info_sid, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -108,10 +108,10 @@ xmpp_conf_desc(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element proto_tree *desc_tree; xmpp_attr_info attrs_info [] = { - {"subject", -1, FALSE, TRUE, NULL, NULL}, - {"display-text", -1, FALSE, FALSE, NULL, NULL}, - {"free-text", -1, FALSE, FALSE, NULL, NULL}, - {"max-user-count", -1, FALSE, FALSE, NULL, NULL}, + {"subject", NULL, FALSE, TRUE, NULL, NULL}, + {"display-text", NULL, FALSE, FALSE, NULL, NULL}, + {"free-text", NULL, FALSE, FALSE, NULL, NULL}, + {"max-user-count", NULL, FALSE, FALSE, NULL, NULL}, }; /* @@ -142,9 +142,9 @@ xmpp_conf_state(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen proto_tree *state_tree; xmpp_attr_info attrs_info [] = { - {"user-count", -1, FALSE, TRUE, NULL, NULL}, - {"active", -1, FALSE, TRUE, NULL, NULL}, - {"locked", -1, FALSE, TRUE, NULL, NULL} + {"user-count", NULL, FALSE, TRUE, NULL, NULL}, + {"active", NULL, FALSE, TRUE, NULL, NULL}, + {"locked", NULL, FALSE, TRUE, NULL, NULL} }; state_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "CONFERENCE STATE"); @@ -166,7 +166,7 @@ xmpp_conf_users(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen proto_tree *users_tree; xmpp_attr_info attrs_info [] = { - {"state", -1, FALSE, TRUE, NULL, NULL} + {"state", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -186,10 +186,10 @@ xmpp_conf_user(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element proto_tree *user_tree; xmpp_attr_info attrs_info [] = { - {"entity", -1, FALSE, TRUE, NULL, NULL}, - {"state", -1, FALSE, TRUE, NULL, NULL}, - {"display-text", -1, FALSE, TRUE, NULL, NULL}, - {"cascaded-focus", -1, FALSE, TRUE, NULL, NULL} + {"entity", NULL, FALSE, TRUE, NULL, NULL}, + {"state", NULL, FALSE, TRUE, NULL, NULL}, + {"display-text", NULL, FALSE, TRUE, NULL, NULL}, + {"cascaded-focus", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -216,12 +216,12 @@ xmpp_conf_endpoint(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_ele proto_tree *endpoint_tree; xmpp_attr_info attrs_info [] = { - {"entity", -1, FALSE, TRUE, NULL, NULL}, - {"state", -1, FALSE, TRUE, NULL, NULL}, - {"display-text", -1, FALSE, TRUE, NULL, NULL}, - {"status", -1, FALSE, TRUE, NULL, NULL}, - {"joining-method", -1, FALSE, TRUE, NULL, NULL}, - {"disconnection-method", -1, FALSE, TRUE, NULL, NULL}, + {"entity", NULL, FALSE, TRUE, NULL, NULL}, + {"state", NULL, FALSE, TRUE, NULL, NULL}, + {"display-text", NULL, FALSE, TRUE, NULL, NULL}, + {"status", NULL, FALSE, TRUE, NULL, NULL}, + {"joining-method", NULL, FALSE, TRUE, NULL, NULL}, + {"disconnection-method", NULL, FALSE, TRUE, NULL, NULL}, }; xmpp_elem_info elems_info [] = { @@ -253,12 +253,12 @@ xmpp_conf_media(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen proto_tree *media_tree; xmpp_attr_info attrs_info[] = { - {"id", -1, TRUE, TRUE, NULL, NULL}, - {"display-text", -1, FALSE, TRUE, NULL, NULL}, - {"type", -1, FALSE, TRUE, NULL, NULL}, - {"label", -1, FALSE, TRUE, NULL, NULL}, - {"src-id", -1, FALSE, TRUE, NULL, NULL}, - {"status", -1, FALSE, TRUE, NULL, NULL}, + {"id", NULL, TRUE, TRUE, NULL, NULL}, + {"display-text", NULL, FALSE, TRUE, NULL, NULL}, + {"type", NULL, FALSE, TRUE, NULL, NULL}, + {"label", NULL, FALSE, TRUE, NULL, NULL}, + {"src-id", NULL, FALSE, TRUE, NULL, NULL}, + {"status", NULL, FALSE, TRUE, NULL, NULL}, }; media_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "MEDIA"); diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 13a43992ed..4a962e053c 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -101,12 +101,12 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac xmpp_attr_t *attr_id, *attr_type; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"id", hf_xmpp_id, TRUE, TRUE, NULL, NULL}, - {"type", hf_xmpp_type, TRUE, TRUE, NULL, NULL}, - {"from", hf_xmpp_from, FALSE, TRUE, NULL, NULL}, - {"to", hf_xmpp_to, FALSE, TRUE, NULL, NULL}, - {"xml:lang", -1, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"id", &hf_xmpp_id, TRUE, TRUE, NULL, NULL}, + {"type", &hf_xmpp_type, TRUE, TRUE, NULL, NULL}, + {"from", &hf_xmpp_from, FALSE, TRUE, NULL, NULL}, + {"to", &hf_xmpp_to, FALSE, TRUE, NULL, NULL}, + {"xml:lang", NULL, FALSE, FALSE, NULL, NULL} }; conversation_t *conversation; @@ -224,9 +224,9 @@ xmpp_error(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t * xmpp_element_t *text_element, *cond_element; xmpp_attr_info attrs_info[] = { - {"type", hf_xmpp_error_type, TRUE, TRUE, NULL, NULL}, - {"code", hf_xmpp_error_code, FALSE, TRUE, NULL, NULL}, - {"condition", hf_xmpp_error_condition, TRUE, TRUE, NULL, NULL} /*TODO: validate list to the condition element*/ + {"type", &hf_xmpp_error_type, TRUE, TRUE, NULL, NULL}, + {"code", &hf_xmpp_error_code, FALSE, TRUE, NULL, NULL}, + {"condition", &hf_xmpp_error_condition, TRUE, TRUE, NULL, NULL} /*TODO: validate list to the condition element*/ }; gchar *error_info; @@ -283,13 +283,13 @@ xmpp_presence(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_ xmpp_array_t *show_array = xmpp_ep_init_array_t(show_enums, array_length(show_enums)); xmpp_attr_info attrs_info[] = { - {"from", hf_xmpp_from, FALSE, FALSE, NULL, NULL}, - {"id", hf_xmpp_id, FALSE, TRUE, NULL, NULL}, - {"to", hf_xmpp_to, FALSE, FALSE, NULL, NULL}, - {"type", hf_xmpp_type, FALSE, TRUE, xmpp_val_enum_list, type_array}, - {"xml:lang",-1, FALSE, FALSE, NULL,NULL}, - {"show", hf_xmpp_presence_show, FALSE, TRUE, xmpp_val_enum_list, show_array}, - {"priority", -1, FALSE, FALSE, NULL, NULL} + {"from", &hf_xmpp_from, FALSE, FALSE, NULL, NULL}, + {"id", &hf_xmpp_id, FALSE, TRUE, NULL, NULL}, + {"to", &hf_xmpp_to, FALSE, FALSE, NULL, NULL}, + {"type", &hf_xmpp_type, FALSE, TRUE, xmpp_val_enum_list, type_array}, + {"xml:lang", NULL, FALSE, FALSE, NULL,NULL}, + {"show", &hf_xmpp_presence_show, FALSE, TRUE, xmpp_val_enum_list, show_array}, + {"priority", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -335,8 +335,8 @@ xmpp_presence_status(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e proto_tree *status_tree; xmpp_attr_info attrs_info[] = { - {"xml:lang", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"xml:lang", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_attr_t *fake_value; @@ -368,12 +368,12 @@ xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t xmpp_array_t *type_array = xmpp_ep_init_array_t(type_enums, array_length(type_enums)); xmpp_attr_info attrs_info[] = { - {"from", hf_xmpp_from, FALSE, FALSE, NULL, NULL}, - {"id", hf_xmpp_id, FALSE, TRUE, NULL, NULL}, - {"to", hf_xmpp_to, FALSE, FALSE, NULL, NULL}, - {"type", hf_xmpp_type, FALSE, TRUE, xmpp_val_enum_list, type_array}, - {"xml:lang",-1, FALSE, FALSE, NULL,NULL}, - {"chatstate", hf_xmpp_message_chatstate, FALSE, TRUE, NULL, NULL} + {"from", &hf_xmpp_from, FALSE, FALSE, NULL, NULL}, + {"id", &hf_xmpp_id, FALSE, TRUE, NULL, NULL}, + {"to", &hf_xmpp_to, FALSE, FALSE, NULL, NULL}, + {"type", &hf_xmpp_type, FALSE, TRUE, xmpp_val_enum_list, type_array}, + {"xml:lang", NULL, FALSE, FALSE, NULL,NULL}, + {"chatstate", &hf_xmpp_message_chatstate, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -437,8 +437,8 @@ xmpp_message_body(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elem proto_tree *body_tree; xmpp_attr_info attrs_info[] = { - {"xml:lang", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"xml:lang", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_attr_t *fake_data_attr; @@ -461,8 +461,8 @@ xmpp_message_subject(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e proto_tree *subject_tree; xmpp_attr_info attrs_info[] = { - {"xml:lang", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, TRUE, FALSE, NULL, NULL} + {"xml:lang", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, FALSE, NULL, NULL} }; xmpp_attr_t *fake_data_attr; @@ -486,8 +486,8 @@ xmpp_message_thread(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_el proto_tree *thread_tree; xmpp_attr_info attrs_info[] = { - {"parent", hf_xmpp_message_thread_parent, FALSE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"parent", &hf_xmpp_message_thread_parent, FALSE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_attr_t *fake_value; @@ -511,10 +511,10 @@ xmpp_auth(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *p proto_tree *auth_tree; xmpp_attr_info_ext attrs_info[]={ - {"urn:ietf:params:xml:ns:xmpp-sasl", {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}}, - {"urn:ietf:params:xml:ns:xmpp-sasl", {"mechanism", -1, TRUE, TRUE, NULL, NULL}}, - {"http://www.google.com/talk/protocol/auth", {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}}, - {"http://www.google.com/talk/protocol/auth", {"client-uses-full-bind-result", -1, TRUE, TRUE, NULL, NULL}}, + {"urn:ietf:params:xml:ns:xmpp-sasl", {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}}, + {"urn:ietf:params:xml:ns:xmpp-sasl", {"mechanism", NULL, TRUE, TRUE, NULL, NULL}}, + {"http://www.google.com/talk/protocol/auth", {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}}, + {"http://www.google.com/talk/protocol/auth", {"client-uses-full-bind-result", NULL, TRUE, TRUE, NULL, NULL}}, }; col_set_str(pinfo->cinfo, COL_INFO, "AUTH"); @@ -537,7 +537,7 @@ xmpp_challenge_response_success(proto_tree *tree, tvbuff_t *tvb, proto_tree *subtree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; col_set_str(pinfo->cinfo, COL_INFO, col_info); @@ -558,8 +558,8 @@ xmpp_failure(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t proto_tree *fail_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"condition", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"condition", NULL, FALSE, TRUE, NULL, NULL} }; static const gchar *fail_names[] = {"aborted","account-disabled", "credentials-expired", @@ -615,13 +615,13 @@ xmpp_stream(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t proto_tree *stream_tree; xmpp_attr_info_ext attrs_info [] = { - {"http://etherx.jabber.org/streams",{"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}}, - {"http://etherx.jabber.org/streams",{"version", -1, FALSE, TRUE, NULL, NULL}}, - {"http://etherx.jabber.org/streams",{"from",-1, FALSE, TRUE, NULL, NULL}}, - {"http://etherx.jabber.org/streams",{"to",-1, FALSE, TRUE, NULL, NULL}}, - {"http://etherx.jabber.org/streams",{"id",-1, FALSE, TRUE, NULL, NULL}}, - {"http://etherx.jabber.org/streams",{"xml:lang",-1, FALSE, TRUE, NULL, NULL}}, - {"jabber:client",{"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}}, + {"http://etherx.jabber.org/streams",{"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}}, + {"http://etherx.jabber.org/streams",{"version", NULL, FALSE, TRUE, NULL, NULL}}, + {"http://etherx.jabber.org/streams",{"from", NULL, FALSE, TRUE, NULL, NULL}}, + {"http://etherx.jabber.org/streams",{"to", NULL, FALSE, TRUE, NULL, NULL}}, + {"http://etherx.jabber.org/streams",{"id", NULL, FALSE, TRUE, NULL, NULL}}, + {"http://etherx.jabber.org/streams",{"xml:lang", NULL, FALSE, TRUE, NULL, NULL}}, + {"jabber:client",{"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}}, }; @@ -680,7 +680,7 @@ xmpp_features_mechanisms(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xm proto_tree *mechanisms_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -702,7 +702,7 @@ xmpp_starttls(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tls_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, }; col_add_fstr(pinfo->cinfo, COL_INFO, "STARTTLS "); @@ -729,7 +729,7 @@ xmpp_proceed(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *proceed_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, }; col_add_fstr(pinfo->cinfo, COL_INFO, "PROCEED "); diff --git a/epan/dissectors/packet-xmpp-gtalk.c b/epan/dissectors/packet-xmpp-gtalk.c index e2b706ddb0..8ee4241f4e 100644 --- a/epan/dissectors/packet-xmpp-gtalk.c +++ b/epan/dissectors/packet-xmpp-gtalk.c @@ -63,10 +63,10 @@ xmpp_gtalk_session(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_ele proto_tree *session_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"type", hf_xmpp_gtalk_session_type, TRUE, TRUE, NULL, NULL}, - {"initiator", -1, FALSE, TRUE, NULL, NULL}, - {"id", -1, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"type", &hf_xmpp_gtalk_session_type, TRUE, TRUE, NULL, NULL}, + {"initiator", NULL, FALSE, TRUE, NULL, NULL}, + {"id", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -96,8 +96,8 @@ xmpp_gtalk_session_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp proto_tree *desc_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"xml:lang", -1, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"xml:lang", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -118,15 +118,15 @@ xmpp_gtalk_session_desc_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* pi proto_tree *payload_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, - {"id", -1, FALSE, TRUE, NULL, NULL}, - {"name", -1, FALSE, TRUE, NULL, NULL}, - {"channels", -1, FALSE, FALSE, NULL, NULL}, - {"clockrate", -1, FALSE, FALSE, NULL, NULL}, - {"bitrate", -1, FALSE, FALSE, NULL, NULL}, - {"width", -1, FALSE, FALSE, NULL, NULL}, - {"height", -1, FALSE, FALSE, NULL, NULL}, - {"framerate", -1, FALSE, FALSE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, + {"id", NULL, FALSE, TRUE, NULL, NULL}, + {"name", NULL, FALSE, TRUE, NULL, NULL}, + {"channels", NULL, FALSE, FALSE, NULL, NULL}, + {"clockrate", NULL, FALSE, FALSE, NULL, NULL}, + {"bitrate", NULL, FALSE, FALSE, NULL, NULL}, + {"width", NULL, FALSE, FALSE, NULL, NULL}, + {"height", NULL, FALSE, FALSE, NULL, NULL}, + {"framerate", NULL, FALSE, FALSE, NULL, NULL}, }; payload_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "PAYLOAD-TYPE"); @@ -143,18 +143,18 @@ xmpp_gtalk_session_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp proto_tree *cand_tree; xmpp_attr_info attrs_info[] = { - {"name", -1, TRUE, TRUE, NULL, NULL}, - {"address", -1, TRUE, FALSE, NULL, NULL}, - {"port", -1, TRUE, FALSE, NULL, NULL}, - {"preference", -1, TRUE, FALSE, NULL, NULL}, - {"type", -1, TRUE, TRUE, NULL, NULL}, - {"protocol", -1, TRUE, TRUE, NULL, NULL}, - {"network", -1, TRUE, FALSE, NULL, NULL}, - {"username", -1, TRUE, FALSE, NULL, NULL}, - {"password", -1, TRUE, FALSE, NULL, NULL}, - {"generation", -1, TRUE, FALSE, NULL, NULL}, - {"foundation", -1, FALSE, FALSE, NULL, NULL}, - {"component", -1, FALSE, FALSE, NULL, NULL} + {"name", NULL, TRUE, TRUE, NULL, NULL}, + {"address", NULL, TRUE, FALSE, NULL, NULL}, + {"port", NULL, TRUE, FALSE, NULL, NULL}, + {"preference", NULL, TRUE, FALSE, NULL, NULL}, + {"type", NULL, TRUE, TRUE, NULL, NULL}, + {"protocol", NULL, TRUE, TRUE, NULL, NULL}, + {"network", NULL, TRUE, FALSE, NULL, NULL}, + {"username", NULL, TRUE, FALSE, NULL, NULL}, + {"password", NULL, TRUE, FALSE, NULL, NULL}, + {"generation", NULL, TRUE, FALSE, NULL, NULL}, + {"foundation", NULL, FALSE, FALSE, NULL, NULL}, + {"component", NULL, FALSE, FALSE, NULL, NULL} }; cand_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "CANDIDATE"); @@ -171,8 +171,8 @@ xmpp_gtalk_session_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, x proto_tree *reason_tree; xmpp_attr_info attrs_info[] = { - {"condition", -1, TRUE, TRUE, NULL, NULL}, - {"text", -1, FALSE, FALSE, NULL, NULL} + {"condition", NULL, TRUE, TRUE, NULL, NULL}, + {"text", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_element_t *condition; @@ -210,7 +210,7 @@ xmpp_gtalk_jingleinfo_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -253,8 +253,8 @@ xmpp_gtalk_jingleinfo_server(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo proto_tree *serv_tree; xmpp_attr_info attrs_info[] = { - {"host", -1, TRUE, TRUE, NULL, NULL}, - {"udp", -1, TRUE, TRUE, NULL, NULL} + {"host", NULL, TRUE, TRUE, NULL, NULL}, + {"udp", NULL, TRUE, TRUE, NULL, NULL} }; serv_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SERVER"); @@ -271,7 +271,7 @@ xmpp_gtalk_jingleinfo_relay(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, proto_tree *relay_tree; xmpp_attr_info attrs_info[] = { - {"token", -1, FALSE, FALSE, NULL, NULL} + {"token", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -300,10 +300,10 @@ xmpp_gtalk_jingleinfo_relay_serv(proto_tree* tree, tvbuff_t* tvb, packet_info* p proto_tree *serv_tree; xmpp_attr_info attrs_info[] = { - {"host", -1, TRUE, TRUE, NULL, NULL}, - {"udp", -1, FALSE, TRUE, NULL, NULL}, - {"tcp", -1, FALSE, TRUE, NULL, NULL}, - {"tcpssl", -1, FALSE, TRUE, NULL, NULL} + {"host", NULL, TRUE, TRUE, NULL, NULL}, + {"udp", NULL, FALSE, TRUE, NULL, NULL}, + {"tcp", NULL, FALSE, TRUE, NULL, NULL}, + {"tcpssl", NULL, FALSE, TRUE, NULL, NULL} }; serv_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SERVER"); @@ -320,7 +320,7 @@ xmpp_gtalk_usersetting(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp proto_tree *sett_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; guint i; @@ -349,7 +349,7 @@ xmpp_gtalk_nosave_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -373,10 +373,10 @@ xmpp_gtalk_nosave_item(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp proto_tree *item_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL,NULL}, - {"jid", -1, TRUE, TRUE, NULL, NULL}, - {"source", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL,NULL}, + {"jid", NULL, TRUE, TRUE, NULL, NULL}, + {"source", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; item_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "ITEM"); @@ -393,8 +393,8 @@ xmpp_gtalk_nosave_x(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_el proto_tree *x_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"value", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"value", NULL, FALSE, TRUE, NULL, NULL} }; x_item = proto_tree_add_item(tree, hf_xmpp_gtalk_nosave_x, tvb, element->offset, element->length, @@ -412,10 +412,10 @@ xmpp_gtalk_mail_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_ proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"newer-than-time", -1, FALSE, TRUE, NULL, NULL}, - {"newer-than-tid", -1, FALSE, TRUE, NULL, NULL}, - {"q", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"newer-than-time", NULL, FALSE, TRUE, NULL, NULL}, + {"newer-than-tid", NULL, FALSE, TRUE, NULL, NULL}, + {"q", NULL, FALSE, TRUE, NULL, NULL} }; col_append_str(pinfo->cinfo, COL_INFO, "QUERY(google:mail:notify) "); @@ -435,11 +435,11 @@ xmpp_gtalk_mail_mailbox(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp proto_tree *mail_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, - {"result-time", -1, FALSE, TRUE, NULL, NULL}, - {"total-matched", -1, FALSE, TRUE, NULL, NULL}, - {"total-estimate", -1, FALSE, TRUE, NULL, NULL}, - {"url", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, + {"result-time", NULL, FALSE, TRUE, NULL, NULL}, + {"total-matched", NULL, FALSE, TRUE, NULL, NULL}, + {"total-estimate", NULL, FALSE, TRUE, NULL, NULL}, + {"url", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -462,13 +462,13 @@ xmpp_gtalk_mail_mail_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, x proto_tree *mail_info_tree; xmpp_attr_info attrs_info [] = { - {"tid", -1, FALSE, FALSE, NULL, NULL}, - {"participation", -1, FALSE, FALSE, NULL, NULL}, - {"messages", -1, FALSE, TRUE, NULL, NULL}, - {"date", -1, FALSE, TRUE, NULL, NULL}, - {"url", -1, FALSE, FALSE, NULL, NULL}, - {"labels", -1, FALSE, FALSE, NULL, NULL}, - {"subject", -1, FALSE, TRUE, NULL, NULL} + {"tid", NULL, FALSE, FALSE, NULL, NULL}, + {"participation", NULL, FALSE, FALSE, NULL, NULL}, + {"messages", NULL, FALSE, TRUE, NULL, NULL}, + {"date", NULL, FALSE, TRUE, NULL, NULL}, + {"url", NULL, FALSE, FALSE, NULL, NULL}, + {"labels", NULL, FALSE, FALSE, NULL, NULL}, + {"subject", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -521,10 +521,10 @@ xmpp_gtalk_mail_sender(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp proto_tree *sender_tree; xmpp_attr_info attrs_info [] = { - {"name", -1, FALSE, TRUE, NULL, NULL}, - {"address", -1, FALSE, TRUE, NULL, NULL}, - {"originator", -1, FALSE, TRUE, NULL, NULL}, - {"unread", -1, FALSE, TRUE, NULL, NULL} + {"name", NULL, FALSE, TRUE, NULL, NULL}, + {"address", NULL, FALSE, TRUE, NULL, NULL}, + {"originator", NULL, FALSE, TRUE, NULL, NULL}, + {"unread", NULL, FALSE, TRUE, NULL, NULL} }; sender_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SENDER"); @@ -558,15 +558,15 @@ xmpp_gtalk_status_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"version", -1, FALSE, TRUE, NULL, NULL}, - {"status-max", -1, FALSE, FALSE, NULL, NULL}, - {"status-list-max", -1, FALSE, FALSE, NULL, NULL}, - {"status-list-contents-max", -1, FALSE, FALSE, NULL, NULL}, - {"status-min-ver", -1, FALSE, TRUE, NULL, NULL}, - {"show", -1, FALSE, TRUE, NULL, NULL}, - {"status", -1, FALSE, TRUE, NULL, NULL}, - {"invisible", -1, FALSE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"version", NULL, FALSE, TRUE, NULL, NULL}, + {"status-max", NULL, FALSE, FALSE, NULL, NULL}, + {"status-list-max", NULL, FALSE, FALSE, NULL, NULL}, + {"status-list-contents-max", NULL, FALSE, FALSE, NULL, NULL}, + {"status-min-ver", NULL, FALSE, TRUE, NULL, NULL}, + {"show", NULL, FALSE, TRUE, NULL, NULL}, + {"status", NULL, FALSE, TRUE, NULL, NULL}, + {"invisible", NULL, FALSE, TRUE, NULL, NULL}, }; xmpp_elem_info elems_info [] = { @@ -611,7 +611,7 @@ xmpp_gtalk_status_status_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinf proto_tree *list_tree; xmpp_attr_info attrs_info [] = { - {"show", -1, TRUE, TRUE, NULL, NULL} + {"show", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_element_t *status; @@ -636,7 +636,7 @@ xmpp_gtalk_transport_p2p(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xm proto_tree *trans_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -657,18 +657,18 @@ xmpp_gtalk_transport_p2p_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinf proto_tree *cand_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"name", -1, FALSE, TRUE, NULL, NULL}, - {"generation", -1, FALSE, FALSE, NULL, NULL}, - {"network", -1, FALSE, FALSE, NULL, NULL}, - {"component", -1, FALSE, FALSE, NULL, NULL}, - {"type", -1, FALSE, FALSE, NULL, NULL}, - {"protocol", -1, FALSE, TRUE, NULL, NULL}, - {"preference", -1, FALSE, FALSE, NULL, NULL}, - {"password", -1, FALSE, FALSE, NULL, NULL}, - {"username", -1, FALSE, FALSE, NULL, NULL}, - {"port", -1, FALSE, TRUE, NULL, NULL}, - {"address", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"name", NULL, FALSE, TRUE, NULL, NULL}, + {"generation", NULL, FALSE, FALSE, NULL, NULL}, + {"network", NULL, FALSE, FALSE, NULL, NULL}, + {"component", NULL, FALSE, FALSE, NULL, NULL}, + {"type", NULL, FALSE, FALSE, NULL, NULL}, + {"protocol", NULL, FALSE, TRUE, NULL, NULL}, + {"preference", NULL, FALSE, FALSE, NULL, NULL}, + {"password", NULL, FALSE, FALSE, NULL, NULL}, + {"username", NULL, FALSE, FALSE, NULL, NULL}, + {"port", NULL, FALSE, TRUE, NULL, NULL}, + {"address", NULL, FALSE, TRUE, NULL, NULL} }; cand_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "CANDIDATE"); diff --git a/epan/dissectors/packet-xmpp-jingle.c b/epan/dissectors/packet-xmpp-jingle.c index 3d0c66298f..4e41452115 100644 --- a/epan/dissectors/packet-xmpp-jingle.c +++ b/epan/dissectors/packet-xmpp-jingle.c @@ -106,11 +106,11 @@ xmpp_jingle(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t xmpp_array_t *rtp_info_array = xmpp_ep_init_array_t(rtp_info_msgs, array_length(rtp_info_msgs)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"action", hf_xmpp_jingle_action, TRUE, TRUE, xmpp_val_enum_list, action_array}, - {"sid", hf_xmpp_jingle_sid, TRUE, FALSE, NULL, NULL}, - {"initiator", hf_xmpp_jingle_initiator, FALSE, FALSE, NULL, NULL}, - {"responder", hf_xmpp_jingle_responder, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"action", &hf_xmpp_jingle_action, TRUE, TRUE, xmpp_val_enum_list, action_array}, + {"sid", &hf_xmpp_jingle_sid, TRUE, FALSE, NULL, NULL}, + {"initiator", &hf_xmpp_jingle_initiator, FALSE, FALSE, NULL, NULL}, + {"responder", &hf_xmpp_jingle_responder, FALSE, FALSE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -142,10 +142,10 @@ xmpp_jingle_content(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_el xmpp_array_t *creator_enums_array = xmpp_ep_init_array_t(creator_enums,array_length(creator_enums)); xmpp_attr_info attrs_info[] = { - {"creator", hf_xmpp_jingle_content_creator, TRUE, FALSE, xmpp_val_enum_list, creator_enums_array}, - {"name", hf_xmpp_jingle_content_name, TRUE, TRUE, NULL, NULL}, - {"disposition", hf_xmpp_jingle_content_disposition, FALSE, FALSE, NULL, NULL}, - {"senders", hf_xmpp_jingle_content_senders, FALSE, FALSE, NULL, NULL} + {"creator", &hf_xmpp_jingle_content_creator, TRUE, FALSE, xmpp_val_enum_list, creator_enums_array}, + {"name", &hf_xmpp_jingle_content_name, TRUE, TRUE, NULL, NULL}, + {"disposition", &hf_xmpp_jingle_content_disposition, FALSE, FALSE, NULL, NULL}, + {"senders", &hf_xmpp_jingle_content_senders, FALSE, FALSE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -177,10 +177,10 @@ xmpp_jingle_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_ele proto_tree *reason_tree; xmpp_attr_info attrs_info[] = { - {"condition", hf_xmpp_jingle_reason_condition, TRUE, TRUE, NULL, NULL}, - {"sid", -1, FALSE, TRUE, NULL, NULL}, - {"rtp-error", -1, FALSE, TRUE, NULL, NULL}, - {"text", hf_xmpp_jingle_reason_text, FALSE, FALSE, NULL, NULL} + {"condition", &hf_xmpp_jingle_reason_condition, TRUE, TRUE, NULL, NULL}, + {"sid", NULL, FALSE, TRUE, NULL, NULL}, + {"rtp-error", NULL, FALSE, TRUE, NULL, NULL}, + {"text", &hf_xmpp_jingle_reason_text, FALSE, FALSE, NULL, NULL} }; xmpp_element_t *condition; /*1?*/ @@ -245,9 +245,9 @@ xmpp_jingle_content_description_rtp(proto_tree* tree, tvbuff_t* tvb, packet_info proto_tree *desc_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"media", hf_xmpp_jingle_content_description_media, TRUE, TRUE, NULL, NULL}, - {"ssrc", hf_xmpp_jingle_content_description_ssrc , FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"media", &hf_xmpp_jingle_content_description_media, TRUE, TRUE, NULL, NULL}, + {"ssrc", &hf_xmpp_jingle_content_description_ssrc , FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -274,13 +274,13 @@ xmpp_jingle_cont_desc_rtp_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* proto_tree *payload_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"id", hf_xmpp_jingle_cont_desc_payload_id, TRUE, TRUE, NULL, NULL}, - {"channels", hf_xmpp_jingle_cont_desc_payload_channels, FALSE, FALSE, NULL, NULL}, - {"clockrate", hf_xmpp_jingle_cont_desc_payload_clockrate, FALSE, FALSE, NULL, NULL}, - {"maxptime", hf_xmpp_jingle_cont_desc_payload_maxptime, FALSE, FALSE, NULL, NULL}, - {"name", hf_xmpp_jingle_cont_desc_payload_name, FALSE, TRUE, NULL, NULL}, - {"ptime", hf_xmpp_jingle_cont_desc_payload_ptime, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"id", &hf_xmpp_jingle_cont_desc_payload_id, TRUE, TRUE, NULL, NULL}, + {"channels", &hf_xmpp_jingle_cont_desc_payload_channels, FALSE, FALSE, NULL, NULL}, + {"clockrate", &hf_xmpp_jingle_cont_desc_payload_clockrate, FALSE, FALSE, NULL, NULL}, + {"maxptime", &hf_xmpp_jingle_cont_desc_payload_maxptime, FALSE, FALSE, NULL, NULL}, + {"name", &hf_xmpp_jingle_cont_desc_payload_name, FALSE, TRUE, NULL, NULL}, + {"ptime", &hf_xmpp_jingle_cont_desc_payload_ptime, FALSE, FALSE, NULL, NULL} }; xmpp_elem_info elems_info [] = @@ -306,9 +306,9 @@ xmpp_jingle_cont_desc_rtp_payload_param(proto_tree* tree, tvbuff_t* tvb, packet_ xmpp_attr_t *name, *value; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"name", hf_xmpp_jingle_cont_desc_payload_param_name, TRUE, TRUE, NULL, NULL}, - {"value", hf_xmpp_jingle_cont_desc_payload_param_value, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"name", &hf_xmpp_jingle_cont_desc_payload_param_name, TRUE, TRUE, NULL, NULL}, + {"value", &hf_xmpp_jingle_cont_desc_payload_param_value, TRUE, TRUE, NULL, NULL} }; name = xmpp_get_attr(element, "name"); @@ -363,10 +363,10 @@ xmpp_jingle_cont_desc_rtp_enc_zrtp_hash(proto_tree* tree, tvbuff_t* tvb, packet_ proto_item *zrtp_hash_item; proto_tree *zrtp_hash_tree; - xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"version", -1, TRUE, TRUE,NULL,NULL}, - {"hash", -1, TRUE, FALSE, NULL, NULL} + xmpp_attr_info attrs_info[] = { + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"version", NULL, TRUE, TRUE,NULL,NULL}, + {"hash", NULL, TRUE, FALSE, NULL, NULL} }; zrtp_hash_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_desc_enc_zrtp_hash, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -389,11 +389,11 @@ xmpp_jingle_cont_desc_rtp_enc_crypto(proto_tree* tree, tvbuff_t* tvb, packet_inf proto_item *crypto_item; proto_tree *crypto_tree; - xmpp_attr_info attrs_info[] = { - {"crypto-suite", -1, TRUE, TRUE, NULL, NULL}, - {"key-params", -1, TRUE, FALSE,NULL,NULL}, - {"session-params", -1, FALSE, TRUE, NULL, NULL}, - {"tag", -1, TRUE, FALSE, NULL, NULL} + xmpp_attr_info attrs_info[] = { + {"crypto-suite", NULL, TRUE, TRUE, NULL, NULL}, + {"key-params", NULL, TRUE, FALSE,NULL,NULL}, + {"session-params", NULL, FALSE, TRUE, NULL, NULL}, + {"tag", NULL, TRUE, FALSE, NULL, NULL} }; crypto_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_desc_enc_crypto, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -412,8 +412,8 @@ xmpp_jingle_cont_desc_rtp_bandwidth(proto_tree* tree, tvbuff_t* tvb, packet_info proto_tree *bandwidth_tree; xmpp_attr_info attrs_info[] = { - {"type", -1, TRUE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"type", NULL, TRUE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; bandwidth_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_desc_bandwidth, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -440,11 +440,11 @@ xmpp_jingle_cont_desc_rtp_hdrext(proto_tree* tree, tvbuff_t* tvb, packet_info *p xmpp_array_t *senders_enums = xmpp_ep_init_array_t(senders, 3); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"id", -1, TRUE, FALSE, NULL, NULL}, - {"uri", -1, TRUE, TRUE, NULL, NULL}, - {"senders", -1, FALSE, TRUE, xmpp_val_enum_list, senders_enums}, - {"parameter", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"id", NULL, TRUE, FALSE, NULL, NULL}, + {"uri", NULL, TRUE, TRUE, NULL, NULL}, + {"senders", NULL, FALSE, TRUE, xmpp_val_enum_list, senders_enums}, + {"parameter", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *parameter; @@ -475,8 +475,8 @@ xmpp_jingle_rtp_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_e xmpp_array_t *creator_enums = xmpp_ep_init_array_t(creator, array_length(creator)); xmpp_attr_info mute_attrs_info[] = { - {"creator", -1, TRUE, TRUE, xmpp_val_enum_list, creator_enums}, - {"name", -1, TRUE, TRUE, NULL, NULL} + {"creator", NULL, TRUE, TRUE, xmpp_val_enum_list, creator_enums}, + {"name", NULL, TRUE, TRUE, NULL, NULL} }; rtp_info_item = proto_tree_add_string(tree, hf_xmpp_jingle_rtp_info, tvb, element->offset, element->length, element->name); @@ -496,9 +496,9 @@ xmpp_jingle_cont_trans_ice(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *trans_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, - {"pwd", hf_xmpp_jingle_cont_trans_pwd, FALSE, FALSE, NULL, NULL}, - {"ufrag", hf_xmpp_jingle_cont_trans_ufrag, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, + {"pwd", &hf_xmpp_jingle_cont_trans_pwd, FALSE, FALSE, NULL, NULL}, + {"ufrag", &hf_xmpp_jingle_cont_trans_ufrag, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -524,19 +524,19 @@ xmpp_jingle_cont_trans_ice_candidate(proto_tree* tree, tvbuff_t* tvb, packet_inf xmpp_array_t *type_enums_array = xmpp_ep_init_array_t(type_enums,array_length(type_enums)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"component", -1, TRUE, FALSE, NULL, NULL}, - {"foundation", -1, TRUE, FALSE, NULL, NULL}, - {"generation", -1, TRUE, FALSE, NULL, NULL}, - {"id", -1, FALSE, FALSE, NULL, NULL}, /*in schemas id is marked as required, but in jitsi logs it doesn't appear*/ - {"ip", -1, TRUE, TRUE, NULL, NULL}, - {"network", -1, TRUE, FALSE, NULL, NULL}, - {"port", -1, TRUE, FALSE, NULL, NULL}, - {"priority", -1, TRUE, TRUE, NULL, NULL}, - {"protocol", -1, TRUE, TRUE, NULL, NULL}, - {"rel-addr", -1, FALSE, FALSE, NULL, NULL}, - {"rel-port", -1, FALSE, FALSE, NULL, NULL}, - {"type", -1, TRUE, TRUE, xmpp_val_enum_list, type_enums_array} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"component", NULL, TRUE, FALSE, NULL, NULL}, + {"foundation", NULL, TRUE, FALSE, NULL, NULL}, + {"generation", NULL, TRUE, FALSE, NULL, NULL}, + {"id", NULL, FALSE, FALSE, NULL, NULL}, /*in schemas id is marked as required, but in jitsi logs it doesn't appear*/ + {"ip", NULL, TRUE, TRUE, NULL, NULL}, + {"network", NULL, TRUE, FALSE, NULL, NULL}, + {"port", NULL, TRUE, FALSE, NULL, NULL}, + {"priority", NULL, TRUE, TRUE, NULL, NULL}, + {"protocol", NULL, TRUE, TRUE, NULL, NULL}, + {"rel-addr", NULL, FALSE, FALSE, NULL, NULL}, + {"rel-port", NULL, FALSE, FALSE, NULL, NULL}, + {"type", NULL, TRUE, TRUE, xmpp_val_enum_list, type_enums_array} }; cand_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_trans_cand, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -554,9 +554,9 @@ xmpp_jingle_cont_trans_ice_remote_candidate(proto_tree* tree, tvbuff_t* tvb, pac proto_tree *remote_cand_tree; xmpp_attr_info attrs_info[] = { - {"component", -1, TRUE, FALSE, NULL, NULL}, - {"ip", -1, TRUE, FALSE, NULL, NULL}, - {"port", -1, TRUE, FALSE, NULL, NULL} + {"component", NULL, TRUE, FALSE, NULL, NULL}, + {"ip", NULL, TRUE, FALSE, NULL, NULL}, + {"port", NULL, TRUE, FALSE, NULL, NULL} }; remote_cand_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_trans_rem_cand, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -575,7 +575,7 @@ xmpp_jingle_cont_trans_raw(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *trans_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info [] = { @@ -599,13 +599,13 @@ xmpp_jingle_cont_trans_raw_candidate(proto_tree* tree, tvbuff_t* tvb, packet_inf xmpp_array_t *type_enums_array = xmpp_ep_init_array_t(type_enums,array_length(type_enums)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"component", -1, TRUE, FALSE, NULL, NULL}, - {"generation", -1, TRUE, FALSE, NULL, NULL}, - {"id", -1, TRUE, FALSE, NULL, NULL}, - {"ip", -1, TRUE, TRUE, NULL, NULL}, - {"port", -1, TRUE, TRUE, NULL, NULL}, - {"type", -1, TRUE, TRUE, xmpp_val_enum_list, type_enums_array} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"component", NULL, TRUE, FALSE, NULL, NULL}, + {"generation", NULL, TRUE, FALSE, NULL, NULL}, + {"id", NULL, TRUE, FALSE, NULL, NULL}, + {"ip", NULL, TRUE, TRUE, NULL, NULL}, + {"port", NULL, TRUE, TRUE, NULL, NULL}, + {"type", NULL, TRUE, TRUE, xmpp_val_enum_list, type_enums_array} }; cand_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_trans_cand, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -623,9 +623,9 @@ xmpp_jingle_cont_trans_s5b(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *trans_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, - {"mode", -1, FALSE, TRUE, NULL, NULL}, - {"sid", -1, FALSE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, + {"mode", NULL, FALSE, TRUE, NULL, NULL}, + {"sid", NULL, FALSE, TRUE, NULL, NULL}, }; xmpp_elem_info elems_info [] = { @@ -653,12 +653,12 @@ xmpp_jingle_cont_trans_s5b_candidate(proto_tree *tree, tvbuff_t *tvb, packet_inf xmpp_array_t *type_enums_array = xmpp_ep_init_array_t(type_enums, array_length(type_enums)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"cid", -1, TRUE, TRUE, NULL, NULL}, - {"jid", -1, TRUE, TRUE, NULL, NULL}, - {"port", -1, FALSE, TRUE, NULL, NULL}, - {"priority", -1, TRUE, TRUE, NULL, NULL}, - {"type", -1, TRUE, TRUE, xmpp_val_enum_list, type_enums_array} + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"cid", NULL, TRUE, TRUE, NULL, NULL}, + {"jid", NULL, TRUE, TRUE, NULL, NULL}, + {"port", NULL, FALSE, TRUE, NULL, NULL}, + {"priority", NULL, TRUE, TRUE, NULL, NULL}, + {"type", NULL, TRUE, TRUE, xmpp_val_enum_list, type_enums_array} }; cand_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_trans_cand, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -713,10 +713,10 @@ xmpp_jingle_cont_trans_ibb(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *trans_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, - {"block-size", -1, TRUE, TRUE, NULL, NULL}, - {"sid", -1, TRUE, TRUE, NULL, NULL}, - {"stanza", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}, + {"block-size", NULL, TRUE, TRUE, NULL, NULL}, + {"sid", NULL, TRUE, TRUE, NULL, NULL}, + {"stanza", NULL, FALSE, TRUE, NULL, NULL} }; trans_item = proto_tree_add_item(tree, hf_xmpp_jingle_cont_trans, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -734,7 +734,7 @@ xmpp_jingle_file_transfer_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pin proto_tree *desc_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -841,9 +841,9 @@ xmpp_jingle_file_transfer_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pin proto_tree *file_tree; xmpp_attr_info attrs_info[] = { - {"name", -1, FALSE, TRUE, NULL, NULL}, - {"size", -1, FALSE, TRUE, NULL, NULL}, - {"date", -1, FALSE, TRUE, NULL, NULL} + {"name", NULL, FALSE, TRUE, NULL, NULL}, + {"size", NULL, FALSE, TRUE, NULL, NULL}, + {"date", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -869,7 +869,7 @@ xmpp_jinglenodes_services(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, x proto_tree *services_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -894,10 +894,10 @@ xmpp_jinglenodes_relay_stun_tracker(proto_tree *tree, tvbuff_t *tvb, packet_info proto_tree *relay_tree; xmpp_attr_info attrs_info[] = { - {"address", -1, TRUE, TRUE, NULL, NULL}, - {"port", -1, FALSE, TRUE, NULL, NULL}, - {"policy", -1, TRUE, TRUE, NULL, NULL}, - {"protocol", -1, TRUE, TRUE, NULL, NULL}, + {"address", NULL, TRUE, TRUE, NULL, NULL}, + {"port", NULL, FALSE, TRUE, NULL, NULL}, + {"policy", NULL, TRUE, TRUE, NULL, NULL}, + {"protocol", NULL, TRUE, TRUE, NULL, NULL}, }; relay_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "%s", element->name); @@ -914,14 +914,14 @@ xmpp_jinglenodes_channel(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xm proto_tree *channel_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"id", -1, FALSE, FALSE, NULL, NULL}, - {"host", -1, FALSE, TRUE, NULL, NULL}, - {"localport", -1, FALSE, TRUE, NULL, NULL}, - {"remoteport", -1, FALSE, TRUE, NULL, NULL}, - {"protocol", -1, TRUE, TRUE, NULL, NULL}, - {"maxkbps", -1, FALSE, FALSE, NULL, NULL}, - {"expire", -1, FALSE, FALSE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"id", NULL, FALSE, FALSE, NULL, NULL}, + {"host", NULL, FALSE, TRUE, NULL, NULL}, + {"localport", NULL, FALSE, TRUE, NULL, NULL}, + {"remoteport", NULL, FALSE, TRUE, NULL, NULL}, + {"protocol", NULL, TRUE, TRUE, NULL, NULL}, + {"maxkbps", NULL, FALSE, FALSE, NULL, NULL}, + {"expire", NULL, FALSE, FALSE, NULL, NULL}, }; channel_item = proto_tree_add_item(tree, hf_xmpp_channel, tvb, element->offset, element->length, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index 283fc2752c..81c454a9e0 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/epan/dissectors/packet-xmpp-other.c @@ -76,9 +76,9 @@ xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t proto_tree *bind_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"resource", hf_xmpp_iq_bind_resource, FALSE, TRUE, NULL, NULL}, - {"jid", hf_xmpp_iq_bind_jid, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"resource", &hf_xmpp_iq_bind_resource, FALSE, TRUE, NULL, NULL}, + {"jid", &hf_xmpp_iq_bind_jid, FALSE, TRUE, NULL, NULL} }; col_append_str(pinfo->cinfo, COL_INFO, "BIND "); @@ -101,7 +101,7 @@ xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t proto_tree *session_tree; xmpp_attr_info attrs_info [] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; session_item = proto_tree_add_item(tree, hf_xmpp_iq_session, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -120,8 +120,8 @@ xmpp_vcard(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t * proto_tree *vcard_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"value", -1, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"value", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_element_t *cdata; @@ -151,8 +151,8 @@ xmpp_vcard_x_update(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_el proto_tree *x_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"photo", -1, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"photo", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_element_t *photo; @@ -178,8 +178,8 @@ xmpp_disco_items_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"node", hf_xmpp_query_node, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"node", &hf_xmpp_query_node, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *item; @@ -206,9 +206,9 @@ xmpp_disco_items_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_ proto_tree *item_tree; xmpp_attr_info attrs_info[] = { - {"jid", hf_xmpp_query_item_jid, TRUE, TRUE, NULL, NULL}, - {"name", hf_xmpp_query_item_name, FALSE, TRUE, NULL, NULL}, - {"node", hf_xmpp_query_item_node, FALSE, TRUE, NULL, NULL} + {"jid", &hf_xmpp_query_item_jid, TRUE, TRUE, NULL, NULL}, + {"name", &hf_xmpp_query_item_name, FALSE, TRUE, NULL, NULL}, + {"node", &hf_xmpp_query_item_node, FALSE, TRUE, NULL, NULL} }; item_item = proto_tree_add_item(tree, hf_xmpp_query_item, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -226,8 +226,8 @@ xmpp_roster_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_elem proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"ver", -1, FALSE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"ver", NULL, FALSE, TRUE, NULL, NULL}, }; xmpp_elem_info elems_info[] = { @@ -256,11 +256,11 @@ xmpp_roster_item(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_eleme xmpp_array_t *subscription_array = xmpp_ep_init_array_t(subscription_enums,array_length(subscription_enums)); xmpp_attr_info attrs_info[] = { - {"jid", hf_xmpp_query_item_jid, TRUE, TRUE, NULL, NULL}, - {"name", hf_xmpp_query_item_name, FALSE, TRUE, NULL, NULL}, - {"ask", hf_xmpp_query_item_ask, FALSE, TRUE, xmpp_val_enum_list, ask_enums_array}, - {"approved", hf_xmpp_query_item_approved, FALSE, TRUE, NULL, NULL}, - {"subscription", hf_xmpp_query_item_subscription, FALSE, TRUE, xmpp_val_enum_list, subscription_array}, + {"jid", &hf_xmpp_query_item_jid, TRUE, TRUE, NULL, NULL}, + {"name", &hf_xmpp_query_item_name, FALSE, TRUE, NULL, NULL}, + {"ask", &hf_xmpp_query_item_ask, FALSE, TRUE, xmpp_val_enum_list, ask_enums_array}, + {"approved", &hf_xmpp_query_item_approved, FALSE, TRUE, NULL, NULL}, + {"subscription", &hf_xmpp_query_item_subscription, FALSE, TRUE, xmpp_val_enum_list, subscription_array}, }; xmpp_element_t *group; @@ -285,8 +285,8 @@ xmpp_disco_info_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"node", hf_xmpp_query_node, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"node", &hf_xmpp_query_node, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *identity, *feature, *x_data; @@ -324,9 +324,9 @@ xmpp_disco_info_identity(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xm proto_tree *identity_tree; xmpp_attr_info attrs_info[] = { - {"category", hf_xmpp_query_identity_category, TRUE, TRUE, NULL, NULL}, - {"name", hf_xmpp_query_identity_name, FALSE, TRUE, NULL, NULL}, - {"type", hf_xmpp_query_identity_type, TRUE, TRUE, NULL, NULL} + {"category", &hf_xmpp_query_identity_category, TRUE, TRUE, NULL, NULL}, + {"name", &hf_xmpp_query_identity_name, FALSE, TRUE, NULL, NULL}, + {"type", &hf_xmpp_query_identity_type, TRUE, TRUE, NULL, NULL} }; identity_item = proto_tree_add_item(tree, hf_xmpp_query_identity, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -360,10 +360,10 @@ xmpp_bytestreams_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmp xmpp_array_t *mode_array = xmpp_ep_init_array_t(mode_enums, array_length(mode_enums)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"sid", -1, FALSE, TRUE, NULL, NULL}, - {"mode", -1, FALSE, TRUE, xmpp_val_enum_list, mode_array}, - {"dstaddr", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"sid", NULL, FALSE, TRUE, NULL, NULL}, + {"mode", NULL, FALSE, TRUE, xmpp_val_enum_list, mode_array}, + {"dstaddr", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *streamhost, *streamhost_used, *activate, *udpsuccess; @@ -406,9 +406,9 @@ xmpp_bytestreams_streamhost(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *sh_tree; xmpp_attr_info attrs_info[] = { - {"jid", -1, TRUE, TRUE, NULL, NULL}, - {"host", -1, TRUE, TRUE, NULL, NULL}, - {"port", -1, FALSE, TRUE, NULL, NULL} + {"jid", NULL, TRUE, TRUE, NULL, NULL}, + {"host", NULL, TRUE, TRUE, NULL, NULL}, + {"port", NULL, FALSE, TRUE, NULL, NULL} }; sh_item = proto_tree_add_item(tree, hf_xmpp_query_streamhost, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -426,7 +426,7 @@ xmpp_bytestreams_streamhost_used(proto_tree *tree, tvbuff_t *tvb, packet_info *p proto_tree *shu_tree; xmpp_attr_info attrs_info[] = { - {"jid", -1, TRUE, TRUE, NULL, NULL} + {"jid", NULL, TRUE, TRUE, NULL, NULL} }; shu_item = proto_tree_add_item(tree, hf_xmpp_query_streamhost_used, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -451,7 +451,7 @@ xmpp_bytestreams_udpsuccess(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree *udps_tree; xmpp_attr_info attrs_info[] = { - {"dstaddr", -1, TRUE, TRUE, NULL, NULL} + {"dstaddr", NULL, TRUE, TRUE, NULL, NULL} }; udps_item = proto_tree_add_item(tree, hf_xmpp_query_udpsuccess, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -472,10 +472,10 @@ xmpp_si(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* ele proto_tree *si_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"id", -1, FALSE, FALSE, NULL, NULL}, - {"mime-type", -1, FALSE, TRUE, NULL, NULL}, - {"profile", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"id", NULL, FALSE, FALSE, NULL, NULL}, + {"mime-type", NULL, FALSE, TRUE, NULL, NULL}, + {"profile", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *file, *feature_neg; @@ -508,13 +508,13 @@ xmpp_si_file(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t proto_item *file_item; proto_tree *file_tree; - xmpp_attr_info attrs_info[] ={ - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"name", -1, TRUE, TRUE, NULL, NULL}, - {"size", -1, TRUE, TRUE, NULL, NULL}, - {"date", -1, FALSE, FALSE, NULL, NULL}, - {"hash", -1, FALSE, FALSE, NULL, NULL}, - {"desc", -1, FALSE, FALSE, NULL, NULL} + xmpp_attr_info attrs_info[] = { + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"name", NULL, TRUE, TRUE, NULL, NULL}, + {"size", NULL, TRUE, TRUE, NULL, NULL}, + {"date", NULL, FALSE, FALSE, NULL, NULL}, + {"hash", NULL, FALSE, FALSE, NULL, NULL}, + {"desc", NULL, FALSE, FALSE, NULL, NULL} }; xmpp_element_t *desc, *range; @@ -545,8 +545,8 @@ xmpp_si_file_range(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_ele proto_tree *range_tree; xmpp_attr_info attrs_info[] = { - {"offset", -1, FALSE, TRUE, NULL, NULL}, - {"length", -1, FALSE, TRUE, NULL, NULL} + {"offset", NULL, FALSE, TRUE, NULL, NULL}, + {"length", NULL, FALSE, TRUE, NULL, NULL} }; range_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "RANGE: "); @@ -566,7 +566,7 @@ xmpp_feature_neg(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_eleme proto_tree *feature_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_element_t *x_data; @@ -596,9 +596,9 @@ xmpp_x_data(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* xmpp_array_t *type_array = xmpp_ep_init_array_t(type_enums, array_length(type_enums)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"type", -1, TRUE, TRUE, xmpp_val_enum_list, type_array}, - {"TITLE", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"type", NULL, TRUE, TRUE, xmpp_val_enum_list, type_array}, + {"TITLE", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -628,11 +628,10 @@ xmpp_x_data_field(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_elem }; xmpp_array_t *type_array = xmpp_ep_init_array_t(type_enums, array_length(type_enums)); - xmpp_attr_info attrs_info[] = - { - {"label", -1, FALSE, TRUE, NULL, NULL}, - {"type", -1, FALSE, TRUE, xmpp_val_enum_list, type_array}, - {"var", -1, FALSE, TRUE, NULL, NULL} + xmpp_attr_info attrs_info[] = { + {"label", NULL, FALSE, TRUE, NULL, NULL}, + {"type", NULL, FALSE, TRUE, xmpp_val_enum_list, type_array}, + {"var", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t /**desc, *required,*/ *value, *option; @@ -663,8 +662,8 @@ xmpp_x_data_field_option(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xm proto_tree *option_tree; xmpp_attr_info attrs_info[] = { - {"label", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, FALSE, TRUE, NULL, NULL} + {"label", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *value; @@ -690,8 +689,8 @@ xmpp_x_data_field_value(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp proto_tree *value_tree; xmpp_attr_info attrs_info[] = { - {"label", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"label", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_attr_t *fake_value; @@ -726,10 +725,10 @@ xmpp_ibb_open(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_ xmpp_array_t *stanza_array = xmpp_ep_init_array_t(stanza_enums, array_length(stanza_enums)); xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"sid", -1, TRUE, TRUE, NULL, NULL}, - {"block-size", -1, TRUE, TRUE, NULL, NULL}, - {"stanza", -1, FALSE, TRUE, xmpp_val_enum_list, stanza_array} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"sid", NULL, TRUE, TRUE, NULL, NULL}, + {"block-size", NULL, TRUE, TRUE, NULL, NULL}, + {"stanza", NULL, FALSE, TRUE, xmpp_val_enum_list, stanza_array} }; col_append_str(pinfo->cinfo, COL_INFO, "IBB-OPEN "); @@ -748,8 +747,8 @@ xmpp_ibb_close(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element proto_tree *close_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"sid", -1, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"sid", NULL, TRUE, TRUE, NULL, NULL} }; col_append_str(pinfo->cinfo, COL_INFO, "IBB-CLOSE "); @@ -768,10 +767,10 @@ xmpp_ibb_data(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_ proto_tree *data_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"sid", -1, TRUE, TRUE, NULL, NULL}, - {"seq", -1, TRUE, TRUE, NULL, NULL}, - {"value", -1, FALSE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"sid", NULL, TRUE, TRUE, NULL, NULL}, + {"seq", NULL, TRUE, TRUE, NULL, NULL}, + {"value", NULL, FALSE, FALSE, NULL, NULL} }; col_append_str(pinfo->cinfo, COL_INFO, "IBB-DATA "); @@ -798,10 +797,10 @@ xmpp_delay(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t * proto_tree *delay_tree; xmpp_attr_info attrs_info[]={ - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"from", -1, FALSE, TRUE, NULL, NULL}, - {"stamp", -1, TRUE, TRUE, NULL, NULL}, - {"value", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"from", NULL, FALSE, TRUE, NULL, NULL}, + {"stamp", NULL, TRUE, TRUE, NULL, NULL}, + {"value", NULL, FALSE, TRUE, NULL, NULL} }; delay_item = proto_tree_add_item(tree, hf_xmpp_delay, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -826,11 +825,11 @@ xmpp_presence_caps(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_ele proto_tree *caps_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"ext", -1, FALSE, FALSE, NULL, NULL}, - {"hash", -1, TRUE, TRUE, NULL, NULL}, - {"node", -1, TRUE, TRUE, NULL, NULL}, - {"ver", -1, TRUE, FALSE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"ext", NULL, FALSE, FALSE, NULL, NULL}, + {"hash", NULL, TRUE, TRUE, NULL, NULL}, + {"node", NULL, TRUE, TRUE, NULL, NULL}, + {"ver", NULL, TRUE, FALSE, NULL, NULL} }; caps_item = proto_tree_add_item(tree, hf_xmpp_presence_caps, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -849,9 +848,9 @@ xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t proto_tree *x_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"condition", hf_xmpp_x_event_condition, TRUE, TRUE, NULL, NULL}, - {"id", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"condition", &hf_xmpp_x_event_condition, TRUE, TRUE, NULL, NULL}, + {"id", NULL, FALSE, TRUE, NULL, NULL} }; static const gchar *cond_names[] = {"offline", "delivered", "displayed", "composing"}; @@ -896,8 +895,8 @@ xmpp_muc_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t * proto_tree *x_tree; xmpp_attr_info attrs_info [] ={ - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"password", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"password", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *pass, *hist; @@ -928,10 +927,10 @@ xmpp_muc_history(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_eleme proto_tree *hist_tree; xmpp_attr_info attrs_info[] = { - {"maxchars", -1, FALSE, TRUE, NULL, NULL}, - {"maxstanzas", -1, FALSE, TRUE, NULL, NULL}, - {"seconds", -1, FALSE, TRUE, NULL, NULL}, - {"since", -1, FALSE, TRUE, NULL, NULL} + {"maxchars", NULL, FALSE, TRUE, NULL, NULL}, + {"maxstanzas", NULL, FALSE, TRUE, NULL, NULL}, + {"seconds", NULL, FALSE, TRUE, NULL, NULL}, + {"since", NULL, FALSE, TRUE, NULL, NULL} }; hist_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "HISTORY: "); @@ -950,8 +949,8 @@ xmpp_muc_user_x(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen proto_tree *x_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, - {"password", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, FALSE, NULL, NULL}, + {"password", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *item, *status, *invite, *password; @@ -999,12 +998,12 @@ xmpp_muc_user_item(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_ele xmpp_array_t *role_array = xmpp_ep_init_array_t(role_enums, array_length(role_enums)); xmpp_attr_info attrs_info [] ={ - {"affiliation", -1, FALSE, TRUE, xmpp_val_enum_list, affil_array}, - {"jid", -1, FALSE, TRUE, NULL, NULL}, - {"nick", -1, FALSE, TRUE, NULL, NULL}, - {"role", -1, FALSE, TRUE, xmpp_val_enum_list, role_array}, - {"reason", -1, FALSE, TRUE, NULL, NULL}, - {"actor_jid", -1, FALSE, TRUE, NULL, NULL} + {"affiliation", NULL, FALSE, TRUE, xmpp_val_enum_list, affil_array}, + {"jid", NULL, FALSE, TRUE, NULL, NULL}, + {"nick", NULL, FALSE, TRUE, NULL, NULL}, + {"role", NULL, FALSE, TRUE, xmpp_val_enum_list, role_array}, + {"reason", NULL, FALSE, TRUE, NULL, NULL}, + {"actor_jid", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *reason, *actor; @@ -1047,9 +1046,9 @@ xmpp_muc_user_invite(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e proto_tree *invite_tree; xmpp_attr_info attrs_info[] = { - {"from", -1, FALSE, TRUE, NULL, NULL}, - {"to", -1, FALSE, TRUE, NULL, NULL}, - {"reason", -1, FALSE, TRUE, NULL, NULL} + {"from", NULL, FALSE, TRUE, NULL, NULL}, + {"to", NULL, FALSE, TRUE, NULL, NULL}, + {"reason", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *reason; @@ -1076,7 +1075,7 @@ xmpp_muc_owner_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_element_t *x_data; @@ -1106,7 +1105,7 @@ xmpp_muc_admin_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL} }; xmpp_element_t *item; @@ -1135,9 +1134,9 @@ xmpp_last_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"seconds", -1, FALSE, TRUE, NULL, NULL}, - {"value", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"seconds", NULL, FALSE, TRUE, NULL, NULL}, + {"value", NULL, FALSE, TRUE, NULL, NULL} }; col_append_str(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:last) "); @@ -1159,14 +1158,14 @@ xmpp_last_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen void xmpp_version_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element) { - proto_item *query_item; + proto_item *query_item; proto_tree *query_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"name", -1, FALSE, TRUE, NULL, NULL}, - {"version", -1, FALSE, TRUE, NULL, NULL}, - {"os", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"name", NULL, FALSE, TRUE, NULL, NULL}, + {"version", NULL, FALSE, TRUE, NULL, NULL}, + {"os", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_element_t *name, *version, *os; @@ -1205,7 +1204,7 @@ xmpp_ping(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *e proto_tree *ping_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, }; col_append_str(pinfo->cinfo, COL_INFO, "PING "); @@ -1224,7 +1223,7 @@ xmpp_hashes(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t proto_tree *hashes_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, }; xmpp_elem_info elems_info[] = { {NAME, "hash", xmpp_hashes_hash, MANY} @@ -1244,8 +1243,8 @@ xmpp_hashes_hash(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_eleme proto_tree *hash_tree; xmpp_attr_info attrs_info[] = { - {"algo", -1, TRUE, TRUE, NULL, NULL}, - {"value", -1, TRUE, TRUE, NULL, NULL} + {"algo", NULL, TRUE, TRUE, NULL, NULL}, + {"value", NULL, TRUE, TRUE, NULL, NULL} }; xmpp_attr_t *fake_cdata = xmpp_ep_init_attr_t(xmpp_elem_cdata(element), element->offset, element->length); @@ -1266,8 +1265,8 @@ xmpp_jitsi_inputevt(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_el proto_tree *inputevt_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, - {"action", -1, FALSE, TRUE, NULL, NULL} + {"xmlns", &hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, + {"action", NULL, FALSE, TRUE, NULL, NULL} }; xmpp_elem_info elems_info[] = { @@ -1288,12 +1287,12 @@ xmpp_jitsi_inputevt_rmt_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo proto_tree *rmt_ctrl_tree; xmpp_attr_info attrs_info[] = { - {"xmlns", hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, - {"action", -1, TRUE, TRUE, NULL, NULL}, - {"x", -1, FALSE, TRUE, NULL, NULL}, - {"y", -1, FALSE, TRUE, NULL, NULL}, - {"btns", -1, FALSE, TRUE, NULL, NULL}, - {"keycode", -1, FALSE, TRUE, NULL, NULL}, + {"xmlns", &hf_xmpp_xmlns, FALSE, FALSE, NULL, NULL}, + {"action", NULL, TRUE, TRUE, NULL, NULL}, + {"x", NULL, FALSE, TRUE, NULL, NULL}, + {"y", NULL, FALSE, TRUE, NULL, NULL}, + {"btns", NULL, FALSE, TRUE, NULL, NULL}, + {"keycode", NULL, FALSE, TRUE, NULL, NULL}, }; xmpp_element_t *action; diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 332f26ce7a..8ca7bab75a 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -802,7 +802,7 @@ proto_item_get_text(proto_item *item) void -xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, xmpp_attr_info *attrs, guint n) +xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, const xmpp_attr_info *attrs, guint n) { proto_item *item = proto_tree_get_parent(tree); xmpp_attr_t *attr; @@ -818,12 +818,12 @@ xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo attr = xmpp_get_attr(element, attrs[i].name); if(attr) { - if(attrs[i].hf != -1) + if(attrs[i].phf != NULL) { if(attr->name) - proto_tree_add_string_format(tree, attrs[i].hf, tvb, attr->offset, attr->length, attr->value,"%s: %s", attr->name, attr->value); + proto_tree_add_string_format(tree, *attrs[i].phf, tvb, attr->offset, attr->length, attr->value,"%s: %s", attr->name, attr->value); else - proto_tree_add_string(tree, attrs[i].hf, tvb, attr->offset, attr->length, attr->value); + proto_tree_add_string(tree, *attrs[i].phf, tvb, attr->offset, attr->length, attr->value); } else { @@ -860,7 +860,7 @@ xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo } void -xmpp_display_attrs_ext(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, xmpp_attr_info_ext *attrs, guint n) +xmpp_display_attrs_ext(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, const xmpp_attr_info_ext *attrs, guint n) { proto_item *item = proto_tree_get_parent(tree); xmpp_attr_t *attr; @@ -886,11 +886,11 @@ xmpp_display_attrs_ext(proto_tree *tree, xmpp_element_t *element, packet_info *p attr = xmpp_get_attr_ext(element, attrs[i].info.name, ""); if (attr) { - if (attrs[i].info.hf != -1) { + if (attrs[i].info.phf != NULL) { if (attr->name) - proto_tree_add_string_format(tree, attrs[i].info.hf, tvb, attr->offset, attr->length, attr->value, "%s: %s", attr->name, attr->value); + proto_tree_add_string_format(tree, *attrs[i].info.phf, tvb, attr->offset, attr->length, attr->value, "%s: %s", attr->name, attr->value); else - proto_tree_add_string(tree, attrs[i].info.hf, tvb, attr->offset, attr->length, attr->value); + proto_tree_add_string(tree, *attrs[i].info.phf, tvb, attr->offset, attr->length, attr->value); } else { proto_tree_add_text(tree, tvb, attr->offset, attr->length, "%s: %s", attr->name ? attr->name : attrs[i].info.name, attr->value); } diff --git a/epan/dissectors/packet-xmpp-utils.h b/epan/dissectors/packet-xmpp-utils.h index 0a522a2150..8b6327f113 100644 --- a/epan/dissectors/packet-xmpp-utils.h +++ b/epan/dissectors/packet-xmpp-utils.h @@ -78,7 +78,7 @@ typedef struct _xmpp_element_t{ /*informations about attributes that are displayed in proto tree*/ typedef struct _xmpp_attr_info{ const gchar *name; - gint hf; + const gint *phf; gboolean is_required; gboolean in_short_list; @@ -239,7 +239,7 @@ extern gpointer xmpp_name_attr_struct(const gchar *name, const gchar *attr_name, * - val_func - validate function * - data - data passes to the val_func */ -extern void xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, xmpp_attr_info *attrs, guint n); +extern void xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, const xmpp_attr_info *attrs, guint n); /** Function does the same as shown above. It takes attrs(XMPP_ATTR_INFO_EXT) argument * that contains XMPP_ATTR_INFO struct and string with namespace. It is used when packet @@ -253,7 +253,7 @@ extern void xmpp_display_attrs(proto_tree *tree, xmpp_element_t *element, packet * </auth> * @endcode */ -extern void xmpp_display_attrs_ext(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, xmpp_attr_info_ext *attrs, guint n); +extern void xmpp_display_attrs_ext(proto_tree *tree, xmpp_element_t *element, packet_info *pinfo, tvbuff_t *tvb, const xmpp_attr_info_ext *attrs, guint n); /** Displays elements from parent element in a way described in elems(XMPP_ELEM_INFO). * XMPP_ELEM_INFO describes how to find particular element and what action should be done |