Add host field to local host sessions

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index a4fd0f82ad698557eee3fa61276a4f06eac7902f..52f372cc8efd27f505c1116398115ba8678019ef 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -6,8 +6,14 @@ local setmetatable  =  setmetatable;
 local pairs         =         pairs;
 local ipairs        =        ipairs;
 local type          =          type;
+local next          =          next;
+local print          =          print;
 local unpack        =        unpack;
 local s_gsub        =   string.gsub;
+
+local debug = debug;
+local log = require "util.logger".init("stanza");
+
 module "stanza"
 
 stanza_mt = {};
@@ -23,13 +29,13 @@ function stanza_mt:query(xmlns)
 end
 function stanza_mt:tag(name, attrs)
        local s = stanza(name, attrs);
-       (self.last_add[#self.last_add] or self):add_child(s);
+       (self.last_add[#self.last_add] or self):add_direct_child(s);
        t_insert(self.last_add, s);
        return self;
 end
 
 function stanza_mt:text(text)
-       (self.last_add[#self.last_add] or self):add_child(text);
+       (self.last_add[#self.last_add] or self):add_direct_child(text);
        return self; 
 end
 
@@ -38,13 +44,18 @@ function stanza_mt:up()
        return self;
 end
 
-function stanza_mt:add_child(child)
+function stanza_mt:add_direct_child(child)
        if type(child) == "table" then
                t_insert(self.tags, child);
        end
        t_insert(self, child);
 end
 
+function stanza_mt:add_child(child)
+       (self.last_add[#self.last_add] or self):add_direct_child(child);
+       return self;
+end
+
 function stanza_mt:child_with_name(name)
        for _, child in ipairs(self) do 
                if child.name == name then return child; end
@@ -91,12 +102,11 @@ function stanza_mt.__tostring(t)
        if t.attr then
                for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
        end
-
        return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
 end
 
 function stanza_mt.__add(s1, s2)
-       return s1:add_child(s2);
+       return s1:add_direct_child(s2);
 end
 
 
@@ -122,21 +132,23 @@ end
 
 function deserialize(stanza)
        -- Set metatable
-       setmetatable(stanza, stanza_mt);
-       for _, child in ipairs(stanza) do
-               if type(child) == "table" then
-                       deserialize(child);
-               end
-       end
-       if not stanza.tags then
-               -- Rebuild tags
-               local tags = {};
+       if stanza then
+               setmetatable(stanza, stanza_mt);
                for _, child in ipairs(stanza) do
                        if type(child) == "table" then
-                               t_insert(tags, child);
+                               deserialize(child);
+                       end
+               end
+               if not stanza.tags then
+                       -- Rebuild tags
+                       local tags = {};
+                       for _, child in ipairs(stanza) do
+                               if type(child) == "table" then
+                                       t_insert(tags, child);
+                               end
                        end
+                       stanza.tags = tags;
                end
-               stanza.tags = tags;
        end
        
        return stanza;
@@ -155,7 +167,7 @@ function iq(attr)
 end
 
 function reply(orig)
-       return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or nil) });
+       return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
 end
 
 function error_reply(orig, type, condition, message, clone)