diff options
Diffstat (limited to 'epan/dissectors/packet-xmpp-other.c')
-rw-r--r-- | epan/dissectors/packet-xmpp-other.c | 241 |
1 files changed, 120 insertions, 121 deletions
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; |