mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.8->trunk

Browse source
This commit is contained in:
Waqas Hussain 2011-01-29 04:54:08 +05:00
commit d76f04e84e
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/s2smanager.lua
View file

@ -76,7 +76,8 @@ local function bounce_sendq(session, reason)
reply:tag("error", {type = "cancel"})
:tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
if reason then
reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up();
reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"})
:text("Server-to-server connection failed: "..reason):up();
end
core_process_stanza(dummy, reply);
end

5
core/stanza_router.lua
View file

@ -40,6 +40,7 @@ local function handle_unhandled_stanza(host, origin, stanza)
end
end
local iq_types = { set=true, get=true, result=true, error=true };
function core_process_stanza(origin, stanza)
(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
@ -47,8 +48,8 @@ function core_process_stanza(origin, stanza)
if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
if stanza.name == "iq" then
if not stanza.attr.id then stanza.attr.id = ""; end -- COMPAT Jabiru doesn't send the id attribute on roster requests
if (stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1) then
origin.send(st.error_reply(stanza, "modify", "bad-request"));
if not iq_types[stanza.attr.type] or ((stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1)) then
origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children"));
return;
end
end

4
plugins/mod_ping.lua
View file

@ -22,8 +22,10 @@ module:hook("iq/host/urn:xmpp:ping:ping", ping_handler);
-- Ad-hoc command
local datetime = require "util.datetime".datetime;
function ping_command_handler (self, data, state)
local now = os.date("%Y-%m-%dT%X");
local now = datetime();
return { info = "Pong\n"..now, status = "completed" };
end

26
util-src/windows.c
View file

@ -38,15 +38,16 @@ static int Lget_nameservers(lua_State *L) {
}
return 1;
} else {
luaL_error(L, "DnsQueryConfig returned %d", status);
return 0; // unreachable, but prevents a compiler warning
lua_pushnil(L);
lua_pushfstring(L, "DnsQueryConfig returned %d", status);
return 2;
}
}
static void lassert(lua_State *L, BOOL test, char* string) {
if (!test) {
luaL_error(L, "%s: %d", string, GetLastError());
}
static int lerror(lua_State *L, char* string) {
lua_pushnil(L);
lua_pushfstring(L, "%s: %d", string, GetLastError());
return 2;
}
static int Lget_consolecolor(lua_State *L) {
@ -55,9 +56,9 @@ static int Lget_consolecolor(lua_State *L) {
CONSOLE_SCREEN_BUFFER_INFO info;
lassert(L, console != INVALID_HANDLE_VALUE, "GetStdHandle");
lassert(L, GetConsoleScreenBufferInfo(console, &info), "GetConsoleScreenBufferInfo");
lassert(L, ReadConsoleOutputAttribute(console, &color, sizeof(WORD), info.dwCursorPosition, &read_len), "ReadConsoleOutputAttribute");
if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
if (!GetConsoleScreenBufferInfo(console, &info)) return lerror(L, "GetConsoleScreenBufferInfo");
if (!ReadConsoleOutputAttribute(console, &color, sizeof(WORD), info.dwCursorPosition, &read_len)) return lerror(L, "ReadConsoleOutputAttribute");
lua_pushnumber(L, color);
return 1;
@ -65,9 +66,10 @@ static int Lget_consolecolor(lua_State *L) {
static int Lset_consolecolor(lua_State *L) {
int color = luaL_checkint(L, 1);
HWND console = GetStdHandle(STD_OUTPUT_HANDLE);
lassert(L, console != INVALID_HANDLE_VALUE, "GetStdHandle");
lassert(L, SetConsoleTextAttribute(console, color), "SetConsoleTextAttribute");
return 0;
if (console == INVALID_HANDLE_VALUE) return lerror(L, "GetStdHandle");
if (!SetConsoleTextAttribute(console, color)) return lerror(L, "SetConsoleTextAttribute");
lua_pushboolean(L, 1);
return 1;
}
static const luaL_Reg Reg[] =