check_col() not req'd and other minor cleanups ....

svn path=/trunk/; revision=40503

1 files changed, 752 insertions, 754 deletions

diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c
index 627e9f765b..788a276c5a 100644
--- a/epan/dissectors/packet-xmpp.c
+++ b/epan/dissectors/packet-xmpp.c
@@ -47,7 +47,7 @@
 
 #define XMPP_PORT 5222
 
-static dissector_handle_t xml_handle = NULL;
+static dissector_handle_t xml_handle;
 
 int proto_xmpp = -1;
 
@@ -365,20 +365,20 @@ static void
 dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
     xml_frame_t *xml_frame;
-    gboolean out_packet;
+    gboolean     out_packet;
 
-    conversation_t *conversation;
+    conversation_t   *conversation;
     xmpp_conv_info_t *xmpp_info;
 
-    proto_tree *xmpp_tree = NULL;
-    proto_item *xmpp_item = NULL;
+    proto_tree *xmpp_tree  = NULL;
+    proto_item *xmpp_item  = NULL;
 
     xmpp_element_t *packet = NULL;
 
     /*check if desegment
      * now it checks that last char is '>',
      * TODO checks that first element in packet is closed*/
-    int index;
+    int   index;
     gchar last_char;
 
     if (xmpp_desegment)
@@ -388,13 +388,13 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
         {
             last_char = tvb_get_guint8(tvb, index);
 
-            while (last_char <= ' ' && index - 1 >= 0)
+            while ((last_char <= ' ') && (index - 1 >= 0))
             {
                 index--;
                 last_char = tvb_get_guint8(tvb, index);
             }
 
-            if (index >= 0 && last_char != '>')
+            if ((index >= 0) && (last_char != '>'))
             {
                 pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
                 return;
@@ -402,11 +402,9 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
         }
     }
 
-    if(check_col(pinfo->cinfo, COL_PROTOCOL))
-        col_set_str(pinfo->cinfo, COL_PROTOCOL, "XMPP");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "XMPP");
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-            col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /*if tree == NULL then xmpp_item and xmpp_tree will also NULL*/
     xmpp_item = proto_tree_add_item(tree, proto_xmpp, tvb, 0, -1, ENC_NA);
