jeena/GGS
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Changed from random numbers to UUIDs in tokens

Browse source
This commit is contained in:
Jonatan Pålsson 2011-02-05 00:53:49 +01:00
parent 40fdb8b431
commit adfc9b41dd
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/ggs_server.erl
View file

@ -102,17 +102,17 @@ do_JSCall(Socket, Data, State) ->
{define, Token, Payload} -> {define, Token, Payload} ->
JSVM = getJSVM(Token, State), JSVM = getJSVM(Token, State),
js_runner:define(JSVM, Payload), js_runner:define(JSVM, Payload),
send(Socket, "RefID", "Okay, defined that for you!"), send(Socket, Token, "Okay, defined that for you!"),
[]; [];
{call, Token, Payload} -> {call, Token, Payload} ->
JSVM = getJSVM(Token, State), JSVM = getJSVM(Token, State),
Ret = js_runner:call(JSVM, Payload, []),%Payload, []), {ok, Ret} = js_runner:call(JSVM, Payload, []),%Payload, []),
send(Socket, "RefID", "JS says: ", Ret); send(Socket, Token, "JS says:", binary_to_list(Ret));
% Set the new state to the reference generated, and JSVM associated % Set the new state to the reference generated, and JSVM associated
{hello, _, _} -> {hello, _, _} ->
JSVM = js_runner:boot(), JSVM = js_runner:boot(),
Client = integer_to_list(getRef()), Client = getRef(),
send(Socket, Client, "This is your refID"), send(Socket, Client, "This is your refID"),
{Client, JSVM}; {Client, JSVM};
{echo, RefID, _, MSG} -> {echo, RefID, _, MSG} ->
@ -133,9 +133,10 @@ do_JSCall(Socket, Data, State) ->
%% Helpers %% Helpers
%%----------------------------------------------------- %%-----------------------------------------------------
getRef() -> getRef() ->
{A1,A2,A3} = now(), %{A1,A2,A3} = now(),
random:seed(A1, A2, A3), %#random:seed(A1, A2, A3),
random:uniform(1000). %random:uniform(1000).
string:strip(os:cmd("uuidgen"), right, $\n ).
getJSVM(RefID, State) -> getJSVM(RefID, State) ->
VMs = State#state.client_vm_map, VMs = State#state.client_vm_map,
@ -145,9 +146,7 @@ getJSVM(RefID, State) ->
VM. VM.
send(Socket, RefID, String) -> send(Socket, RefID, String) ->
{Ref, _} = string:to_integer(RefID), gen_tcp:send(Socket, string:join([RefID,String,"\n"], " ")).
gen_tcp:send(Socket, io_lib:fwrite("~p ~p~n", [Ref,String])).
send(Socket, RefID, String1, String2) -> send(Socket, RefID, String1, String2) ->
{Ref, _} = string:to_integer(RefID), gen_tcp:send(Socket, string:join([RefID,String1, String2,"\n"], " ")).
gen_tcp:send(Socket, io_lib:fwrite("~p ~p ~p~n", [Ref, String1, String2])).