diff options
-rw-r--r-- | components/dlink_tcp/.gitignore (renamed from components/data_link_bert_rpc/.gitignore) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/LICENSE (renamed from components/data_link_bert_rpc/LICENSE) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/Makefile (renamed from components/data_link_bert_rpc/Makefile) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/README.md (renamed from components/data_link_bert_rpc/README.md) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/priv/setup.config (renamed from components/data_link_bert_rpc/priv/setup.config) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/connection.erl (renamed from components/data_link_bert_rpc/src/connection.erl) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/connection_manager.erl (renamed from components/data_link_bert_rpc/src/connection_manager.erl) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/data_link_bert_rpc.app.src (renamed from components/data_link_bert_rpc/src/data_link_bert_rpc.app.src) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/data_link_bert_rpc_app.erl (renamed from components/data_link_bert_rpc/src/data_link_bert_rpc_app.erl) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/data_link_bert_rpc_rpc.erl (renamed from components/data_link_bert_rpc/src/data_link_bert_rpc_rpc.erl) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/data_link_bert_rpc_sup.erl (renamed from components/data_link_bert_rpc/src/data_link_bert_rpc_sup.erl) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/gen_nb_server.erl (renamed from components/data_link_bert_rpc/src/gen_nb_server.erl) | 0 | ||||
-rw-r--r-- | components/dlink_tcp/src/listener.erl (renamed from components/data_link_bert_rpc/src/listener.erl) | 0 | ||||
-rw-r--r-- | components/proto_bert/src/proto_bert_rpc.erl | 22 |
14 files changed, 20 insertions, 2 deletions
diff --git a/components/data_link_bert_rpc/.gitignore b/components/dlink_tcp/.gitignore index cfb2329..cfb2329 100644 --- a/components/data_link_bert_rpc/.gitignore +++ b/components/dlink_tcp/.gitignore diff --git a/components/data_link_bert_rpc/LICENSE b/components/dlink_tcp/LICENSE index c33dcc7..c33dcc7 100644 --- a/components/data_link_bert_rpc/LICENSE +++ b/components/dlink_tcp/LICENSE diff --git a/components/data_link_bert_rpc/Makefile b/components/dlink_tcp/Makefile index f90b2ec..f90b2ec 100644 --- a/components/data_link_bert_rpc/Makefile +++ b/components/dlink_tcp/Makefile diff --git a/components/data_link_bert_rpc/README.md b/components/dlink_tcp/README.md index cc131c5..cc131c5 100644 --- a/components/data_link_bert_rpc/README.md +++ b/components/dlink_tcp/README.md diff --git a/components/data_link_bert_rpc/priv/setup.config b/components/dlink_tcp/priv/setup.config index 9fe04fc..9fe04fc 100644 --- a/components/data_link_bert_rpc/priv/setup.config +++ b/components/dlink_tcp/priv/setup.config diff --git a/components/data_link_bert_rpc/src/connection.erl b/components/dlink_tcp/src/connection.erl index a8b1ceb..a8b1ceb 100644 --- a/components/data_link_bert_rpc/src/connection.erl +++ b/components/dlink_tcp/src/connection.erl diff --git a/components/data_link_bert_rpc/src/connection_manager.erl b/components/dlink_tcp/src/connection_manager.erl index c12a3fd..c12a3fd 100644 --- a/components/data_link_bert_rpc/src/connection_manager.erl +++ b/components/dlink_tcp/src/connection_manager.erl diff --git a/components/data_link_bert_rpc/src/data_link_bert_rpc.app.src b/components/dlink_tcp/src/data_link_bert_rpc.app.src index d3adfcf..d3adfcf 100644 --- a/components/data_link_bert_rpc/src/data_link_bert_rpc.app.src +++ b/components/dlink_tcp/src/data_link_bert_rpc.app.src diff --git a/components/data_link_bert_rpc/src/data_link_bert_rpc_app.erl b/components/dlink_tcp/src/data_link_bert_rpc_app.erl index 087b040..087b040 100644 --- a/components/data_link_bert_rpc/src/data_link_bert_rpc_app.erl +++ b/components/dlink_tcp/src/data_link_bert_rpc_app.erl diff --git a/components/data_link_bert_rpc/src/data_link_bert_rpc_rpc.erl b/components/dlink_tcp/src/data_link_bert_rpc_rpc.erl index d8c11e7..d8c11e7 100644 --- a/components/data_link_bert_rpc/src/data_link_bert_rpc_rpc.erl +++ b/components/dlink_tcp/src/data_link_bert_rpc_rpc.erl diff --git a/components/data_link_bert_rpc/src/data_link_bert_rpc_sup.erl b/components/dlink_tcp/src/data_link_bert_rpc_sup.erl index a5bcae0..a5bcae0 100644 --- a/components/data_link_bert_rpc/src/data_link_bert_rpc_sup.erl +++ b/components/dlink_tcp/src/data_link_bert_rpc_sup.erl diff --git a/components/data_link_bert_rpc/src/gen_nb_server.erl b/components/dlink_tcp/src/gen_nb_server.erl index af72189..af72189 100644 --- a/components/data_link_bert_rpc/src/gen_nb_server.erl +++ b/components/dlink_tcp/src/gen_nb_server.erl diff --git a/components/data_link_bert_rpc/src/listener.erl b/components/dlink_tcp/src/listener.erl index eadec8b..eadec8b 100644 --- a/components/data_link_bert_rpc/src/listener.erl +++ b/components/dlink_tcp/src/listener.erl diff --git a/components/proto_bert/src/proto_bert_rpc.erl b/components/proto_bert/src/proto_bert_rpc.erl index b251cd3..805ba63 100644 --- a/components/proto_bert/src/proto_bert_rpc.erl +++ b/components/proto_bert/src/proto_bert_rpc.erl @@ -22,7 +22,7 @@ -define(SERVER, ?MODULE). -export([start_json_server/0]). --export([send_message/7, +-export([send_message/10, receive_message/2]). -record(st, { @@ -45,6 +45,9 @@ start_json_server() -> send_message(CompSpec, ServiceName, Timeout, + ProtoOpts, + DataLinkMod, + DataLinkOpts, NetworkAddress, Parameters, Signature, @@ -52,6 +55,9 @@ send_message(CompSpec, rvi_common:request(protocol, ?MODULE, send_message, [ { service, ServiceName }, { timeout, Timeout }, + { protocol_opts, ProtoOpts }, + { data_link_mod, DataLinkMod }, + { data_link_opts, DataLinkOpts }, { network_address, NetworkAddress }, { parameters, Parameters }, { signature, Signature }, @@ -69,6 +75,9 @@ receive_message(CompSpec, Data) -> handle_rpc("send_message", Args) -> {ok, ServiceName} = rvi_common:get_json_element(["service_name"], Args), {ok, Timeout} = rvi_common:get_json_element(["timeout"], Args), + {ok, ProtoOpts} = rvi_common:get_json_element(["protocol_opts"], Args), + {ok, DataLinkMod} = rvi_common:get_json_element(["data_link_mod"], Args), + {ok, DataLinkOpts} = rvi_common:get_json_element(["data_link_opts"], Args), {ok, NetworkAddress} = rvi_common:get_json_element(["network_address"], Args), {ok, Parameters} = rvi_common:get_json_element(["parameters"], Args), {ok, Signature} = rvi_common:get_json_element(["signature"], Args), @@ -76,6 +85,9 @@ handle_rpc("send_message", Args) -> [ ok ] = gen_server:call(?SERVER, { rvi, send_message, [ServiceName, Timeout, + ProtoOpts, + DataLinkMod, + DataLinkOpts, NetworkAddress, Parameters, Signature, @@ -103,12 +115,18 @@ handle_notification(Other, _Args) -> handle_call({rvi, send_message, [ServiceName, Timeout, + ProtoOpts, + DataLinkMod, + DataLinkOpts, NetworkAddress, Parameters, Signature, Certificate]}, _From, St) -> ?debug(" protocol:send(): service name: ~p~n", [ServiceName]), ?debug(" protocol:send(): timeout: ~p~n", [Timeout]), + ?debug(" protocol:send(): opts: ~p~n", [Opts]), + ?debug(" protocol:send(): data_link_mod: ~p~n", [DataLinkMod]), + ?debug(" protocol:send(): data_link_opts: ~p~n", [DataLinkOpts]), ?debug(" protocol:send(): network_address: ~p~n", [NetworkAddress]), %% ?debug(" protocol:send(): parameters: ~p~n", [Parameters]), ?debug(" protocol:send(): signature: ~p~n", [Signature]), @@ -118,7 +136,7 @@ handle_call({rvi, send_message, Data = term_to_binary({ ServiceName, Timeout, NetworkAddress, Parameters, Signature, Certificate }), - Res = data_link_bert_rpc_rpc:send_data(St#st.cs, NetworkAddress, Data), + Res = DataLinkMod:send_data(St#st.cs, NetworkAddress, DataLinkOpts, Data), { reply, Res, St }; |