Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Renamed some vars for (thanks to Stefan Strigler)

Browse Source 
SVN Revision: 2264
This commit is contained in:
Badlop 2009-06-16 18:23:53 +00:00
parent d019405d51
commit ecc2bbd752
1 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
src/web/ejabberd_http_bind.erl
View File

@ -73,14 +73,14 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
%%% API %%% API
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
start(ID, Key) -> start(Sid, Key) ->
mnesia:create_table(http_bind, mnesia:create_table(http_bind,
[{ram_copies, [node()]}, [{ram_copies, [node()]},
{attributes, record_info(fields, http_bind)}]), {attributes, record_info(fields, http_bind)}]),
supervisor:start_child(ejabberd_http_bind_sup, [ID, Key]). supervisor:start_child(ejabberd_http_bind_sup, [Sid, Key]).
start_link(ID, Key) -> start_link(Sid, Key) ->
gen_fsm:start_link(?MODULE, [ID, Key], ?FSMOPTS). gen_fsm:start_link(?MODULE, [Sid, Key], ?FSMOPTS).
send({http_bind, FsmRef}, Packet) -> send({http_bind, FsmRef}, Packet) ->
gen_fsm:sync_send_all_state_event(FsmRef, {send, Packet}). gen_fsm:sync_send_all_state_event(FsmRef, {send, Packet}).
@ -102,19 +102,19 @@ close({http_bind, FsmRef}) ->
process_request(Data) -> process_request(Data) ->
case catch parse_request(Data) of case catch parse_request(Data) of
{ok, ID1, RID, Key, NewKey, Attrs, Packet} -> {ok, {ParsedSid, Rid, Key, NewKey, Attrs, Packet}} ->
XmppDomain = xml:get_attr_s("to",Attrs), XmppDomain = xml:get_attr_s("to",Attrs),
if if
(ID1 == "") and (XmppDomain == "") -> (ParsedSid == "") and (XmppDomain == "") ->
{200, ?HEADER, "<body type='terminate' " {200, ?HEADER, "<body type='terminate' "
"condition='improper-addressing' " "condition='improper-addressing' "
"xmlns='http://jabber.org/protocol/httpbind'/>"}; "xmlns='http://jabber.org/protocol/httpbind'/>"};
true -> true ->
ID = if Sid = if
(ID1 == "") -> (ParsedSid == "") ->
%% create new session %% create new session
NewID = sha:sha(term_to_binary({now(), make_ref()})), NewSid = sha:sha(term_to_binary({now(), make_ref()})),
{ok, Pid} = start(NewID, Key), {ok, Pid} = start(NewSid, Key),
?DEBUG("got pid: ~p", [Pid]), ?DEBUG("got pid: ~p", [Pid]),
Wait = case Wait = case
string:to_integer(xml:get_attr_s("wait",Attrs)) string:to_integer(xml:get_attr_s("wait",Attrs))
@ -145,7 +145,7 @@ process_request(Data) ->
end, end,
mnesia:transaction( mnesia:transaction(
fun() -> fun() ->
mnesia:write(#http_bind{id = NewID, mnesia:write(#http_bind{id = NewSid,
pid = Pid, pid = Pid,
to = XmppDomain, to = XmppDomain,
wait = Wait, wait = Wait,
@ -158,7 +158,7 @@ process_request(Data) ->
false false
end, end,
InPacket = Packet, InPacket = Packet,
NewID; NewSid;
true -> true ->
%% old session %% old session
Type = xml:get_attr_s("type",Attrs), Type = xml:get_attr_s("type",Attrs),
@ -178,16 +178,16 @@ process_request(Data) ->
true -> true ->
InPacket = Packet InPacket = Packet
end, end,
ID1 ParsedSid
end, end,
%% ?DEBUG("~n InPacket: ~s ~n", [InPacket]), %% ?DEBUG("~n InPacket: ~s ~n", [InPacket]),
case http_put(ID, RID, Key, NewKey, Hold, InPacket, StreamStart) of case http_put(Sid, Rid, Key, NewKey, Hold, InPacket, StreamStart) of
{error, not_exists} -> {error, not_exists} ->
?DEBUG("no session associated with sid: ~p", [ID]), ?DEBUG("no session associated with sid: ~p", [Sid]),
{404, ?HEADER, ""}; {404, ?HEADER, ""};
{error, bad_key} -> {error, bad_key} ->
?DEBUG("bad key: ~s", [Key]), ?DEBUG("bad key: ~s", [Key]),
case mnesia:dirty_read({http_bind, ID}) of case mnesia:dirty_read({http_bind, Sid}) of
[] -> [] ->
{404, ?HEADER, ""}; {404, ?HEADER, ""};
[#http_bind{pid = FsmRef}] -> [#http_bind{pid = FsmRef}] ->
@ -195,8 +195,8 @@ process_request(Data) ->
{404, ?HEADER, ""} {404, ?HEADER, ""}
end; end;
{error, polling_too_frequently} -> {error, polling_too_frequently} ->
?DEBUG("polling too frequently: ~p", [ID]), ?DEBUG("polling too frequently: ~p", [Sid]),
case mnesia:dirty_read({http_bind, ID}) of case mnesia:dirty_read({http_bind, Sid}) of
[] -> %% unlikely! (?) [] -> %% unlikely! (?)
{404, ?HEADER, ""}; {404, ?HEADER, ""};
[#http_bind{pid = FsmRef}] -> [#http_bind{pid = FsmRef}] ->
@ -206,28 +206,28 @@ process_request(Data) ->
{repeat, OutPacket} -> {repeat, OutPacket} ->
?DEBUG("http_put said 'repeat!' ...~nOutPacket: ~p", ?DEBUG("http_put said 'repeat!' ...~nOutPacket: ~p",
[OutPacket]), [OutPacket]),
send_outpacket(ID, OutPacket); send_outpacket(Sid, OutPacket);
ok -> ok ->
receive_loop(ID,ID1,RID,Wait,Hold,Attrs) receive_loop(Sid,ParsedSid,Rid,Wait,Hold,Attrs)
end end
end; end;
_ -> _ ->
{400, ?HEADER, ""} {400, ?HEADER, ""}
end. end.
receive_loop(ID,ID1,RID,Wait,Hold,Attrs) -> receive_loop(Sid,ParsedSid,Rid,Wait,Hold,Attrs) ->
receive receive
after 100 -> ok after 100 -> ok
end, end,
prepare_response(ID,ID1,RID,Wait,Hold,Attrs). prepare_response(Sid,ParsedSid,Rid,Wait,Hold,Attrs).
prepare_response(ID,ID1,RID,Wait,Hold,Attrs) -> prepare_response(Sid,ParsedSid,Rid,Wait,Hold,Attrs) ->
case http_get(ID,RID) of case http_get(Sid,Rid) of
{error, not_exists} -> {error, not_exists} ->
?DEBUG("no session associated with sid: ~s", ID), ?DEBUG("no session associated with sid: ~s", Sid),
{404, ?HEADER, ""}; {404, ?HEADER, ""};
{ok, keep_on_hold} -> {ok, keep_on_hold} ->
receive_loop(ID,ID1,RID,Wait,Hold,Attrs); receive_loop(Sid,ParsedSid,Rid,Wait,Hold,Attrs);
{ok, cancel} -> {ok, cancel} ->
%% actually it would be better if we could completely %% actually it would be better if we could completely
%% cancel this request, but then we would have to hack %% cancel this request, but then we would have to hack
@ -236,8 +236,8 @@ prepare_response(ID,ID1,RID,Wait,Hold,Attrs) ->
{ok, OutPacket} -> {ok, OutPacket} ->
?DEBUG("OutPacket: ~s", [OutPacket]), ?DEBUG("OutPacket: ~s", [OutPacket]),
if if
ID == ID1 -> Sid == ParsedSid ->
send_outpacket(ID, OutPacket); send_outpacket(Sid, OutPacket);
true -> true ->
To = xml:get_attr_s("to",Attrs), To = xml:get_attr_s("to",Attrs),
OutEls = case xml_stream:parse_element( OutEls = case xml_stream:parse_element(
@ -274,7 +274,7 @@ prepare_response(ID,ID1,RID,Wait,Hold,Attrs) ->
{xmlelement,"body", {xmlelement,"body",
[{"xmlns", [{"xmlns",
"http://jabber.org/protocol/httpbind"}, "http://jabber.org/protocol/httpbind"},
{"sid",ID}, {"sid",Sid},
{"wait", integer_to_list(Wait)}, {"wait", integer_to_list(Wait)},
{"requests", integer_to_list(Hold+1)}, {"requests", integer_to_list(Hold+1)},
{"inactivity", {"inactivity",
@ -286,12 +286,12 @@ prepare_response(ID,ID1,RID,Wait,Hold,Attrs) ->
end end
end. end.
send_outpacket(ID, OutPacket) -> send_outpacket(Sid, OutPacket) ->
case OutPacket of case OutPacket of
"" -> "" ->
{200, ?HEADER, "<body xmlns='http://jabber.org/protocol/httpbind'/>"}; {200, ?HEADER, "<body xmlns='http://jabber.org/protocol/httpbind'/>"};
"</stream:stream>" -> "</stream:stream>" ->
case mnesia:dirty_read({http_bind, ID}) of case mnesia:dirty_read({http_bind, Sid}) of
[#http_bind{pid = FsmRef}] -> [#http_bind{pid = FsmRef}] ->
gen_fsm:sync_send_all_state_event(FsmRef,stop) gen_fsm:sync_send_all_state_event(FsmRef,stop)
end, end,
@ -356,7 +356,7 @@ send_outpacket(ID, OutPacket) ->
{error, _E} -> {error, _E} ->
null null
end, end,
case mnesia:dirty_read({http_bind, ID}) of case mnesia:dirty_read({http_bind, Sid}) of
[#http_bind{pid = FsmRef}] -> [#http_bind{pid = FsmRef}] ->
gen_fsm:sync_send_all_state_event(FsmRef,stop); gen_fsm:sync_send_all_state_event(FsmRef,stop);
_ -> _ ->
@ -398,14 +398,14 @@ send_outpacket(ID, OutPacket) ->
%% ignore | %% ignore |
%% {stop, StopReason} %% {stop, StopReason}
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
init([ID, Key]) -> init([Sid, Key]) ->
?INFO_MSG("started: ~p", [{ID, Key}]), ?INFO_MSG("started: ~p", [{Sid, Key}]),
Opts = [], % TODO Opts = [], % TODO
ejabberd_socket:start(ejabberd_c2s, ?MODULE, {http_bind, self()}, Opts), ejabberd_socket:start(ejabberd_c2s, ?MODULE, {http_bind, self()}, Opts),
% {ok, C2SPid} = ejabberd_c2s:start({?MODULE, {http_bind, self()}}, Opts), % {ok, C2SPid} = ejabberd_c2s:start({?MODULE, {http_bind, self()}}, Opts),
% ejabberd_c2s:become_controller(C2SPid), % ejabberd_c2s:become_controller(C2SPid),
Timer = erlang:start_timer(?MAX_INACTIVITY, self(), []), Timer = erlang:start_timer(?MAX_INACTIVITY, self(), []),
{ok, loop, #state{id = ID, {ok, loop, #state{id = Sid,
key = Key, key = Key,
timer = Timer}}. timer = Timer}}.
@ -471,10 +471,10 @@ handle_sync_event(stop, _From, _StateName, StateData) ->
Reply = ok, Reply = ok,
{stop, normal, Reply, StateData}; {stop, normal, Reply, StateData};
handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo}, handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StartTo},
_From, StateName, StateData) -> _From, StateName, StateData) ->
%% check if RID valid %% check if Rid valid
RidAllow = case RID of RidAllow = case Rid of
error -> error ->
false; false;
_ -> _ ->
@ -482,15 +482,15 @@ handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo},
error -> error ->
%% first request - nothing saved so far %% first request - nothing saved so far
true; true;
OldRID -> OldRid ->
?DEBUG("state.rid/cur rid: ~p/~p", ?DEBUG("state.rid/cur rid: ~p/~p",
[OldRID, RID]), [OldRid, Rid]),
if if
(OldRID < RID) and (OldRid < Rid) and
(RID =< (OldRID + Hold + 1)) -> (Rid =< (OldRid + Hold + 1)) ->
true; true;
(RID =< OldRID) and (Rid =< OldRid) and
(RID > OldRID - Hold - 1) -> (Rid > OldRid - Hold - 1) ->
repeat; repeat;
true -> true ->
false false
@ -542,10 +542,10 @@ handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo},
Reply = {error, not_exists}, Reply = {error, not_exists},
{reply, Reply, StateName, StateData}; {reply, Reply, StateName, StateData};
repeat -> repeat ->
?DEBUG("REPEATING ~p", [RID]), ?DEBUG("REPEATING ~p", [Rid]),
[Out | _XS] = [El#hbr.out || [Out | _XS] = [El#hbr.out ||
El <- StateData#state.req_list, El <- StateData#state.req_list,
El#hbr.rid == RID], El#hbr.rid == Rid],
case Out of case Out of
[[] | OutPacket] -> [[] | OutPacket] ->
Reply = {repeat, OutPacket}; Reply = {repeat, OutPacket};
@ -564,14 +564,14 @@ handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo},
?DEBUG(" -- SaveKey: ~s~n", [SaveKey]), ?DEBUG(" -- SaveKey: ~s~n", [SaveKey]),
%% save request %% save request
ReqList = [#hbr{rid=RID, ReqList = [#hbr{rid=Rid,
key=StateData#state.key, key=StateData#state.key,
in=StateData#state.input, in=StateData#state.input,
out=StateData#state.output out=StateData#state.output
} | } |
[El || El <- StateData#state.req_list, [El || El <- StateData#state.req_list,
El#hbr.rid < RID, El#hbr.rid < Rid,
El#hbr.rid > (RID - 1 - Hold)] El#hbr.rid > (Rid - 1 - Hold)]
], ],
%% ?DEBUG("reqlist: ~p", [ReqList]), %% ?DEBUG("reqlist: ~p", [ReqList]),
case StateData#state.waiting_input of case StateData#state.waiting_input of
@ -583,7 +583,7 @@ handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo},
Reply = ok, Reply = ok,
{reply, Reply, StateName, {reply, Reply, StateName,
StateData#state{input = Input, StateData#state{input = Input,
rid = RID, rid = Rid,
key = SaveKey, key = SaveKey,
ctime = TNow, ctime = TNow,
timer = Timer, timer = Timer,
@ -613,7 +613,7 @@ handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo},
StateData#state{waiting_input = false, StateData#state{waiting_input = false,
last_receiver = Receiver, last_receiver = Receiver,
input = "", input = "",
rid = RID, rid = Rid,
key = SaveKey, key = SaveKey,
ctime = TNow, ctime = TNow,
timer = Timer, timer = Timer,
@ -627,7 +627,7 @@ handle_sync_event({http_put, RID, Key, NewKey, Hold, Packet, StartTo},
{reply, Reply, StateName, StateData} {reply, Reply, StateName, StateData}
end; end;
handle_sync_event({http_get, RID, Wait, Hold}, _From, StateName, StateData) -> handle_sync_event({http_get, Rid, Wait, Hold}, _From, StateName, StateData) ->
{_,TSec,TMSec} = now(), {_,TSec,TMSec} = now(),
TNow = TSec*1000*1000 + TMSec, TNow = TSec*1000*1000 + TMSec,
cancel_timer(StateData#state.timer), cancel_timer(StateData#state.timer),
@ -636,7 +636,7 @@ handle_sync_event({http_get, RID, Wait, Hold}, _From, StateName, StateData) ->
(Hold > 0) and (Hold > 0) and
(StateData#state.output == "") and (StateData#state.output == "") and
((TNow - StateData#state.ctime) < (Wait*1000*1000)) and ((TNow - StateData#state.ctime) < (Wait*1000*1000)) and
(StateData#state.rid == RID) and (StateData#state.rid == Rid) and
(StateData#state.input /= "cancel") -> (StateData#state.input /= "cancel") ->
Output = StateData#state.output, Output = StateData#state.output,
ReqList = StateData#state.req_list, ReqList = StateData#state.req_list,
@ -653,13 +653,13 @@ handle_sync_event({http_get, RID, Wait, Hold}, _From, StateName, StateData) ->
Reply = {ok, StateData#state.output} Reply = {ok, StateData#state.output}
end, end,
%% save request %% save request
ReqList = [#hbr{rid=RID, ReqList = [#hbr{rid=Rid,
key=StateData#state.key, key=StateData#state.key,
in=StateData#state.input, in=StateData#state.input,
out=StateData#state.output out=StateData#state.output
} | } |
[El || El <- StateData#state.req_list, [El || El <- StateData#state.req_list,
El#hbr.rid /= RID ] El#hbr.rid /= Rid ]
], ],
Output = "" Output = ""
end, end,
@ -716,9 +716,9 @@ terminate(_Reason, _StateName, StateData) ->
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
http_put(ID, RID, Key, NewKey, Hold, Packet, Restart) -> http_put(Sid, Rid, Key, NewKey, Hold, Packet, Restart) ->
?DEBUG("http-put",[]), ?DEBUG("http-put",[]),
case mnesia:dirty_read({http_bind, ID}) of case mnesia:dirty_read({http_bind, Sid}) of
[] -> [] ->
?DEBUG("not found",[]), ?DEBUG("not found",[]),
{error, not_exists}; {error, not_exists};
@ -727,20 +727,20 @@ http_put(ID, RID, Key, NewKey, Hold, Packet, Restart) ->
true -> true ->
?DEBUG("restart requested for ~s", [To]), ?DEBUG("restart requested for ~s", [To]),
gen_fsm:sync_send_all_state_event( gen_fsm:sync_send_all_state_event(
FsmRef, {http_put, RID, Key, NewKey, Hold, Packet, To}); FsmRef, {http_put, Rid, Key, NewKey, Hold, Packet, To});
_ -> _ ->
gen_fsm:sync_send_all_state_event( gen_fsm:sync_send_all_state_event(
FsmRef, {http_put, RID, Key, NewKey, Hold, Packet, ""}) FsmRef, {http_put, Rid, Key, NewKey, Hold, Packet, ""})
end end
end. end.
http_get(ID,RID) -> http_get(Sid,Rid) ->
case mnesia:dirty_read({http_bind, ID}) of case mnesia:dirty_read({http_bind, Sid}) of
[] -> [] ->
{error, not_exists}; {error, not_exists};
[#http_bind{pid = FsmRef, wait = Wait, hold = Hold}] -> [#http_bind{pid = FsmRef, wait = Wait, hold = Hold}] ->
gen_fsm:sync_send_all_state_event(FsmRef, gen_fsm:sync_send_all_state_event(FsmRef,
{http_get, RID, Wait, Hold}) {http_get, Rid, Wait, Hold})
end. end.
@ -760,8 +760,8 @@ parse_request(Data) ->
false false
end end
end, Els), end, Els),
ID = xml:get_attr_s("sid",Attrs), Sid = xml:get_attr_s("sid",Attrs),
{RID,_X} = string:to_integer(xml:get_attr_s("rid",Attrs)), {Rid,_X} = string:to_integer(xml:get_attr_s("rid",Attrs)),
Key = xml:get_attr_s("key",Attrs), Key = xml:get_attr_s("key",Attrs),
NewKey = xml:get_attr_s("newkey",Attrs), NewKey = xml:get_attr_s("newkey",Attrs),
Xmlns = xml:get_attr_s("xmlns",Attrs), Xmlns = xml:get_attr_s("xmlns",Attrs),
@ -781,7 +781,7 @@ parse_request(Data) ->
Xmlns /= "http://jabber.org/protocol/httpbind" -> Xmlns /= "http://jabber.org/protocol/httpbind" ->
{error, bad_request}; {error, bad_request};
true -> true ->
{ok, ID, RID, Key, NewKey, Attrs, Packet} {ok, {Sid, Rid, Key, NewKey, Attrs, Packet}}
end; end;
{error, _Reason} -> {error, _Reason} ->
{error, bad_request} {error, bad_request}