Don't use generic shared function/typedef/struct names;

Remove unneeded #includes;
Cleanup trailing whitespace.

svn path=/trunk/; revision=39823

1 files changed, 152 insertions, 159 deletions

diff --git a/epan/dissectors/packet-xmpp-gtalk.c b/epan/dissectors/packet-xmpp-gtalk.c
index 462c97261f..ab0248b999 100644
--- a/epan/dissectors/packet-xmpp-gtalk.c
+++ b/epan/dissectors/packet-xmpp-gtalk.c
@@ -30,17 +30,10 @@
 #include "config.h"
 #endif
 
-#include<stdio.h>
-#include<string.h>
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/proto.h>
-#include <epan/tvbuff.h>
-#include <epan/emem.h>
-#include <epan/conversation.h>
-#include <epan/strutil.h>
-#include <epan/expert.h>
+
 #include <epan/dissectors/packet-xml.h>
 
 #include <packet-xmpp.h>
@@ -49,84 +42,84 @@
 #include <packet-xmpp-conference.h>
 
 
-static void xmpp_gtalk_session_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_session_desc_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_session_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_session_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_jingleinfo_stun(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_jingleinfo_server(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_jingleinfo_relay(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_jingleinfo_relay_serv(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_nosave_item(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_mail_mail_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_mail_senders(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_mail_sender(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_mail_snippet(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_status_status_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
-static void xmpp_gtalk_transport_p2p_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element);
+static void xmpp_gtalk_session_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_session_desc_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_session_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_session_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_jingleinfo_stun(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_jingleinfo_server(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_jingleinfo_relay(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_jingleinfo_relay_serv(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_nosave_item(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_mail_mail_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_mail_senders(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_mail_sender(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_mail_snippet(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_status_status_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
+static void xmpp_gtalk_transport_p2p_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
 
 void
-xmpp_gtalk_session(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_session(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *session_item;
     proto_tree *session_tree;
 
-    attr_info attrs_info [] = {
+    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}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME,"description", xmpp_gtalk_session_desc, ONE},
         {NAME, "candidate", xmpp_gtalk_session_cand, MANY},
         {NAME, "reason", xmpp_gtalk_session_reason, ONE},
-        {NAME_AND_ATTR, name_attr_struct("transport", "xmlns", "http://www.google.com/transport/p2p"), xmpp_gtalk_transport_p2p, ONE},
+        {NAME_AND_ATTR, xmpp_name_attr_struct("transport", "xmlns", "http://www.google.com/transport/p2p"), xmpp_gtalk_transport_p2p, ONE},
         {NAME, "conference-info", xmpp_conferece_info_advert, ONE}
     };
 
-    attr_t *attr_type = get_attr(element, "type");
+    xmpp_attr_t *attr_type = xmpp_get_attr(element, "type");
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "GTALK-SESSION(%s) ", attr_type?attr_type->value:"");
 
     session_item = proto_tree_add_item(tree, hf_xmpp_gtalk_session, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     session_tree = proto_item_add_subtree(session_item, ett_xmpp_gtalk_session);
 
-    display_attrs(session_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(session_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    display_elems(session_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_elems(session_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_session_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_session_desc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *desc_item;
     proto_tree *desc_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"xml:lang", -1, FALSE, FALSE, NULL, NULL}
     };
 
-    elem_info elems_info[] = {
+    xmpp_elem_info elems_info[] = {
         {NAME, "payload-type", xmpp_gtalk_session_desc_payload, MANY}
     };
 
     desc_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "DESCRIPTION");
     desc_tree = proto_item_add_subtree(desc_item, ett_xmpp_gtalk_session_desc);
 
-    display_attrs(desc_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(desc_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(desc_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(desc_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_session_desc_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_session_desc_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *payload_item;
     proto_tree *payload_tree;
 
-    attr_info attrs_info[] = {
+    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},
@@ -141,17 +134,17 @@ xmpp_gtalk_session_desc_payload(proto_tree* tree, tvbuff_t* tvb, packet_info* pi
     payload_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "PAYLOAD-TYPE");
     payload_tree = proto_item_add_subtree(payload_item, ett_xmpp_gtalk_session_desc_payload);
 
-    display_attrs(payload_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(payload_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(payload_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(payload_tree, element, pinfo, tvb, NULL, 0);
 }
 
 static void
-xmpp_gtalk_session_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_session_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *cand_item;
     proto_tree *cand_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"name", -1, TRUE, TRUE, NULL, NULL},
         {"address", -1, TRUE, FALSE, NULL, NULL},
         {"port", -1, TRUE, FALSE, NULL, NULL},
@@ -169,24 +162,24 @@ xmpp_gtalk_session_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, ele
     cand_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "CANDIDATE");
     cand_tree = proto_item_add_subtree(cand_item, ett_xmpp_gtalk_session_cand);
 
-    display_attrs(cand_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(cand_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(cand_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(cand_tree, element, pinfo, tvb, NULL, 0);
 }
 
 static void
-xmpp_gtalk_session_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_session_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *reason_item;
     proto_tree *reason_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"condition", -1, TRUE, TRUE, NULL, NULL},
         {"text", -1, FALSE, FALSE, NULL, NULL}
    };
 
-    element_t *condition;
-    element_t *text;
-  
+    xmpp_element_t *condition;
+    xmpp_element_t *text;
+
     const gchar *reason_names[] = { "success", "busy", "cancel"};
 
     reason_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "REASON");
@@ -194,74 +187,74 @@ xmpp_gtalk_session_reason(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, e
 
 
     /*Looks for reason description.*/
-    if((condition = steal_element_by_names(element, reason_names, array_length(reason_names)))!=NULL)
+    if((condition = xmpp_steal_element_by_names(element, reason_names, array_length(reason_names)))!=NULL)
     {
-        attr_t *fake_cond = ep_init_attr_t(condition->name, condition->offset, condition->length);
+        xmpp_attr_t *fake_cond = xmpp_ep_init_attr_t(condition->name, condition->offset, condition->length);
         g_hash_table_insert(element->attrs, "condition", fake_cond);
 
-    } 
+    }
 
-    if((text = steal_element_by_name(element, "text"))!=NULL)
+    if((text = xmpp_steal_element_by_name(element, "text"))!=NULL)
     {
-        attr_t *fake_text = ep_init_attr_t(text->data?text->data->value:"", text->offset, text->length);
+        xmpp_attr_t *fake_text = xmpp_ep_init_attr_t(text->data?text->data->value:"", text->offset, text->length);
         g_hash_table_insert(element->attrs, "text", fake_text);
     }
 
-    display_attrs(reason_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(reason_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     xmpp_unknown(reason_tree, tvb, pinfo, element);
 }
 
 void
-xmpp_gtalk_jingleinfo_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_jingleinfo_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "stun", xmpp_gtalk_jingleinfo_stun, ONE},
         {NAME, "relay", xmpp_gtalk_jingleinfo_relay, ONE}
     };
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:jingleinfo) ");
 
-    query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, 
+    query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length,
         ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_jingleinfo_stun(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_jingleinfo_stun(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *stun_item;
     proto_tree *stun_tree;
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "server", xmpp_gtalk_jingleinfo_server, MANY},
     };
 
     stun_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "STUN");
     stun_tree = proto_item_add_subtree(stun_item, ett_xmpp_gtalk_jingleinfo_stun);
 
-    display_attrs(stun_tree, element, pinfo, tvb, NULL, 0);
-    display_elems(stun_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(stun_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_elems(stun_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 
 }
 
 static void
-xmpp_gtalk_jingleinfo_server(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_jingleinfo_server(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *serv_item;
     proto_tree *serv_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"host", -1, TRUE, TRUE, NULL, NULL},
         {"udp", -1, TRUE, TRUE, NULL, NULL}
     };
@@ -269,46 +262,46 @@ xmpp_gtalk_jingleinfo_server(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo
     serv_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SERVER");
     serv_tree = proto_item_add_subtree(serv_item, ett_xmpp_gtalk_jingleinfo_server);
 
-    display_attrs(serv_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(serv_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(serv_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(serv_tree, element, pinfo, tvb, NULL, 0);
 }
 
 static void
-xmpp_gtalk_jingleinfo_relay(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_jingleinfo_relay(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *relay_item;
     proto_tree *relay_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"token", -1, FALSE, FALSE, NULL, NULL}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "server", xmpp_gtalk_jingleinfo_relay_serv, ONE}
     };
 
-    element_t *token;
+    xmpp_element_t *token;
 
     relay_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "RELAY");
     relay_tree = proto_item_add_subtree(relay_item, ett_xmpp_gtalk_jingleinfo_relay);
 
-    if((token  = steal_element_by_name(element, "token"))!=NULL)
+    if((token  = xmpp_steal_element_by_name(element, "token"))!=NULL)
     {
-        attr_t *fake_token = ep_init_attr_t(token->data?token->data->value:"", token->offset, token->length);
+        xmpp_attr_t *fake_token = xmpp_ep_init_attr_t(token->data?token->data->value:"", token->offset, token->length);
         g_hash_table_insert(element->attrs, "token", fake_token);
     }
 
-    display_attrs(relay_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(relay_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(relay_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(relay_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_jingleinfo_relay_serv(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_jingleinfo_relay_serv(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *serv_item;
     proto_tree *serv_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"host", -1, TRUE, TRUE, NULL, NULL},
         {"udp", -1, FALSE, TRUE, NULL, NULL},
         {"tcp", -1, FALSE, TRUE, NULL, NULL},
@@ -318,17 +311,17 @@ xmpp_gtalk_jingleinfo_relay_serv(proto_tree* tree, tvbuff_t* tvb, packet_info* p
     serv_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SERVER");
     serv_tree = proto_item_add_subtree(serv_item, ett_xmpp_gtalk_jingleinfo_relay_serv);
 
-    display_attrs(serv_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(serv_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(serv_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(serv_tree, element, pinfo, tvb, NULL, 0);
 }
 
 void
-xmpp_gtalk_usersetting(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_usersetting(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *sett_item;
     proto_tree *sett_tree;
 
-    attr_info attrs_info [] = {
+    xmpp_attr_info attrs_info [] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
@@ -337,51 +330,51 @@ xmpp_gtalk_usersetting(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, elem
     sett_item = proto_tree_add_item(tree, hf_xmpp_gtalk_setting, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     sett_tree = proto_item_add_subtree(sett_item, ett_xmpp_gtalk_setting);
 
-    display_attrs(sett_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(sett_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
     for(i = 0; i < g_list_length(element->elements); i++)
     {
         GList *elem_l = g_list_nth(element->elements,i);
-        element_t *elem = elem_l?elem_l->data:NULL;
+        xmpp_element_t *elem = elem_l?elem_l->data:NULL;
 
         if(elem)
         {
-            attr_t *val = get_attr(elem,"value");
+            xmpp_attr_t *val = xmpp_get_attr(elem,"value");
             proto_tree_add_text(sett_tree, tvb, elem->offset, elem->length, "%s [%s]",elem->name,val?val->value:"");
         }
     }
 }
 
 void
-xmpp_gtalk_nosave_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element) {
+xmpp_gtalk_nosave_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element) {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "item", xmpp_gtalk_nosave_item, MANY},
     };
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:nosave) ");
 
-    query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, 
+    query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length,
         ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_nosave_item(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_nosave_item(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *item_item;
     proto_tree *item_tree;
 
-    attr_info attrs_info[] = {
+    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},
@@ -391,36 +384,36 @@ xmpp_gtalk_nosave_item(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, elem
     item_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "ITEM");
     item_tree = proto_item_add_subtree(item_item, ett_xmpp_query_item);
 
-    display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(item_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(item_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(item_tree, element, pinfo, tvb, NULL, 0);
 }
 
 void
-xmpp_gtalk_nosave_x(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_nosave_x(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *x_item;
     proto_tree *x_tree;
 
-    attr_info attrs_info [] = {
+    xmpp_attr_info attrs_info [] = {
         {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL},
         {"value", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    x_item = proto_tree_add_item(tree, hf_xmpp_gtalk_nosave_x, tvb, element->offset, element->length, 
+    x_item = proto_tree_add_item(tree, hf_xmpp_gtalk_nosave_x, tvb, element->offset, element->length,
         ENC_BIG_ENDIAN);
     x_tree = proto_item_add_subtree(x_item, ett_xmpp_gtalk_nosave_x);
 
-    display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(x_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(x_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(x_tree, element, pinfo, tvb, NULL, 0);
 }
 
 void
-xmpp_gtalk_mail_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    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},
@@ -433,17 +426,17 @@ xmpp_gtalk_mail_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, eleme
         ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, NULL, 0);
 }
 
 void
-xmpp_gtalk_mail_mailbox(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_mailbox(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *mail_item;
     proto_tree *mail_tree;
 
-    attr_info attrs_info [] = {
+    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},
@@ -451,7 +444,7 @@ xmpp_gtalk_mail_mailbox(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, ele
         {"url", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME,"mail-thread-info", xmpp_gtalk_mail_mail_info, MANY}
     };
 
@@ -460,17 +453,17 @@ xmpp_gtalk_mail_mailbox(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, ele
     mail_item = proto_tree_add_item(tree, hf_xmpp_gtalk_mail_mailbox, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     mail_tree = proto_item_add_subtree(mail_item, ett_xmpp_gtalk_mail_mailbox);
 
-    display_attrs(mail_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(mail_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(mail_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(mail_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_mail_mail_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_mail_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *mail_info_item;
     proto_tree *mail_info_tree;
 
-    attr_info attrs_info [] = {
+    xmpp_attr_info attrs_info [] = {
         {"tid", -1, FALSE, FALSE, NULL, NULL},
         {"participation", -1, FALSE, FALSE, NULL, NULL},
         {"messages", -1, FALSE, TRUE, NULL, NULL},
@@ -480,56 +473,56 @@ xmpp_gtalk_mail_mail_info(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, e
         {"subject", -1, FALSE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "senders", xmpp_gtalk_mail_senders, ONE},
         {NAME, "snippet", xmpp_gtalk_mail_snippet, ONE}/*or MANY?*/
     };
 
-    element_t *labels, *subject;
+    xmpp_element_t *labels, *subject;
 
     mail_info_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "MAIL-THREAD-INFO");
     mail_info_tree = proto_item_add_subtree(mail_info_item,ett_xmpp_gtalk_mail_mail_info);
 
-    if((labels = steal_element_by_name(element,"labels"))!=NULL)
+    if((labels = xmpp_steal_element_by_name(element,"labels"))!=NULL)
     {
-        attr_t *fake_labels = ep_init_attr_t(labels->data?labels->data->value:"",labels->offset, labels->length);
+        xmpp_attr_t *fake_labels = xmpp_ep_init_attr_t(labels->data?labels->data->value:"",labels->offset, labels->length);
         g_hash_table_insert(element->attrs, "labels", fake_labels);
     }
-    if((subject = steal_element_by_name(element,"subject"))!=NULL)
+    if((subject = xmpp_steal_element_by_name(element,"subject"))!=NULL)
     {
-        attr_t *fake_subject = ep_init_attr_t(subject->data?subject->data->value:"",subject->offset, subject->length);
+        xmpp_attr_t *fake_subject = xmpp_ep_init_attr_t(subject->data?subject->data->value:"",subject->offset, subject->length);
         g_hash_table_insert(element->attrs, "subject", fake_subject);
     }
 
-    display_attrs(mail_info_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(mail_info_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(mail_info_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(mail_info_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 
 static void
-xmpp_gtalk_mail_senders(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_senders(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *senders_item;
     proto_tree *senders_tree;
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "sender", xmpp_gtalk_mail_sender, MANY}
     };
 
     senders_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SENDERS");
     senders_tree = proto_item_add_subtree(senders_item, ett_xmpp_gtalk_mail_senders);
 
-    display_attrs(senders_tree, element, pinfo, tvb, NULL, 0);
-    display_elems(senders_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(senders_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_elems(senders_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_mail_sender(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_sender(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *sender_item;
     proto_tree *sender_tree;
 
-    attr_info attrs_info [] = {
+    xmpp_attr_info attrs_info [] = {
         {"name", -1, FALSE, TRUE, NULL, NULL},
         {"address", -1, FALSE, TRUE, NULL, NULL},
         {"originator", -1, FALSE, TRUE, NULL, NULL},
@@ -539,34 +532,34 @@ xmpp_gtalk_mail_sender(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, elem
     sender_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "SENDER");
     sender_tree = proto_item_add_subtree(sender_item, ett_xmpp_gtalk_mail_sender);
 
-    display_attrs(sender_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(sender_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(sender_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(sender_tree, element, pinfo, tvb, NULL, 0);
 }
 
 static void
-xmpp_gtalk_mail_snippet(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_snippet(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_tree_add_text(tree, tvb, element->offset, element->length, "SNIPPET: %s",element->data?element->data->value:"");
     xmpp_unknown(tree, tvb, pinfo, element);
 }
 
 void
-xmpp_gtalk_mail_new_mail(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_mail_new_mail(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     col_append_fstr(pinfo->cinfo, COL_INFO, "NEW-MAIL ");
-    proto_tree_add_item(tree, hf_xmpp_gtalk_mail_new_mail, tvb, element->offset, element->length, 
+    proto_tree_add_item(tree, hf_xmpp_gtalk_mail_new_mail, tvb, element->offset, element->length,
         ENC_BIG_ENDIAN);
     xmpp_unknown(tree, tvb, pinfo, element);
 }
 
 
 void
-xmpp_gtalk_status_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_status_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *query_item;
     proto_tree *query_tree;
 
-    attr_info attrs_info[] = {
+    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},
@@ -578,11 +571,11 @@ xmpp_gtalk_status_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, ele
         {"invisible", -1, FALSE, TRUE, NULL, NULL},
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "status-list", xmpp_gtalk_status_status_list, MANY}
     };
 
-    element_t *status, *show, *invisible;
+    xmpp_element_t *status, *show, *invisible;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:shared-status) ");
 
@@ -590,82 +583,82 @@ xmpp_gtalk_status_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, ele
         ENC_BIG_ENDIAN);
     query_tree = proto_item_add_subtree(query_item, ett_xmpp_query);
 
-    if((status = steal_element_by_name(element,"status"))!=NULL)
+    if((status = xmpp_steal_element_by_name(element,"status"))!=NULL)
     {
-        attr_t *fake_status = ep_init_attr_t(status->data?status->data->value:"",status->offset, status->length);
+        xmpp_attr_t *fake_status = xmpp_ep_init_attr_t(status->data?status->data->value:"",status->offset, status->length);
         g_hash_table_insert(element->attrs, "status", fake_status);
     }
 
-    if((show = steal_element_by_name(element,"show"))!=NULL)
+    if((show = xmpp_steal_element_by_name(element,"show"))!=NULL)
     {
-        attr_t *fake_show = ep_init_attr_t(show->data?show->data->value:"",show->offset, show->length);
+        xmpp_attr_t *fake_show = xmpp_ep_init_attr_t(show->data?show->data->value:"",show->offset, show->length);
         g_hash_table_insert(element->attrs, "show", fake_show);
     }
 
-    if((invisible = steal_element_by_name(element,"invisible"))!=NULL)
+    if((invisible = xmpp_steal_element_by_name(element,"invisible"))!=NULL)
     {
-        attr_t *value = get_attr(invisible, "value");
-        attr_t *fake_invisible = ep_init_attr_t(value?value->value:"",invisible->offset, invisible->length);
+        xmpp_attr_t *value = xmpp_get_attr(invisible, "value");
+        xmpp_attr_t *fake_invisible = xmpp_ep_init_attr_t(value?value->value:"",invisible->offset, invisible->length);
         g_hash_table_insert(element->attrs, "invisible", fake_invisible);
     }
 
-    display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_attrs(query_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(query_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_status_status_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_status_status_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *list_item;
     proto_tree *list_tree;
 
-    attr_info attrs_info [] = {
+    xmpp_attr_info attrs_info [] = {
         {"show", -1, TRUE, TRUE, NULL, NULL}
     };
 
-    element_t *status;
+    xmpp_element_t *status;
 
     list_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "STATUS LIST");
     list_tree = proto_item_add_subtree(list_item, ett_xmpp_gtalk_status_status_list);
 
-    while((status = steal_element_by_name(element, "status"))!=NULL)
+    while((status = xmpp_steal_element_by_name(element, "status"))!=NULL)
     {
         proto_tree_add_text(list_tree, tvb, status->offset, status->length, "STATUS: %s",status->data?status->data->value:"");
     }
 
-    display_attrs(list_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(list_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(list_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(list_tree, element, pinfo, tvb, NULL, 0);
 }
 
 /*http://www.google.com/transport/p2p*/
 void
-xmpp_gtalk_transport_p2p(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element)
+xmpp_gtalk_transport_p2p(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element)
 {
     proto_item *trans_item;
     proto_tree *trans_tree;
 
-    attr_info attrs_info[] = {
+    xmpp_attr_info attrs_info[] = {
         {"xmlns", hf_xmpp_xmlns, FALSE, TRUE, NULL, NULL}
     };
 
-    elem_info elems_info [] = {
+    xmpp_elem_info elems_info [] = {
         {NAME, "candidate", xmpp_gtalk_transport_p2p_cand, MANY}
     };
 
     trans_item = proto_tree_add_item(tree, hf_xmpp_gtalk_transport_p2p, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
     trans_tree = proto_item_add_subtree(trans_item, ett_xmpp_gtalk_transport_p2p);
 
-    display_attrs(trans_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_attrs(trans_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
 
-    display_elems(trans_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
+    xmpp_display_elems(trans_tree, element, pinfo, tvb, elems_info, array_length(elems_info));
 }
 
 static void
-xmpp_gtalk_transport_p2p_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, element_t* element) {
+xmpp_gtalk_transport_p2p_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element) {
     proto_item *cand_item;
     proto_tree *cand_tree;
 
-    attr_info attrs_info[] = {
+    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},
@@ -679,12 +672,12 @@ xmpp_gtalk_transport_p2p_cand(proto_tree* tree, tvbuff_t* tvb, packet_info* pinf
         {"port", -1, FALSE, TRUE, NULL, NULL},
         {"address", -1, FALSE, TRUE, NULL, NULL}
     };
-    
+
     cand_item = proto_tree_add_text(tree, tvb, element->offset, element->length, "CANDIDATE");
     cand_tree = proto_item_add_subtree(cand_item, ett_xmpp_gtalk_transport_p2p_cand);
 
-    display_attrs(cand_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
-    display_elems(cand_tree, element, pinfo, tvb, NULL, 0);
+    xmpp_display_attrs(cand_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info));
+    xmpp_display_elems(cand_tree, element, pinfo, tvb, NULL, 0);
 
 }
 /*