diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-10-15 10:51:00 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-10-15 10:51:00 +0200 |
| commit | 8ce78ba045474b606267e351e945ef6be1b969c0 (patch) | |
| tree | f816810cada27ae88e30925278d3359bf650ee2c | |
| parent | 8a4b724f71d2ced4be6568624672d4afd42710be (diff) | |
| download | erlang-8ce78ba045474b606267e351e945ef6be1b969c0.tar.gz erlang-8ce78ba045474b606267e351e945ef6be1b969c0.tar.xz erlang-8ce78ba045474b606267e351e945ef6be1b969c0.zip | |
moved register and login form server/client to server/dispatcher
| -rw-r--r-- | client/client.erl | 2 | ||||
| -rw-r--r-- | server/client.erl | 11 | ||||
| -rw-r--r-- | server/dispatcher.erl | 12 |
3 files changed, 13 insertions, 12 deletions
diff --git a/client/client.erl b/client/client.erl index 97f0735..43dbfc6 100644 --- a/client/client.erl +++ b/client/client.erl @@ -16,8 +16,8 @@ buildNode(Server) -> list_to_atom("distributed_music_system_main_node@" ++ Server). rpc(Server, Function, Params) -> - rpc:call(buildNode(Server), client, Function, Params). %% shortcut for calling a function from the server + rpc:call(buildNode(Server), dispatcher, Function, Params). register(Server, Name, Password) -> %% check if client is not logged in (if client is logged in, diff --git a/server/client.erl b/server/client.erl index c5beda7..3f9ece2 100644 --- a/server/client.erl +++ b/server/client.erl @@ -1,5 +1,5 @@ -module(client). --export([start/2, loop/2, register/2, login/2]). +-export([start/2, loop/2]). start(Node, User) -> %% start linked processes on client and server to get noticed if @@ -68,12 +68,3 @@ loop(Client, User) -> Client ! {error, {unknown_command, Cmd}} end, loop(Client, User). - -register(Client, {Name, Password}) -> - %% forward the register messages to the dispatcher (if user is not - %% logged in) - dis ! {Client, {register, {Name, Password}}}. - -login(Client, {Node, Name, Password}) -> - %% forward the login messages to the dispatcher - dis ! {Client, {login, {Node, Name, Password}}}. diff --git a/server/dispatcher.erl b/server/dispatcher.erl index 27c2d4c..b3db9bb 100644 --- a/server/dispatcher.erl +++ b/server/dispatcher.erl @@ -1,5 +1,5 @@ -module(dispatcher). --export([start/0, handle/2]). +-export([start/0, handle/2, register/2, login/2]). checkUserExists([_|_]) -> %% helper function to check if given array contains at least one element @@ -74,3 +74,13 @@ handle({'EXIT', From, _}, State) -> handle(Cmd, State) -> %% standard command, to find invalid commands and emit an error {{error, {unknown_command, Cmd}}, State}. + +register(Client, {Name, Password}) -> + %% forward the register messages to the dispatcher (called form + %% the client) + dis ! {Client, {register, {Name, Password}}}. + +login(Client, {Node, Name, Password}) -> + %% forward the login messages to the dispatcher (called form the + %% client) + dis ! {Client, {login, {Node, Name, Password}}}. |