diff options
| -rw-r--r-- | net/server.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_bosh.lua | 9 | ||||
| -rw-r--r-- | util/stanza.lua | 14 |
3 files changed, 19 insertions, 8 deletions
diff --git a/net/server.lua b/net/server.lua index 0a0f8492..a5c8e24c 100644 --- a/net/server.lua +++ b/net/server.lua @@ -362,7 +362,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _closelist[ handler ] = "send buffer exceeded" -- cannot close the client at the moment, have to wait to the end of the cycle
handler.write = idfalse -- dont write anymore
return false
- elseif not _sendlist[ socket ] then
+ elseif socket and not _sendlist[ socket ] then
_sendlistlen = _sendlistlen + 1
_sendlist[ _sendlistlen ] = socket
_sendlist[ socket ] = _sendlistlen
@@ -439,7 +439,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
fatalerror = true
disconnect( handler, err )
- handler.close( )
+ _ = handler and handler.close( )
return false
end
end
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index 3dd7a6a0..df89f88e 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -42,7 +42,7 @@ function handle_request(method, body, request) log("debug", "Request %s suffered error %s", tostring(request.id), body); return; end - log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body)); + --log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body)); request.notopen = true; request.log = log; local parser = lxp.new(init_xmlhandlers(request, stream_callbacks), "|"); @@ -79,7 +79,7 @@ function handle_request(method, body, request) waiting_requests[request] = true; end - log("debug", "Had nothing to say, so leaving request unanswered for now"); + log("debug", "Have nothing to say, so leaving request unanswered for now"); return true; end end @@ -101,8 +101,6 @@ local function bosh_close_stream(session, reason) end function stream_callbacks.streamopened(request, attr) - print("Attr:") - for k,v in pairs(attr) do print("", k, v); end log("debug", "BOSH body open (sid: %s)", attr.sid); local sid = attr.sid if not sid then @@ -139,7 +137,7 @@ function stream_callbacks.streamopened(request, attr) log("debug", "We have an open request, so using that to send with"); response.body = t_concat{"<body xmlns='http://jabber.org/protocol/httpbind' sid='", sid, "' xmlns:stream = 'http://etherx.jabber.org/streams'>", tostring(s), "</body>" }; oldest_request:send(response); - log("debug", "Sent"); + --log("debug", "Sent"); if oldest_request.stayopen then if #r>1 then -- Move front request to back @@ -245,6 +243,7 @@ function on_timer() (session.log or log)("debug", "BOSH client inactive too long, destroying session at %d", now); sessions[session.sid] = nil; inactive_sessions[session] = nil; + session.bosh_max_inactive = nil; -- Stop us marking this session as active during destroy sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds"); end else diff --git a/util/stanza.lua b/util/stanza.lua index 0b15ceed..1c1cab0e 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -12,6 +12,7 @@ local t_concat = table.concat; local t_remove = table.remove; local t_concat = table.concat; local s_format = string.format; +local s_match = string.match; local tostring = tostring; local setmetatable = setmetatable; local pairs = pairs; @@ -114,11 +115,22 @@ end local xml_escape = xml_escape; local function dostring(t, buf, self, xml_escape) + local nsid, ns, attrk = 0; t_insert(buf, "<"); t_insert(buf, t.name); for k, v in pairs(t.attr) do if type(k) == "string" then t_insert(buf, " "); - t_insert(buf, k); + ns, attrk = s_match(k, "^([^|]+)|(.+)$"); + if ns then + nsid = (nsid or -1) + 1; + t_insert(buf, "xmlns:ns"..nsid); + t_insert(buf, "='"); + t_insert(buf, (xml_escape(tostring(ns)))); + t_insert(buf, "' "); + t_insert(buf, "ns"..nsid..":"..attrk); + else + t_insert(buf, k); + end t_insert(buf, "='"); t_insert(buf, (xml_escape(tostring(v)))); t_insert(buf, "'"); |