minor bugfixes + added tests f JSON/TLS

3 files changed, 6 insertions, 4 deletions

diff --git a/components/dlink_tls/src/dlink_tls_conn.erl b/components/dlink_tls/src/dlink_tls_conn.erl
index 583009c..93266b1 100644
--- a/components/dlink_tls/src/dlink_tls_conn.erl
+++ b/components/dlink_tls/src/dlink_tls_conn.erl
@@ -146,6 +146,7 @@ init({IP, Port, Sock, Mod, Fun, CompSpec}) ->
     ?debug("connection:init(): Module:   ~p", [Mod]),
     ?debug("connection:init(): Function: ~p", [Fun]),
     {ok, PktMod} = get_module_config(packet_mod, ?PACKET_MOD, CompSpec),
+    ?debug("packet_mod = ~p", [PktMod]),
     PktSt = PktMod:init(CompSpec),
     {ok, #st{
 	    ip = IP,
@@ -159,7 +160,7 @@ init({IP, Port, Sock, Mod, Fun, CompSpec}) ->
 	   }}.
 
 get_module_config(Key, Default, CS) ->
-    rvi_common:get_module_config(dlink_tls, dlink_tls_rpc, Key, Default, CS).
+    rvi_common:get_module_config(data_link, dlink_tls_rpc, Key, Default, CS).
 
 %%--------------------------------------------------------------------
 %% @private
@@ -224,6 +225,7 @@ handle_cast({send, Data},  #st{packet_mod = PMod, packet_st = PSt} = St) ->
     ?debug("~p:handle_call(send): Sending: ~p",
 	   [ ?MODULE, abbrev(Data)]),
     {ok, Encoded, PSt1} = PMod:encode(Data, PSt),
+    ?debug("Encoded~n~s", [Encoded]),
     case St#st.mode of
 	tcp -> gen_tcp:send(St#st.sock, Encoded);
 	tls -> ssl:send(St#st.sock, Encoded)
diff --git a/components/dlink_tls/src/dlink_tls_listener.erl b/components/dlink_tls/src/dlink_tls_listener.erl
index 25da496..0effc66 100644
--- a/components/dlink_tls/src/dlink_tls_listener.erl
+++ b/components/dlink_tls/src/dlink_tls_listener.erl
@@ -78,6 +78,6 @@ new_connection(IP, Port, Sock, State) ->
     {ok, P} = dlink_tls_conn:setup(
                 undefined, 0, Sock,
                 dlink_tls_rpc,
-                handle_socket, [CompSpec]),
+                handle_socket, CompSpec),
     dlink_tls_conn:upgrade(P, server, CompSpec),
     {ok, State}.
diff --git a/components/dlink_tls/src/dlink_tls_rpc.erl b/components/dlink_tls/src/dlink_tls_rpc.erl
index 9df8f54..2f47792 100644
--- a/components/dlink_tls/src/dlink_tls_rpc.erl
+++ b/components/dlink_tls/src/dlink_tls_rpc.erl
@@ -833,11 +833,11 @@ log_orphan(Pfx, Fmt, Args) ->
 
 start_log(Pfx, Fmt, Args, CS) ->
     LogId = rvi_log:new_id(Pfx),
-    rvi_log:log(LogId, <<"dlink_tcp">>, rvi_log:format(Fmt, Args)),
+    rvi_log:log(LogId, <<"dlink_tls">>, rvi_log:format(Fmt, Args)),
     rvi_common:set_value(rvi_log_id, LogId, CS).
 
 log(Fmt, Args, CS) ->
-    rvi_log:flog(Fmt, Args, <<"dlink_tcp">>, CS).
+    rvi_log:flog(Fmt, Args, <<"dlink_tls">>, CS).
 
 abbrev(Data) ->
     authorize_keys:abbrev(Data).