diff options
| author | Linus Nordberg <linus@sunet.se> | 2019-06-19 14:24:45 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@sunet.se> | 2019-06-19 14:24:45 +0200 |
| commit | c2c831cd525376ec4ae04fd46b94732962c7601b (patch) | |
| tree | a630f1f854e2f892f692bc2a3d0e39dba85ead30 | |
| parent | 0a4bada7c7a916bc333c3a4270fb1b9ed9ed4c4d (diff) | |
tidy up, add path to p11module
| -rw-r--r-- | p11p-daemon/src/p11p_config.erl | 26 | ||||
| -rw-r--r-- | p11p-daemon/src/p11p_defs.hrl | 3 |
2 files changed, 18 insertions, 11 deletions
diff --git a/p11p-daemon/src/p11p_config.erl b/p11p-daemon/src/p11p_config.erl index aa222e3..9732782 100644 --- a/p11p-daemon/src/p11p_config.erl +++ b/p11p-daemon/src/p11p_config.erl @@ -3,6 +3,7 @@ %% API -export([start_link/0]). +-export([config/0]). -export([tokens/0]). -export([modules_for_token/1]). @@ -28,7 +29,7 @@ config() -> tokens() -> gen_server:call(?MODULE, tokens). --spec modules_for_token(token()) -> [module()]. +-spec modules_for_token(token()) -> [p11module()]. modules_for_token(Token) -> gen_server:call(?MODULE, {modules_for_token, Token}). @@ -43,8 +44,8 @@ handle_call(config, _From, State) -> {reply, State, State}; handle_call(tokens, _From, #state{tokens = Tokens} = State) -> {reply, Tokens, State}; -handle_call({modules_for_token, Token}, _From, #state{tokens = Tokens} = State) -> - Reply = #p11module{name = "FIXME"}, +handle_call({modules_for_token, _Token}, _From, #state{tokens = _Tokens} = State) -> + Reply = #p11module{name="FIXME", path="FIXME"}, {reply, Reply, State}; handle_call(Request, _From, State) -> lager:warning("Unhandled call: ~p", [Request]), @@ -69,7 +70,7 @@ code_change(_OldVersion, State, _Extra) -> init_state() -> #state { - tokens = init_tokens(application:get_env(p11p, group, [])) + tokens = init_tokens(application:get_env(p11p, groups, [])) }. init_tokens(Tokens) -> @@ -82,9 +83,10 @@ new_token({Name, Settings}) -> modules = [new_module(M) || M <- proplists:get_value(modules, Settings, [])] }. -new_module(Name) -> +new_module({Name, Path}) -> #p11module{ - name = Name + name = Name, + path = Path }. %%%%%%%%%%%%%% @@ -97,14 +99,18 @@ tokens_test_() -> fun() -> init_tokens( [ {"vtoken0", - [{modules, ["token_0_0", "token_0_1"]}]}, + [{modules, [{"bogusmod0_0", "/path/to/bogusmod0_0"}, + {"bogusmod0_1", "/path/to/bogusmod0_1"} + ]}]}, {"vtoken1", - [{modules, ["token_1_0"]}]} + [{modules, [{"bogusmod1_0", "/path/to/bogusmod1_0"}]}]} ]) end, fun(_) -> ok end, fun(Conf) -> [?_assertEqual( [ - {token,"vtoken0",[{module,"token_0_0"},{module,"token_0_1"}]}, - {token,"vtoken1",[{module,"token_1_0"}]}], + {token,"vtoken0",[{p11module,"bogusmod0_0", "/path/to/bogusmod0_0"}, + {p11module,"bogusmod0_1", "/path/to/bogusmod0_1"}]}, + {token,"vtoken1",[{p11module,"bogusmod1_0", "/path/to/bogusmod1_0"}]} + ], Conf)] end}. diff --git a/p11p-daemon/src/p11p_defs.hrl b/p11p-daemon/src/p11p_defs.hrl index bd390a7..0efa6be 100644 --- a/p11p-daemon/src/p11p_defs.hrl +++ b/p11p-daemon/src/p11p_defs.hrl @@ -1,5 +1,6 @@ -record(p11module, { - name :: string() + name :: string(), + path :: string() % FIXME: use some path type? }). -record(token, { |