summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-10-24 16:05:34 +0200
committerDimitri Sokolyuk <demon@dim13.org>2015-10-24 16:05:34 +0200
commit4646c9a35619408bc23852e3bc9fd1067d94f236 (patch)
treeaf237a534712cb93393a6bb49ddffd3d97d717a7
parent2a392910b0812122713229306b4e91f9bfd696fb (diff)
Whitespace
-rw-r--r--mess_client.erl11
-rw-r--r--mess_config.hrl1
-rw-r--r--mess_server.erl18
3 files changed, 17 insertions, 13 deletions
diff --git a/mess_client.erl b/mess_client.erl
index 4db8081..41f5418 100644
--- a/mess_client.erl
+++ b/mess_client.erl
@@ -5,7 +5,7 @@
-include("mess_interface.hrl").
client(Server_Node, Name) ->
- {messenger, Server_Node} ! #logon{client_pid=self(), username=Name},
+ {messenger, Server_Node} ! #logon{client_pid = self(), username = Name},
await_result(),
client(Server_Node).
@@ -13,9 +13,10 @@ client(Server_Node) ->
receive
logoff ->
exit(normal);
- #message_to{to_name=ToName, message=Message} ->
+ #message_to{to_name = ToName, message = Message} ->
{messenger, Server_Node} !
- #message{client_pid=self(), to_name=ToName, message=Message},
+ #message{client_pid = self(),
+ to_name = ToName, message = Message},
await_result();
{message_from, FromName, Message} ->
io:format("Message from ~p: ~p~n", [FromName, Message])
@@ -25,10 +26,10 @@ client(Server_Node) ->
%%% wait for a response from the server
await_result() ->
receive
- #abort_client{message=Why} ->
+ #abort_client{message = Why} ->
io:format("~p~n", [Why]),
exit(normal);
- #server_reply{message=What} ->
+ #server_reply{message = What} ->
io:format("~p~n", [What])
after 5000 ->
io:format("No response from server~n", []),
diff --git a/mess_config.hrl b/mess_config.hrl
index 90beea6..ebebb9c 100644
--- a/mess_config.hrl
+++ b/mess_config.hrl
@@ -1,2 +1,3 @@
%%% Conifigure the location of the server node,
+
-define(server_node, messenger@otto).
diff --git a/mess_server.erl b/mess_server.erl
index 3a25a98..98afb52 100644
--- a/mess_server.erl
+++ b/mess_server.erl
@@ -1,7 +1,9 @@
%%% This is the server process of the messenger service
-module(mess_server).
+
-export([server_start/0, server/0]).
+
-include("mess_interface.hrl").
server() ->
@@ -12,13 +14,13 @@ server() ->
server(User_List) ->
io:format("User list = ~p~n", [User_List]),
receive
- #logon{client_pid=From, username=Name} ->
+ #logon{client_pid = From, username = Name} ->
New_User_List = server_logon(From, Name, User_List),
server(New_User_List);
{'EXIT', From, _} ->
New_User_List = server_logoff(From, User_List),
server(New_User_List);
- #message{client_pid=From, to_name=ToName, message=Message} ->
+ #message{client_pid = From, to_name = ToName, message = Message} ->
server_transfer(From, ToName, Message, User_List),
server(User_List)
end.
@@ -32,10 +34,10 @@ server_logon(From, Name, User_List) ->
%% check if logged on anyone else
case lists:keymember(Name, 2, User_List) of
true ->
- From ! #abort_client{message=user_exists_at_other_node},
+ From ! #abort_client{message = user_exists_at_other_node},
User_List;
false ->
- From ! #server_reply{message=logged_on},
+ From ! #server_reply{message = logged_on},
link(From),
[{From, Name} | User_List] % add user to the list
end.
@@ -49,7 +51,7 @@ server_transfer(From, To, Message, User_List) ->
%% check that the user is logged on and who he is
case lists:keysearch(From, 1, User_List) of
false ->
- From ! #abort_client{message=you_are_not_logged_on};
+ From ! #abort_client{message = you_are_not_logged_on};
{value, {_, Name}} ->
server_transfer(From, Name, To, Message, User_List)
end.
@@ -58,8 +60,8 @@ server_transfer(From, To, Message, User_List) ->
server_transfer(From, Name, To, Message, User_List) ->
case lists:keysearch(To, 2, User_List) of
false ->
- From ! #server_reply{message=receiver_not_found};
+ From ! #server_reply{message = receiver_not_found};
{value, {ToPid, To}} ->
- ToPid ! #message_from{from_name=Name, message=Message},
- From ! #server_reply{message=sent}
+ ToPid ! #message_from{from_name = Name, message = Message},
+ From ! #server_reply{message = sent}
end.