@@ -533,737 +531,737 @@ void
 proto_register_xmpp(void) {
     static hf_register_info hf[] = {
         { &hf_xmpp_iq,
-            {
-                "IQ", "xmpp.iq", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq packet", HFILL
-            }},
-            {&hf_xmpp_xmlns,
-            {
-                "xmlns", "xmpp.xmlns", FT_STRING, BASE_NONE, NULL, 0x0,
-                "element namespace", HFILL
-            }},
-            { &hf_xmpp_id,
-            {
-                "id", "xmpp.id", FT_STRING, BASE_NONE, NULL, 0x0,
-                "packet id", HFILL
-            }},
-            { &hf_xmpp_type,
-            {
-                "type", "xmpp.type", FT_STRING, BASE_NONE, NULL, 0x0,
-                "packet type", HFILL
-            }},
-             { &hf_xmpp_from,
-            {
-                "from", "xmpp.from", FT_STRING, BASE_NONE, NULL, 0x0,
-                "packet from", HFILL
-            }},
-             { &hf_xmpp_to,
-            {
-                "to", "xmpp.to", FT_STRING, BASE_NONE, NULL, 0x0,
-                "packet to", HFILL
-            }},
-            { &hf_xmpp_query,
-            {
-                "QUERY", "xmpp.query", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq query", HFILL
-            }},
-            { &hf_xmpp_query_node,
-            {
-                "node", "xmpp.query.node", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query node", HFILL
-            }},
-            { &hf_xmpp_query_item,
-            {
-                "ITEM", "xmpp.query.item", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq query item", HFILL
-
-            }},
-            { &hf_xmpp_query_item_jid,
-            {
-                "jid", "xmpp.query.item.jid", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item jid", HFILL
-
-            }},
-            { &hf_xmpp_query_item_name,
-            {
-                "name", "xmpp.query.item.name", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item name", HFILL
-            }},
-            { &hf_xmpp_query_item_subscription,
-            {
-                "subscription", "xmpp.query.item.subscription", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item subscription", HFILL
-            }},
-            { &hf_xmpp_query_item_ask,
-            {
-                "ask", "xmpp.query.item.ask", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item ask", HFILL
-            }},
-            { &hf_xmpp_query_item_group,
-            {
-                "GROUP", "xmpp.query.item.group", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item group", HFILL
-
-            }},
-            { &hf_xmpp_query_item_approved,
-            {
-                "approved", "xmpp.query.item.approved", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item approved", HFILL
-
-            }},
-            { &hf_xmpp_query_item_node,
-            {
-                "node", "xmpp.query.item.node", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query item node", HFILL
-
-            }},
-            { &hf_xmpp_query_identity,
-            {
-                "IDENTITY", "xmpp.query.identity", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq query identity", HFILL
-
-            }},
-            { &hf_xmpp_query_identity_category,
-            {
-                "category", "xmpp.query.identity.category", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query identity category", HFILL
-
-            }},
-            { &hf_xmpp_query_identity_type,
-            {
-                "type", "xmpp.query.identity.type", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query identity type", HFILL
-
-            }},
-            { &hf_xmpp_query_identity_name,
-            {
-                "name", "xmpp.query.identity.name", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query identity name", HFILL
-
-            }},
-            { &hf_xmpp_query_identity_lang,
-            {
-                "lang", "xmpp.query.identity.lang", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query identity lang", HFILL
-
-            }},
-            { &hf_xmpp_query_feature,
-            {
-                "FEATURE", "xmpp.query.feature", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query feature", HFILL
-
-            }},
-            { &hf_xmpp_query_streamhost,
-            {
-                "STREAMHOST", "xmpp.query.streamhost", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq query streamhost", HFILL
-
-            }},
-            { &hf_xmpp_query_streamhost_used,
-            {
-                "STREAMHOST-USED", "xmpp.query.streamhost-used", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq query streamhost-used", HFILL
-
-            }},
-            { &hf_xmpp_query_activate,
-            {
-                "ACTIVATE", "xmpp.query.activate", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq query activate", HFILL
-
-            }},
-            { &hf_xmpp_query_udpsuccess,
-            {
-                "UDPSUCCESS", "xmpp.query.udpsuccess", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq query streamhost-used", HFILL
-
-            }},
-            { &hf_xmpp_error,
-            {
-                "ERROR", "xmpp.error", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq error", HFILL
-            }},
-            { &hf_xmpp_error_code,
-            {
-                "code", "xmpp.error.code", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq stanza error code", HFILL
-
-            }},
-            { &hf_xmpp_error_type,
-            {
-                "type", "xmpp.error.type", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq error type", HFILL
-
-            }},
-            { &hf_xmpp_error_condition,
-            {
-                "CONDITION", "xmpp.error.condition", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq error condition", HFILL
-
-            }},
-            { &hf_xmpp_error_text,
-            {
-                "TEXT", "xmpp.error.text", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq error text", HFILL
-
-            }},
-            { &hf_xmpp_iq_bind,
-            {
-                "BIND", "xmpp.iq.bind", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq bind", HFILL
-
-            }},
-            { &hf_xmpp_iq_bind_jid,
-            {
-                "jid", "xmpp.iq.bind.jid", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq bind jid", HFILL
-
-            }},
-            { &hf_xmpp_iq_bind_resource,
-            {
-                "resource", "xmpp.iq.bind.resource", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq bind resource", HFILL
-
-            }},
-            { &hf_xmpp_services,
-            {
-                "SERVICES", "xmpp.services", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jabber.org/protocol/jinglenodes services", HFILL
-            }},
-            { &hf_xmpp_channel,
-            {
-                "CHANNEL", "xmpp.channel", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jabber.org/protocol/jinglenodes#channel", HFILL
-            }},
-            { &hf_xmpp_iq_session,
-            {
-                "SESSION", "xmpp.iq.session", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq session", HFILL
-            }},
-            { &hf_xmpp_vcard,
-            {
-                "VCARD", "xmpp.vcard", FT_NONE, BASE_NONE, NULL, 0x0,
-                "vcard-temp", HFILL
-            }},
-            { &hf_xmpp_vcard_x_update,
-            {
-                "X VCARD-UPDATE", "xmpp.vcard-update", FT_NONE, BASE_NONE, NULL, 0x0,
-                "vcard-temp:x:update", HFILL
-            }},
-            { &hf_xmpp_jingle,
-            {
-                "JINGLE", "xmpp.jingle", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle", HFILL
-            }},
-            { &hf_xmpp_jingle_action,
-            {
-                "action", "xmpp.jingle.action", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle action", HFILL
-            }},
-            { &hf_xmpp_jingle_sid,
-            {
-                "sid", "xmpp.jingle.sid", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle sid", HFILL
-            }},
-            { &hf_xmpp_jingle_initiator,
-            {
-                "initiator", "xmpp.jingle.initiator", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle initiator", HFILL
-            }},
-            { &hf_xmpp_jingle_responder,
-            {
-                "responder", "xmpp.jingle.responder", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle responder", HFILL
-            }},
-            { &hf_xmpp_jingle_content,
-            {
-                "CONTENT", "xmpp.jingle.content", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content", HFILL
-            }},
-            { &hf_xmpp_jingle_content_creator,
-            {
-                "creator", "xmpp.jingle.content.creator", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content creator", HFILL
-            }},
-            { &hf_xmpp_jingle_content_name,
-            {
-                "name", "xmpp.jingle.content.name", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content name", HFILL
-            }},
-            { &hf_xmpp_jingle_content_disposition,
-            {
-                "disposition", "xmpp.jingle.content.disposition", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content disposition", HFILL
-            }},
-            { &hf_xmpp_jingle_content_senders,
-            {
-                "senders", "xmpp.jingle.content.senders", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content senders", HFILL
-            }},
-            { &hf_xmpp_jingle_content_description,
-            {
-                "DESCRIPTION", "xmpp.jingle.content.description", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content description", HFILL
-            }},
-            { &hf_xmpp_jingle_content_description_media,
-            {
-                "media", "xmpp.jingle.content.description.media", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description", HFILL
-            }},
-            { &hf_xmpp_jingle_content_description_ssrc,
-            {
-                "ssrc", "xmpp.jingle.content.description.ssrc", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description ssrc", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload,
-            {
-                "PAYLOAD-TYPE", "xmpp.jingle.content.description.payload-type", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_id,
-            {
-                "id", "xmpp.jingle.content.description.payload-type.id", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type id", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_channels,
-            {
-                "channels", "xmpp.jingle.content.description.payload-type.channels", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type channels", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_clockrate,
-            {
-                "clockrate", "xmpp.jingle.content.description.payload-type.clockrate", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type clockrate", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_maxptime,
-            {
-                "maxptime", "xmpp.jingle.content.description.payload-type.maxptime", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type maxptime", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_name,
-            {
-                "name", "xmpp.jingle.content.description.payload-type.name", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type name", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_ptime,
-            {
-                "ptime", "xmpp.jingle.content.description.payload-type.ptime", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type ptime", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_param,
-            {
-                "PARAMETER", "xmpp.jingle.content.description.payload-type.parameter", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type parameter", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_param_name,
-            {
-                "name", "xmpp.jingle.content.description.payload-type.parameter.name", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type parameter name", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_payload_param_value,
-            {
-                "value", "xmpp.jingle.content.description.payload-type.parameter.value", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content description payload-type parameter value", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans,
-            {
-                "TRANSPORT", "xmpp.jingle.content.transport", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content transport", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_ufrag,
-            {
-                "ufrag", "xmpp.jingle.content.transport.ufrag", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content transport ufrag", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_pwd,
-            {
-                "pwd", "xmpp.jingle.content.transport.pwd", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle content transport pwd", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_cand,
-            {
-                "CANDIDATE", "xmpp.jingle.content.transport.candidate", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content transport candidate", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_rem_cand,
-            {
-                "REMOTE-CANDIDATE", "xmpp.jingle.content.transport.remote-candidate", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content transport remote-candidate", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_activated,
-            {
-                "ACTIVATED", "xmpp.jingle.content.transport.activated", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:transports:s5b:1 activated", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_candidate_used,
-            {
-                "CANDIDATE-USED", "xmpp.jingle.content.transport.candidate-used", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:transports:s5b:1 candidate-used", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_trans_candidate_error,
-            {
-                "CANDIDATE-ERROR", "xmpp.jingle.content.transport.candidate-error", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:transports:s5b:1 candidate-error", HFILL
-            }},
-             { &hf_xmpp_jingle_cont_trans_proxy_error,
-            {
-                "PROXY-ERROR", "xmpp.jingle.content.transport.proxy-error", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:transports:s5b:1 proxy-error", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_enc,
-            {
-                "ENCRYPTION", "xmpp.jingle.content.description.encryption", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content descryption encryption", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_enc_zrtp_hash,
-            {
-                "ZRTP-HASH", "xmpp.jingle.content.description.encryption.zrtp-hash", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content descryption encryption zrtp-hash", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_enc_crypto,
-            {
-                "CRYPTO", "xmpp.jingle.content.description.encryption.crypto", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content descryption encryption crypto", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_bandwidth,
-            {
-                "BANDWIDTH", "xmpp.jingle.content.description.bandwidth", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content descryption bandwidth", HFILL
-            }},
-            { &hf_xmpp_jingle_cont_desc_rtp_hdr,
-            {
-                "RTP-HDREXT", "xmpp.jingle.content.description.rtp-hdrext", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle content descryption rtp-hdrext", HFILL
-            }},
-            { &hf_xmpp_jingle_reason,
-            {
-                "REASON", "xmpp.jingle.reason", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq jingle reason", HFILL
-            }},
-            { &hf_xmpp_jingle_reason_condition,
-            {
-                "CONDITION", "xmpp.jingle.reason.condition", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle reason condition", HFILL
-            }},
-            { &hf_xmpp_jingle_reason_text,
-            {
-                "TEXT", "xmpp.jingle.reason.text", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle reason text", HFILL
-            }},
-            { &hf_xmpp_jingle_rtp_info,
-            {
-                "RTP-INFO", "xmpp.jingle.rtp_info", FT_STRING, BASE_NONE, NULL, 0x0,
-                "iq jingle rtp-info(ringing, active, hold, mute, ...)", HFILL
-            }},
-            { &hf_xmpp_jingle_file_transfer_offer,
-            {
-                "OFFER", "xmpp.jingle.content.description.offer", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:apps:file-transfer:3 offer", HFILL
-            }},
-            { &hf_xmpp_jingle_file_transfer_request,
-            {
-                "REQUEST", "xmpp.jingle.content.description.request", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:apps:file-transfer:3 request", HFILL
-            }},
-            { &hf_xmpp_jingle_file_transfer_received,
-            {
-                "RECEIVED", "xmpp.jingle.content.received", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:apps:file-transfer:3 received", HFILL
-            }},
-            { &hf_xmpp_jingle_file_transfer_abort,
-            {
-                "ABORT", "xmpp.jingle.content.abort", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:apps:file-transfer:3 abort", HFILL
-            }},
-            { &hf_xmpp_jingle_file_transfer_checksum,
-            {
-                "CHECKSUM", "xmpp.jingle.content.checksum", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:jingle:apps:file-transfer:3 checksum", HFILL
-            }},
-            { &hf_xmpp_si,
-            {
-                "SI", "xmpp.si", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq si", HFILL
-            }},
-            { &hf_xmpp_si_file,
-            {
-                "FILE", "xmpp.si.file", FT_NONE, BASE_NONE, NULL, 0x0,
-                "iq si file", HFILL
-            }},
-            { &hf_xmpp_iq_feature_neg,
-            {
-                "FEATURE", "xmpp.feature-neg", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jabber.org/protocol/feature-neg", HFILL
-            }},
-            { &hf_xmpp_x_data,
-            {
-                "X-DATA", "xmpp.x-data", FT_NONE, BASE_NONE, NULL, 0x0,
-                "jabber:x:data", HFILL
-            }},
-            { &hf_xmpp_x_data_field,
-            {
-                "FIELD", "xmpp.x-data.field", FT_NONE, BASE_NONE, NULL, 0x0,
-                "jabber:x:data field", HFILL
-            }},
-            { &hf_xmpp_x_data_field_value,
-            {
-                "VALUE", "xmpp.x-data.field.value", FT_NONE, BASE_NONE, NULL, 0x0,
-                "jabber:x:data field value", HFILL
-            }},
-            { &hf_xmpp_delay,
-            {
-                "DELAY", "xmpp.delay", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:delay", HFILL
-            }},
-            { &hf_xmpp_x_event,
-            {
-                "X EVENT", "xmpp.x-event", FT_NONE, BASE_NONE, NULL, 0x0,
-                "jabber:x:event", HFILL
-            }},
-            { &hf_xmpp_x_event_condition,
-            {
-                "CONDITION", "xmpp.x-event.condition", FT_STRING, BASE_NONE, NULL, 0x0,
-                "jabber:x:event condition", HFILL
-            }},
-            { &hf_xmpp_presence,
-            {
-                "PRESENCE", "xmpp.presence", FT_NONE, BASE_NONE, NULL, 0x0,
-                "presence packet", HFILL
-            }},
-            { &hf_xmpp_presence_show,
-            {
-                "SHOW", "xmpp.presence.show", FT_STRING, BASE_NONE, NULL, 0x0,
-                "presence show", HFILL
-            }},
-            { &hf_xmpp_presence_status,
-            {
-                "STATUS", "xmpp.presence.status", FT_NONE, BASE_NONE, NULL, 0x0,
-                "presence status", HFILL
-            }},
-            { &hf_xmpp_presence_caps,
-            {
-                "CAPS", "xmpp.presence.caps", FT_NONE, BASE_NONE, NULL, 0x0,
-                "presence caps", HFILL
-            }},
-            { &hf_xmpp_message,
-            {
-                "MESSAGE", "xmpp.message", FT_NONE, BASE_NONE, NULL, 0x0,
-                "message packet", HFILL
-            }},
-            { &hf_xmpp_message_chatstate,
-            {
-                "CHATSTATE", "xmpp.message.chatstate", FT_STRING, BASE_NONE, NULL, 0x0,
-                "message chatstate", HFILL
-            }},
-            { &hf_xmpp_message_thread,
-            {
-                "THREAD", "xmpp.message.thread", FT_NONE, BASE_NONE, NULL, 0x0,
-                "message thread", HFILL
-            }},
-            { &hf_xmpp_message_body,
-            {
-                "BODY", "xmpp.message.body", FT_NONE, BASE_NONE, NULL, 0x0,
-                "message body", HFILL
-            }},
-             { &hf_xmpp_message_subject,
-            {
-                "SUBJECT", "xmpp.message.subject", FT_NONE, BASE_NONE, NULL, 0x0,
-                "message subject", HFILL
-            }},
-            { &hf_xmpp_message_thread_parent,
-            {
-                "parent", "xmpp.message.thread.parent", FT_STRING, BASE_NONE, NULL, 0x0,
-                "message thread parent", HFILL
-            }},
-            { &hf_xmpp_auth,
-            {
-                "AUTH", "xmpp.auth", FT_NONE, BASE_NONE, NULL, 0x0,
-                "auth packet", HFILL
-            }},
-            { &hf_xmpp_stream,
-            {
-                "STREAM", "xmpp.stream", FT_NONE, BASE_NONE, NULL, 0x0,
-                "XMPP stream", HFILL
-            }},
-            { &hf_xmpp_challenge,
-            {
-                "CHALLENGE", "xmpp.challenge", FT_NONE, BASE_NONE, NULL, 0x0,
-                "challenge packet", HFILL
-            }},
-            { &hf_xmpp_response,
-            {
-                "RESPONSE", "xmpp.response", FT_NONE, BASE_NONE, NULL, 0x0,
-                "response packet", HFILL
-            }},
-            { &hf_xmpp_success,
-            {
-                "SUCCESS", "xmpp.success", FT_NONE, BASE_NONE, NULL, 0x0,
-                "success packet", HFILL
-            }},
-            { &hf_xmpp_failure,
-            {
-                "FAILURE", "xmpp.failure", FT_NONE, BASE_NONE, NULL, 0x0,
-                "failure packet", HFILL
-            }},
-            { &hf_xmpp_features,
-            {
-                "FEATURES", "xmpp.features", FT_NONE, BASE_NONE, NULL, 0x0,
-                "stream features", HFILL
-            }},
-            { &hf_xmpp_starttls,
-            {
-                "STARTTLS", "xmpp.starttls", FT_NONE, BASE_NONE, NULL, 0x0,
-                "starttls packet", HFILL
-            }},
-            { &hf_xmpp_proceed,
-            {
-                "PROCEED", "xmpp.proceed", FT_NONE, BASE_NONE, NULL, 0x0,
-                "proceed packet", HFILL
-            }},
-            { &hf_xmpp_unknown,
-            {
-                "UNKNOWN", "xmpp.unknown", FT_STRING, BASE_NONE, NULL, 0x0,
-                "unknown element", HFILL
-            }},
-            { &hf_xmpp_unknown_attr,
-            {
-                "UNKNOWN ATTR", "xmpp.unknown_attr", FT_STRING, BASE_NONE, NULL, 0x0,
-                "unknown attribute", HFILL
-            }},
-            { &hf_xmpp_ibb_open,
-            {
-                "IBB-OPEN", "xmpp.ibb.open", FT_NONE, BASE_NONE, NULL, 0x0,
-                "xmpp ibb open", HFILL
-            }},
-            { &hf_xmpp_ibb_close,
-            {
-                "IBB-CLOSE", "xmpp.ibb.close", FT_NONE, BASE_NONE, NULL, 0x0,
-                "xmpp ibb close", HFILL
-            }},
-            { &hf_xmpp_ibb_data,
-            {
-                "IBB-DATA", "xmpp.ibb.data", FT_NONE, BASE_NONE, NULL, 0x0,
-                "xmpp ibb data", HFILL
-            }},
-            { &hf_xmpp_muc_x,
-            {
-                "X MUC", "xmpp.muc-x", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jabber.org/protocol/muc", HFILL
-            }},
-            { &hf_xmpp_muc_user_x,
-            {
-                "X MUC-USER", "xmpp.muc-user-x", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jabber.org/protocol/muc#user", HFILL
-            }},
-            { &hf_xmpp_muc_user_item,
-            {
-                "ITEM", "xmpp.muc-user-x.item", FT_NONE, BASE_NONE, NULL, 0x0,
-                "muc#user item", HFILL
-            }},
-            { &hf_xmpp_muc_user_invite,
-            {
-                "INVITE", "xmpp.muc-user-x.invite", FT_NONE, BASE_NONE, NULL, 0x0,
-                "muc#user invite", HFILL
-            }},
-            { &hf_xmpp_gtalk_session,
-            {
-                "GTALK-SESSION", "xmpp.gtalk.session", FT_NONE, BASE_NONE, NULL, 0x0,
-                "GTalk session", HFILL
-            }},
-            { &hf_xmpp_gtalk_session_type,
-            {
-                "type", "xmpp.gtalk.session.type", FT_STRING, BASE_NONE, NULL, 0x0,
-                "GTalk session type", HFILL
-            }},
-            { &hf_xmpp_gtalk,
-            {
-                "GTALK SESSION", "xmpp.gtalk", FT_STRING, BASE_NONE, NULL, 0x0,
-                "GTalk SID", HFILL
-            }},
-            { &hf_xmpp_gtalk_setting,
-            {
-                "USERSETTING", "xmpp.gtalk.setting", FT_NONE, BASE_NONE, NULL, 0x0,
-                "google:setting usersetting", HFILL
-            }},
-            { &hf_xmpp_gtalk_nosave_x,
-            {
-                "X-NOSAVE", "xmpp.gtalk.nosave.x", FT_NONE, BASE_NONE, NULL, 0x0,
-                "google:nosave x", HFILL
-            }},
-            { &hf_xmpp_gtalk_mail_mailbox,
-            {
-                "MAILBOX", "xmpp.gtalk.mailbox", FT_NONE, BASE_NONE, NULL, 0x0,
-                "google:mail:notify mailbox", HFILL
-            }},
-            { &hf_xmpp_gtalk_mail_new_mail,
-            {
-                "NEW MAIL", "xmpp.gtalk.new-mail", FT_NONE, BASE_NONE, NULL, 0x0,
-                "google:mail:notify new-mail", HFILL
-            }},
-            { &hf_xmpp_gtalk_transport_p2p,
-            {
-                "TRANSPORT", "xmpp.gtalk.transport-p2p", FT_NONE, BASE_NONE, NULL, 0x0,
-                "google/transport/p2p", HFILL
-            }},
-            { &hf_xmpp_conf_info,
-            {
-                "CONFERENCE INFO", "xmpp.conf-info", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:ietf:params:xml:ns:conference-info", HFILL
-            }},
-             { &hf_xmpp_conf_info_sid,
-            {
-                "sid", "xmpp.conf-info.sid", FT_STRING, BASE_NONE, NULL, 0x0,
-                "urn:ietf:params:xml:ns:conference-info sid", HFILL
-            }},
-            { &hf_xmpp_response_in,
-                { "Response In", "xmpp.response_in",
-                FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-                "The response to this request is in this frame", HFILL }
-            },
-            { &hf_xmpp_response_to,
-                { "Request In", "xmpp.response_to",
-                FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-                "This is a response to the request in this frame", HFILL }
-            },
-            { &hf_xmpp_out,
-            {
-                "Out", "xmpp.out", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-                "Outgoing packet", HFILL
-            }},
-            { &hf_xmpp_in,
-            {
-                "In", "xmpp.in", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-                "Ingoing packet", HFILL
-            }},
-            { &hf_xmpp_ibb,
-            {
-                "IBB SESSION", "xmpp.ibb", FT_STRING, BASE_NONE, NULL, 0x0,
-                "In-Band Bytestreams session", HFILL
-            }},
-            { &hf_xmpp_jingle_session,
-            {
-                "JINGLE SESSION", "xmpp.jingle_session", FT_STRING, BASE_NONE, NULL, 0x0,
-                "Jingle SID", HFILL
-            }},
-            { &hf_xmpp_ping,
-            {
-                "PING", "xmpp.ping", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:ping", HFILL
-            }},
-            { &hf_xmpp_hashes,
-            {
-                "HASHES", "xmpp.hashes", FT_NONE, BASE_NONE, NULL, 0x0,
-                "urn:xmpp:hashes:0", HFILL
-            }},
-            { &hf_xmpp_jitsi_inputevt,
-            {
-                "INPUTEVT", "xmpp.inputevt", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jitsi.org/protocol/inputevt", HFILL
-            }},
-            { &hf_xmpp_jitsi_inputevt_rmt_ctrl,
-            {
-                "REMOTE-CONTROL", "xmpp.inputevt.remote-control", FT_NONE, BASE_NONE, NULL, 0x0,
-                "http://jitsi.org/protocol/inputevt remote-control", HFILL
-            }},
+          {
+              "IQ", "xmpp.iq", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq packet", HFILL
+          }},
+        {&hf_xmpp_xmlns,
+         {
+             "xmlns", "xmpp.xmlns", FT_STRING, BASE_NONE, NULL, 0x0,
+             "element namespace", HFILL
+         }},
+        { &hf_xmpp_id,
+          {
+              "id", "xmpp.id", FT_STRING, BASE_NONE, NULL, 0x0,
+              "packet id", HFILL
+          }},
+        { &hf_xmpp_type,
+          {
+              "type", "xmpp.type", FT_STRING, BASE_NONE, NULL, 0x0,
+              "packet type", HFILL
+          }},
+        { &hf_xmpp_from,
+          {
+              "from", "xmpp.from", FT_STRING, BASE_NONE, NULL, 0x0,
+              "packet from", HFILL
+          }},
+        { &hf_xmpp_to,
+          {
+              "to", "xmpp.to", FT_STRING, BASE_NONE, NULL, 0x0,
+              "packet to", HFILL
+          }},
+        { &hf_xmpp_query,
+          {
+              "QUERY", "xmpp.query", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq query", HFILL
+          }},
+        { &hf_xmpp_query_node,
+          {
+              "node", "xmpp.query.node", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query node", HFILL
+          }},
+        { &hf_xmpp_query_item,
+          {
+              "ITEM", "xmpp.query.item", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq query item", HFILL
+
+          }},
+        { &hf_xmpp_query_item_jid,
+          {
+              "jid", "xmpp.query.item.jid", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item jid", HFILL
+
+          }},
+        { &hf_xmpp_query_item_name,
+          {
+              "name", "xmpp.query.item.name", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item name", HFILL
+          }},
+        { &hf_xmpp_query_item_subscription,
+          {
+              "subscription", "xmpp.query.item.subscription", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item subscription", HFILL
+          }},
+        { &hf_xmpp_query_item_ask,
+          {
+              "ask", "xmpp.query.item.ask", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item ask", HFILL
+          }},
+        { &hf_xmpp_query_item_group,
+          {
+              "GROUP", "xmpp.query.item.group", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item group", HFILL
+
+          }},
+        { &hf_xmpp_query_item_approved,
+          {
+              "approved", "xmpp.query.item.approved", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item approved", HFILL
+
+          }},
+        { &hf_xmpp_query_item_node,
+          {
+              "node", "xmpp.query.item.node", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query item node", HFILL
+
+          }},
+        { &hf_xmpp_query_identity,
+          {
+              "IDENTITY", "xmpp.query.identity", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq query identity", HFILL
+
+          }},
+        { &hf_xmpp_query_identity_category,
+          {
+              "category", "xmpp.query.identity.category", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query identity category", HFILL
+
+          }},
+        { &hf_xmpp_query_identity_type,
+          {
+              "type", "xmpp.query.identity.type", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query identity type", HFILL
+
+          }},
+        { &hf_xmpp_query_identity_name,
+          {
+              "name", "xmpp.query.identity.name", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query identity name", HFILL
+
+          }},
+        { &hf_xmpp_query_identity_lang,
+          {
+              "lang", "xmpp.query.identity.lang", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query identity lang", HFILL
+
+          }},
+        { &hf_xmpp_query_feature,
+          {
+              "FEATURE", "xmpp.query.feature", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query feature", HFILL
+
+          }},
+        { &hf_xmpp_query_streamhost,
+          {
+              "STREAMHOST", "xmpp.query.streamhost", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq query streamhost", HFILL
+
+          }},
+        { &hf_xmpp_query_streamhost_used,
+          {
+              "STREAMHOST-USED", "xmpp.query.streamhost-used", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq query streamhost-used", HFILL
+
+          }},
+        { &hf_xmpp_query_activate,
+          {
+              "ACTIVATE", "xmpp.query.activate", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq query activate", HFILL
+
+          }},
+        { &hf_xmpp_query_udpsuccess,
+          {
+              "UDPSUCCESS", "xmpp.query.udpsuccess", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq query streamhost-used", HFILL
+
+          }},
+        { &hf_xmpp_error,
+          {
+              "ERROR", "xmpp.error", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq error", HFILL
+          }},
+        { &hf_xmpp_error_code,
+          {
+              "code", "xmpp.error.code", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq stanza error code", HFILL
+
+          }},
+        { &hf_xmpp_error_type,
+          {
+              "type", "xmpp.error.type", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq error type", HFILL
+
+          }},
+        { &hf_xmpp_error_condition,
+          {
+              "CONDITION", "xmpp.error.condition", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq error condition", HFILL
+
+          }},
+        { &hf_xmpp_error_text,
+          {
+              "TEXT", "xmpp.error.text", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq error text", HFILL
+
+          }},
+        { &hf_xmpp_iq_bind,
+          {
+              "BIND", "xmpp.iq.bind", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq bind", HFILL
+
+          }},
+        { &hf_xmpp_iq_bind_jid,
+          {
+              "jid", "xmpp.iq.bind.jid", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq bind jid", HFILL
+
+          }},
+        { &hf_xmpp_iq_bind_resource,
+          {
+              "resource", "xmpp.iq.bind.resource", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq bind resource", HFILL
+
+          }},
+        { &hf_xmpp_services,
+          {
+              "SERVICES", "xmpp.services", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jabber.org/protocol/jinglenodes services", HFILL
+          }},
+        { &hf_xmpp_channel,
+          {
+              "CHANNEL", "xmpp.channel", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jabber.org/protocol/jinglenodes#channel", HFILL
+          }},
+        { &hf_xmpp_iq_session,
+          {
+              "SESSION", "xmpp.iq.session", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq session", HFILL
+          }},
+        { &hf_xmpp_vcard,
+          {
+              "VCARD", "xmpp.vcard", FT_NONE, BASE_NONE, NULL, 0x0,
+              "vcard-temp", HFILL
+          }},
+        { &hf_xmpp_vcard_x_update,
+          {
+              "X VCARD-UPDATE", "xmpp.vcard-update", FT_NONE, BASE_NONE, NULL, 0x0,
+              "vcard-temp:x:update", HFILL
+          }},
+        { &hf_xmpp_jingle,
+          {
+              "JINGLE", "xmpp.jingle", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle", HFILL
+          }},
+        { &hf_xmpp_jingle_action,
+          {
+              "action", "xmpp.jingle.action", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle action", HFILL
+          }},
+        { &hf_xmpp_jingle_sid,
+          {
+              "sid", "xmpp.jingle.sid", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle sid", HFILL
+          }},
+        { &hf_xmpp_jingle_initiator,
+          {
+              "initiator", "xmpp.jingle.initiator", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle initiator", HFILL
+          }},
+        { &hf_xmpp_jingle_responder,
+          {
+              "responder", "xmpp.jingle.responder", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle responder", HFILL
+          }},
+        { &hf_xmpp_jingle_content,
+          {
+              "CONTENT", "xmpp.jingle.content", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content", HFILL
+          }},
+        { &hf_xmpp_jingle_content_creator,
+          {
+              "creator", "xmpp.jingle.content.creator", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content creator", HFILL
+          }},
+        { &hf_xmpp_jingle_content_name,
+          {
+              "name", "xmpp.jingle.content.name", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content name", HFILL
+          }},
+        { &hf_xmpp_jingle_content_disposition,
+          {
+              "disposition", "xmpp.jingle.content.disposition", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content disposition", HFILL
+          }},
+        { &hf_xmpp_jingle_content_senders,
+          {
+              "senders", "xmpp.jingle.content.senders", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content senders", HFILL
+          }},
+        { &hf_xmpp_jingle_content_description,
+          {
+              "DESCRIPTION", "xmpp.jingle.content.description", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content description", HFILL
+          }},
+        { &hf_xmpp_jingle_content_description_media,
+          {
+              "media", "xmpp.jingle.content.description.media", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description", HFILL
+          }},
+        { &hf_xmpp_jingle_content_description_ssrc,
+          {
+              "ssrc", "xmpp.jingle.content.description.ssrc", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description ssrc", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload,
+          {
+              "PAYLOAD-TYPE", "xmpp.jingle.content.description.payload-type", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_id,
+          {
+              "id", "xmpp.jingle.content.description.payload-type.id", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type id", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_channels,
+          {
+              "channels", "xmpp.jingle.content.description.payload-type.channels", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type channels", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_clockrate,
+          {
+              "clockrate", "xmpp.jingle.content.description.payload-type.clockrate", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type clockrate", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_maxptime,
+          {
+              "maxptime", "xmpp.jingle.content.description.payload-type.maxptime", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type maxptime", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_name,
+          {
+              "name", "xmpp.jingle.content.description.payload-type.name", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type name", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_ptime,
+          {
+              "ptime", "xmpp.jingle.content.description.payload-type.ptime", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type ptime", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_param,
+          {
+              "PARAMETER", "xmpp.jingle.content.description.payload-type.parameter", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type parameter", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_param_name,
+          {
+              "name", "xmpp.jingle.content.description.payload-type.parameter.name", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type parameter name", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_payload_param_value,
+          {
+              "value", "xmpp.jingle.content.description.payload-type.parameter.value", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content description payload-type parameter value", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans,
+          {
+              "TRANSPORT", "xmpp.jingle.content.transport", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content transport", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_ufrag,
+          {
+              "ufrag", "xmpp.jingle.content.transport.ufrag", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content transport ufrag", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_pwd,
+          {
+              "pwd", "xmpp.jingle.content.transport.pwd", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle content transport pwd", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_cand,
+          {
+              "CANDIDATE", "xmpp.jingle.content.transport.candidate", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content transport candidate", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_rem_cand,
+          {
+              "REMOTE-CANDIDATE", "xmpp.jingle.content.transport.remote-candidate", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content transport remote-candidate", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_activated,
+          {
+              "ACTIVATED", "xmpp.jingle.content.transport.activated", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:transports:s5b:1 activated", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_candidate_used,
+          {
+              "CANDIDATE-USED", "xmpp.jingle.content.transport.candidate-used", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:transports:s5b:1 candidate-used", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_candidate_error,
+          {
+              "CANDIDATE-ERROR", "xmpp.jingle.content.transport.candidate-error", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:transports:s5b:1 candidate-error", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_trans_proxy_error,
+          {
+              "PROXY-ERROR", "xmpp.jingle.content.transport.proxy-error", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:transports:s5b:1 proxy-error", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_enc,
+          {
+              "ENCRYPTION", "xmpp.jingle.content.description.encryption", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content descryption encryption", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_enc_zrtp_hash,
+          {
+              "ZRTP-HASH", "xmpp.jingle.content.description.encryption.zrtp-hash", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content descryption encryption zrtp-hash", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_enc_crypto,
+          {
+              "CRYPTO", "xmpp.jingle.content.description.encryption.crypto", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content descryption encryption crypto", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_bandwidth,
+          {
+              "BANDWIDTH", "xmpp.jingle.content.description.bandwidth", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content descryption bandwidth", HFILL
+          }},
+        { &hf_xmpp_jingle_cont_desc_rtp_hdr,
+          {
+              "RTP-HDREXT", "xmpp.jingle.content.description.rtp-hdrext", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle content descryption rtp-hdrext", HFILL
+          }},
+        { &hf_xmpp_jingle_reason,
+          {
+              "REASON", "xmpp.jingle.reason", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq jingle reason", HFILL
+          }},
+        { &hf_xmpp_jingle_reason_condition,
+          {
+              "CONDITION", "xmpp.jingle.reason.condition", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle reason condition", HFILL
+          }},
+        { &hf_xmpp_jingle_reason_text,
+          {
+              "TEXT", "xmpp.jingle.reason.text", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle reason text", HFILL
+          }},
+        { &hf_xmpp_jingle_rtp_info,
+          {
+              "RTP-INFO", "xmpp.jingle.rtp_info", FT_STRING, BASE_NONE, NULL, 0x0,
+              "iq jingle rtp-info(ringing, active, hold, mute, ...)", HFILL
+          }},
+        { &hf_xmpp_jingle_file_transfer_offer,
+          {
+              "OFFER", "xmpp.jingle.content.description.offer", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:apps:file-transfer:3 offer", HFILL
+          }},
+        { &hf_xmpp_jingle_file_transfer_request,
+          {
+              "REQUEST", "xmpp.jingle.content.description.request", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:apps:file-transfer:3 request", HFILL
+          }},
+        { &hf_xmpp_jingle_file_transfer_received,
+          {
+              "RECEIVED", "xmpp.jingle.content.received", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:apps:file-transfer:3 received", HFILL
+          }},
+        { &hf_xmpp_jingle_file_transfer_abort,
+          {
+              "ABORT", "xmpp.jingle.content.abort", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:apps:file-transfer:3 abort", HFILL
+          }},
+        { &hf_xmpp_jingle_file_transfer_checksum,
+          {
+              "CHECKSUM", "xmpp.jingle.content.checksum", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:jingle:apps:file-transfer:3 checksum", HFILL
+          }},
+        { &hf_xmpp_si,
+          {
+              "SI", "xmpp.si", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq si", HFILL
+          }},
+        { &hf_xmpp_si_file,
+          {
+              "FILE", "xmpp.si.file", FT_NONE, BASE_NONE, NULL, 0x0,
+              "iq si file", HFILL
+          }},
+        { &hf_xmpp_iq_feature_neg,
+          {
+              "FEATURE", "xmpp.feature-neg", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jabber.org/protocol/feature-neg", HFILL
+          }},
+        { &hf_xmpp_x_data,
+          {
+              "X-DATA", "xmpp.x-data", FT_NONE, BASE_NONE, NULL, 0x0,
+              "jabber:x:data", HFILL
+          }},
+        { &hf_xmpp_x_data_field,
+          {
+              "FIELD", "xmpp.x-data.field", FT_NONE, BASE_NONE, NULL, 0x0,
+              "jabber:x:data field", HFILL
+          }},
+        { &hf_xmpp_x_data_field_value,
+          {
+              "VALUE", "xmpp.x-data.field.value", FT_NONE, BASE_NONE, NULL, 0x0,
+              "jabber:x:data field value", HFILL
+          }},
+        { &hf_xmpp_delay,
+          {
+              "DELAY", "xmpp.delay", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:delay", HFILL
+          }},
+        { &hf_xmpp_x_event,
+          {
+              "X EVENT", "xmpp.x-event", FT_NONE, BASE_NONE, NULL, 0x0,
+              "jabber:x:event", HFILL
+          }},
+        { &hf_xmpp_x_event_condition,
+          {
+              "CONDITION", "xmpp.x-event.condition", FT_STRING, BASE_NONE, NULL, 0x0,
+              "jabber:x:event condition", HFILL
+          }},
+        { &hf_xmpp_presence,
+          {
+              "PRESENCE", "xmpp.presence", FT_NONE, BASE_NONE, NULL, 0x0,
+              "presence packet", HFILL
+          }},
+        { &hf_xmpp_presence_show,
+          {
+              "SHOW", "xmpp.presence.show", FT_STRING, BASE_NONE, NULL, 0x0,
+              "presence show", HFILL
+          }},
+        { &hf_xmpp_presence_status,
+          {
+              "STATUS", "xmpp.presence.status", FT_NONE, BASE_NONE, NULL, 0x0,
+              "presence status", HFILL
+          }},
+        { &hf_xmpp_presence_caps,
+          {
+              "CAPS", "xmpp.presence.caps", FT_NONE, BASE_NONE, NULL, 0x0,
+              "presence caps", HFILL
+          }},
+        { &hf_xmpp_message,
+          {
+              "MESSAGE", "xmpp.message", FT_NONE, BASE_NONE, NULL, 0x0,
+              "message packet", HFILL
+          }},
+        { &hf_xmpp_message_chatstate,
+          {
+              "CHATSTATE", "xmpp.message.chatstate", FT_STRING, BASE_NONE, NULL, 0x0,
+              "message chatstate", HFILL
+          }},
+        { &hf_xmpp_message_thread,
+          {
+              "THREAD", "xmpp.message.thread", FT_NONE, BASE_NONE, NULL, 0x0,
+              "message thread", HFILL
+          }},
+        { &hf_xmpp_message_body,
+          {
+              "BODY", "xmpp.message.body", FT_NONE, BASE_NONE, NULL, 0x0,
+              "message body", HFILL
+          }},
+        { &hf_xmpp_message_subject,
+          {
+              "SUBJECT", "xmpp.message.subject", FT_NONE, BASE_NONE, NULL, 0x0,
+              "message subject", HFILL
+          }},
+        { &hf_xmpp_message_thread_parent,
+          {
+              "parent", "xmpp.message.thread.parent", FT_STRING, BASE_NONE, NULL, 0x0,
+              "message thread parent", HFILL
+          }},
+        { &hf_xmpp_auth,
+          {
+              "AUTH", "xmpp.auth", FT_NONE, BASE_NONE, NULL, 0x0,
+              "auth packet", HFILL
+          }},
+        { &hf_xmpp_stream,
+          {
+              "STREAM", "xmpp.stream", FT_NONE, BASE_NONE, NULL, 0x0,
+              "XMPP stream", HFILL
+          }},
+        { &hf_xmpp_challenge,
+          {
+              "CHALLENGE", "xmpp.challenge", FT_NONE, BASE_NONE, NULL, 0x0,
+              "challenge packet", HFILL
+          }},
+        { &hf_xmpp_response,
+          {
+              "RESPONSE", "xmpp.response", FT_NONE, BASE_NONE, NULL, 0x0,
+              "response packet", HFILL
+          }},
+        { &hf_xmpp_success,
+          {
+              "SUCCESS", "xmpp.success", FT_NONE, BASE_NONE, NULL, 0x0,
+              "success packet", HFILL
+          }},
+        { &hf_xmpp_failure,
+          {
+              "FAILURE", "xmpp.failure", FT_NONE, BASE_NONE, NULL, 0x0,
+              "failure packet", HFILL
+          }},
+        { &hf_xmpp_features,
+          {
+              "FEATURES", "xmpp.features", FT_NONE, BASE_NONE, NULL, 0x0,
+              "stream features", HFILL
+          }},
+        { &hf_xmpp_starttls,
+          {
+              "STARTTLS", "xmpp.starttls", FT_NONE, BASE_NONE, NULL, 0x0,
+              "starttls packet", HFILL
+          }},
+        { &hf_xmpp_proceed,
+          {
+              "PROCEED", "xmpp.proceed", FT_NONE, BASE_NONE, NULL, 0x0,
+              "proceed packet", HFILL
+          }},
+        { &hf_xmpp_unknown,
+          {
+              "UNKNOWN", "xmpp.unknown", FT_STRING, BASE_NONE, NULL, 0x0,
+              "unknown element", HFILL
+          }},
+        { &hf_xmpp_unknown_attr,
+          {
+              "UNKNOWN ATTR", "xmpp.unknown_attr", FT_STRING, BASE_NONE, NULL, 0x0,
+              "unknown attribute", HFILL
+          }},
+        { &hf_xmpp_ibb_open,
+          {
+              "IBB-OPEN", "xmpp.ibb.open", FT_NONE, BASE_NONE, NULL, 0x0,
+              "xmpp ibb open", HFILL
+          }},
+        { &hf_xmpp_ibb_close,
+          {
+              "IBB-CLOSE", "xmpp.ibb.close", FT_NONE, BASE_NONE, NULL, 0x0,
+              "xmpp ibb close", HFILL
+          }},
+        { &hf_xmpp_ibb_data,
+          {
+              "IBB-DATA", "xmpp.ibb.data", FT_NONE, BASE_NONE, NULL, 0x0,
+              "xmpp ibb data", HFILL
+          }},
+        { &hf_xmpp_muc_x,
+          {
+              "X MUC", "xmpp.muc-x", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jabber.org/protocol/muc", HFILL
+          }},
+        { &hf_xmpp_muc_user_x,
+          {
+              "X MUC-USER", "xmpp.muc-user-x", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jabber.org/protocol/muc#user", HFILL
+          }},
+        { &hf_xmpp_muc_user_item,
+          {
+              "ITEM", "xmpp.muc-user-x.item", FT_NONE, BASE_NONE, NULL, 0x0,
+              "muc#user item", HFILL
+          }},
+        { &hf_xmpp_muc_user_invite,
+          {
+              "INVITE", "xmpp.muc-user-x.invite", FT_NONE, BASE_NONE, NULL, 0x0,
+              "muc#user invite", HFILL
+          }},
+        { &hf_xmpp_gtalk_session,
+          {
+              "GTALK-SESSION", "xmpp.gtalk.session", FT_NONE, BASE_NONE, NULL, 0x0,
+              "GTalk session", HFILL
+          }},
+        { &hf_xmpp_gtalk_session_type,
+          {
+              "type", "xmpp.gtalk.session.type", FT_STRING, BASE_NONE, NULL, 0x0,
+              "GTalk session type", HFILL
+          }},
+        { &hf_xmpp_gtalk,
+          {
+              "GTALK SESSION", "xmpp.gtalk", FT_STRING, BASE_NONE, NULL, 0x0,
+              "GTalk SID", HFILL
+          }},
+        { &hf_xmpp_gtalk_setting,
+          {
+              "USERSETTING", "xmpp.gtalk.setting", FT_NONE, BASE_NONE, NULL, 0x0,
+              "google:setting usersetting", HFILL
+          }},
+        { &hf_xmpp_gtalk_nosave_x,
+          {
+              "X-NOSAVE", "xmpp.gtalk.nosave.x", FT_NONE, BASE_NONE, NULL, 0x0,
+              "google:nosave x", HFILL
+          }},
+        { &hf_xmpp_gtalk_mail_mailbox,
+          {
+              "MAILBOX", "xmpp.gtalk.mailbox", FT_NONE, BASE_NONE, NULL, 0x0,
+              "google:mail:notify mailbox", HFILL
+          }},
+        { &hf_xmpp_gtalk_mail_new_mail,
+          {
+              "NEW MAIL", "xmpp.gtalk.new-mail", FT_NONE, BASE_NONE, NULL, 0x0,
+              "google:mail:notify new-mail", HFILL
+          }},
+        { &hf_xmpp_gtalk_transport_p2p,
+          {
+              "TRANSPORT", "xmpp.gtalk.transport-p2p", FT_NONE, BASE_NONE, NULL, 0x0,
+              "google/transport/p2p", HFILL
+          }},
+        { &hf_xmpp_conf_info,
+          {
+              "CONFERENCE INFO", "xmpp.conf-info", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:ietf:params:xml:ns:conference-info", HFILL
+          }},
+        { &hf_xmpp_conf_info_sid,
+          {
+              "sid", "xmpp.conf-info.sid", FT_STRING, BASE_NONE, NULL, 0x0,
+              "urn:ietf:params:xml:ns:conference-info sid", HFILL
+          }},
+        { &hf_xmpp_response_in,
+          { "Response In", "xmpp.response_in",
+            FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+            "The response to this request is in this frame", HFILL }
+        },
+        { &hf_xmpp_response_to,
+          { "Request In", "xmpp.response_to",
+            FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+            "This is a response to the request in this frame", HFILL }
+        },
+        { &hf_xmpp_out,
+          {
+              "Out", "xmpp.out", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+              "Outgoing packet", HFILL
+          }},
+        { &hf_xmpp_in,
+          {
+              "In", "xmpp.in", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+              "Ingoing packet", HFILL
+          }},
+        { &hf_xmpp_ibb,
+          {
+              "IBB SESSION", "xmpp.ibb", FT_STRING, BASE_NONE, NULL, 0x0,
+              "In-Band Bytestreams session", HFILL
+          }},
+        { &hf_xmpp_jingle_session,
+          {
+              "JINGLE SESSION", "xmpp.jingle_session", FT_STRING, BASE_NONE, NULL, 0x0,
+              "Jingle SID", HFILL
+          }},
+        { &hf_xmpp_ping,
+          {
+              "PING", "xmpp.ping", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:ping", HFILL
+          }},
+        { &hf_xmpp_hashes,
+          {
+              "HASHES", "xmpp.hashes", FT_NONE, BASE_NONE, NULL, 0x0,
+              "urn:xmpp:hashes:0", HFILL
+          }},
+        { &hf_xmpp_jitsi_inputevt,
+          {
+              "INPUTEVT", "xmpp.inputevt", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jitsi.org/protocol/inputevt", HFILL
+          }},
+        { &hf_xmpp_jitsi_inputevt_rmt_ctrl,
+          {
+              "REMOTE-CONTROL", "xmpp.inputevt.remote-control", FT_NONE, BASE_NONE, NULL, 0x0,
+              "http://jitsi.org/protocol/inputevt remote-control", HFILL
+          }},
     };
 
     static gint * ett[] = {
@@ -1381,20 +1379,20 @@ proto_register_xmpp(void) {
         ett_unknown_ptr[i] = &ett_unknown[i];
     }
 
-
-
     proto_xmpp = proto_register_protocol(
-            "XMPP Protocol", /* name       */
-            "XMPP", /* short name */
-            "xmpp" /* abbrev     */
-            );
+        "XMPP Protocol", /* name       */
+        "XMPP",          /* short name */
+        "xmpp"           /* abbrev     */
+        );
 
     xmpp_module = prefs_register_protocol(proto_xmpp, NULL);
     prefs_register_bool_preference(xmpp_module, "desegment",
-            "Reasemble XMPP messages",
-            "Whether the XMPP dissector should reassemble messages. "
-            "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings",
-            &xmpp_desegment);
+                                   "Reasemble XMPP messages",
+                                   "Whether the XMPP dissector should reassemble messages. "
+                                   "To use this option, you must also enable"
+                                   " \"Allow subdissectors to reassemble TCP streams\""
+                                   " in the TCP protocol settings",
+                                   &xmpp_desegment);
 
     proto_register_field_array(proto_xmpp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
@@ -1407,7 +1405,7 @@ void
 proto_reg_handoff_xmpp(void) {
     static dissector_handle_t xmpp_handle;
 
-    xml_handle = find_dissector("xml");
+    xml_handle  = find_dissector("xml");
 
     xmpp_handle = find_dissector("xmpp");