diff options
| -rw-r--r-- | components/dlink_tls/src/dlink_tls_conn.erl | 4 | ||||
| -rw-r--r-- | components/dlink_tls/src/dlink_tls_listener.erl | 2 | ||||
| -rw-r--r-- | components/dlink_tls/src/dlink_tls_rpc.erl | 4 | ||||
| -rw-r--r-- | priv/test_config/tls_sample.config | 4 | ||||
| -rw-r--r-- | test/rvi_core_SUITE.erl | 47 |
5 files changed, 54 insertions, 7 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). diff --git a/priv/test_config/tls_sample.config b/priv/test_config/tls_sample.config index 318bc27..1917309 100644 --- a/priv/test_config/tls_sample.config +++ b/priv/test_config/tls_sample.config @@ -5,12 +5,12 @@ [ {rvi_core, [ - { [routing_rules, ""], [{proto_json, dlink_tls_rpc}] }, + { [routing_rules, ""], [{proto_msgpack_rpc, dlink_tls_rpc}] }, { [components, data_link], [{dlink_tls_rpc, gen_server, [{server_opts, [{port, 9007}]}, {persistent_connections, ["localhost:8007"]}]}]}, - { [components, protocol], [{ proto_msgpack, gen_server, [] }] } + { [components, protocol], [{ proto_msgpack_rpc, gen_server, [] }] } ]} ]} ]. diff --git a/test/rvi_core_SUITE.erl b/test/rvi_core_SUITE.erl index 9b13f28..9846ae3 100644 --- a/test/rvi_core_SUITE.erl +++ b/test/rvi_core_SUITE.erl @@ -20,6 +20,8 @@ t_install_sms_sample_node/1, t_install_tls_backend_node/1, t_install_tls_sample_node/1, + t_install_tlsj_backend_node/1, + t_install_tlsj_sample_node/1, t_install_bt_backend_node/1, t_install_bt_sample_node/1, t_start_basic_backend/1, @@ -28,6 +30,8 @@ t_start_bt_sample/1, t_start_tls_backend/1, t_start_tls_sample/1, + t_start_tlsj_backend/1, + t_start_tlsj_sample/1, t_register_lock_service/1, t_call_lock_service/1, t_remote_call_lock_service/1, @@ -43,7 +47,8 @@ all() -> {group, test_install}, {group, test_run}, {group, test_run_bt}, - {group, test_run_tls} + {group, test_run_tls}, + {group, test_run_tlsj} ]. groups() -> @@ -60,6 +65,8 @@ groups() -> t_install_sms_sample_node, t_install_tls_backend_node, t_install_tls_sample_node, + t_install_tlsj_backend_node, + t_install_tlsj_sample_node, t_install_bt_backend_node, t_install_bt_sample_node ]}, @@ -89,6 +96,15 @@ groups() -> t_call_lock_service, t_remote_call_lock_service, t_no_errors + ]}, + {test_run_tlsj, [], + [ + t_start_tlsj_backend, + t_start_tlsj_sample, + t_register_lock_service, + t_call_lock_service, + t_remote_call_lock_service, + t_no_errors ]} ]. @@ -178,6 +194,13 @@ t_install_tls_backend_node(_Config) -> t_install_tls_sample_node(_Config) -> install_sample_node("tls_sample", "tls_sample.config"). +t_install_tlsj_backend_node(_Config) -> + install_rvi_node("tlsj_backend", env(), + [root(), "/priv/test_config/tlsj_backend.config"]). + +t_install_tlsj_sample_node(_Config) -> + install_sample_node("tlsj_sample", "tlsj_sample.config"). + t_install_bt_backend_node(_Config) -> install_rvi_node("bt_backend", env(), [root(), "/priv/test_config/bt_backend.config"]). @@ -250,6 +273,28 @@ t_start_tls_sample(_Config) -> await_started("tls_sample"), ok. +t_start_tlsj_backend(_Config) -> + cmd([env(), + " ./tlsj_backend/rvi.sh" + " -s tlsj_backend" + " -l ./tlsj_backend/rvi/log" + " -d ./tlsj_backend" + " -c ./tlsj_backend/priv/test_config/tlsj_backend.config" + " start"]), + await_started("tlsj_backend"), + ok. + +t_start_tlsj_sample(_Config) -> + cmd([env(), + " ./tlsj_sample/rvi.sh" + " -s tlsj_sample" + " -l ./tlsj_sample/rvi/log" + " -d ./tlsj_sample" + " -c ./tlsj_sample/priv/test_config/tlsj_sample.config" + " start"]), + await_started("tlsj_sample"), + ok. + t_register_lock_service(_Config) -> Pid = spawn_cmd( |