summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-11-11 13:13:57 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-11-11 13:13:57 +0100
commit0aeaa178ac05d927862a7826a1a483d1eab022e5 (patch)
tree2a35bfd4758e42aa690e9a2caab84e0f89201200
parentde262a2fec61a1ba00227c727ced68f1d8544b89 (diff)
Merge files
-rw-r--r--src/pbx_conn.erl6
-rw-r--r--src/pbx_events.erl9
-rw-r--r--src/pbx_pdu.erl8
3 files changed, 11 insertions, 12 deletions
diff --git a/src/pbx_conn.erl b/src/pbx_conn.erl
index 3cd0f00..9b92b11 100644
--- a/src/pbx_conn.erl
+++ b/src/pbx_conn.erl
@@ -15,8 +15,8 @@ start_link() ->
init(Args) ->
send(pbx_acse:encode(associate)),
[Host, Port] = Args,
- pbx_events:start_link(),
- pbx_events:add_handler(pbx_acse, []),
+ pbx_pdu:start_link(),
+ pbx_pdu:add_handler(pbx_acse, []),
gen_tcp:connect(Host, Port, [binary, {packet, 2}]).
handle_call(_Request, _From, Socket) ->
@@ -32,7 +32,7 @@ handle_info({tcp, _, Data}, Socket) ->
pbx_acse:decode(Data),
Pdu = pbx_pdu:decode(Data),
io:format("PDU ~p~n", [Pdu]),
- gen_event:notify(pbx_events, Pdu),
+ gen_event:notify(pbx_pdu, Pdu),
{noreply, Socket};
handle_info({tcp_closed, _}, Socket) ->
diff --git a/src/pbx_events.erl b/src/pbx_events.erl
deleted file mode 100644
index efdd3d8..0000000
--- a/src/pbx_events.erl
+++ /dev/null
@@ -1,9 +0,0 @@
--module(pbx_events).
-
--export([start_link/0, add_handler/2]).
-
-start_link() ->
- gen_event:start_link({local, ?MODULE}).
-
-add_handler(Handler, Args) ->
- gen_event:add_handler(?MODULE, Handler, Args).
diff --git a/src/pbx_pdu.erl b/src/pbx_pdu.erl
index 62fd786..a5d4d79 100644
--- a/src/pbx_pdu.erl
+++ b/src/pbx_pdu.erl
@@ -1,5 +1,7 @@
-module(pbx_pdu).
+
-export([decode/1]).
+-export([start_link/0, add_handler/2]).
-include("Remote-Operations-Generic-ROS-PDUs.hrl").
-include("ACSE-1.hrl").
@@ -12,3 +14,9 @@ decode(<<Data/binary>>) ->
decode(Pdu);
decode(Pdu) ->
Pdu.
+
+start_link() ->
+ gen_event:start_link({local, ?MODULE}).
+
+add_handler(Handler, Args) ->
+ gen_event:add_handler(?MODULE, Handler, Args).