fix various bugs in sccp_user / sccp_erl occuring during first test
This commit is contained in:
parent
c1ccf1d1cd
commit
f8b852c2e0
|
@ -30,7 +30,7 @@
|
||||||
% client functions, may internally talk to our sccp_user server
|
% client functions, may internally talk to our sccp_user server
|
||||||
-export([register_linkset/3, unregister_linkset/1]).
|
-export([register_linkset/3, unregister_linkset/1]).
|
||||||
-export([register_link/3, unregister_link/2, set_link_state/3]).
|
-export([register_link/3, unregister_link/2, set_link_state/3]).
|
||||||
-export([get_pid_for_link/3]).
|
-export([get_pid_for_link/2]).
|
||||||
|
|
||||||
-record(slink, {
|
-record(slink, {
|
||||||
key, % {linkset_name, sls}
|
key, % {linkset_name, sls}
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
% initialization code
|
% initialization code
|
||||||
|
|
||||||
start_link() ->
|
start_link() ->
|
||||||
gen_server:start_link({local, ?MODULE}, ?MODULE, []).
|
gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
|
||||||
|
|
||||||
init(_Arg) ->
|
init(_Arg) ->
|
||||||
LinksetTbl = ets:new(sccp_linksets, [ordered_set,
|
LinksetTbl = ets:new(sccp_linksets, [ordered_set,
|
||||||
|
@ -69,7 +69,7 @@ init(_Arg) ->
|
||||||
% within client/caller process
|
% within client/caller process
|
||||||
LinkTbl = ets:new(sccp_link_table, [ordered_set, named_table,
|
LinkTbl = ets:new(sccp_link_table, [ordered_set, named_table,
|
||||||
{keypos, #slink.key}]),
|
{keypos, #slink.key}]),
|
||||||
#su_state{linkset_tbl = LinksetTbl, link_tbl = LinkTbl}.
|
{ok, #su_state{linkset_tbl = LinksetTbl, link_tbl = LinkTbl}}.
|
||||||
|
|
||||||
% client side API
|
% client side API
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ set_link_state(LinksetName, Sls, State) ->
|
||||||
% the lookup functions can directly use the ets named_table from within
|
% the lookup functions can directly use the ets named_table from within
|
||||||
% the client process, no need to go through a synchronous IPC
|
% the client process, no need to go through a synchronous IPC
|
||||||
|
|
||||||
get_pid_for_link(LinkTable, LinksetName, Sls) ->
|
get_pid_for_link(LinksetName, Sls) ->
|
||||||
case ets:lookup(sccp_link_table, {LinksetName, Sls}) of
|
case ets:lookup(sccp_link_table, {LinksetName, Sls}) of
|
||||||
[#slink{user_pid = Pid}] ->
|
[#slink{user_pid = Pid}] ->
|
||||||
% FIXME: check the link state
|
% FIXME: check the link state
|
||||||
|
@ -105,10 +105,11 @@ get_pid_for_link(LinkTable, LinksetName, Sls) ->
|
||||||
|
|
||||||
% server side code
|
% server side code
|
||||||
|
|
||||||
handle_call({register_linkset, {LocalPc, RemotePc, Name}}, From, S) ->
|
handle_call({register_linkset, {LocalPc, RemotePc, Name}},
|
||||||
|
{FromPid, _FromRef}, S) ->
|
||||||
#su_state{linkset_tbl = Tbl} = S,
|
#su_state{linkset_tbl = Tbl} = S,
|
||||||
Ls = #slinkset{local_pc = LocalPc, remote_pc = RemotePc,
|
Ls = #slinkset{local_pc = LocalPc, remote_pc = RemotePc,
|
||||||
name = Name, user_pid = From},
|
name = Name, user_pid = FromPid},
|
||||||
case ets:insert_new(Tbl, Ls) of
|
case ets:insert_new(Tbl, Ls) of
|
||||||
false ->
|
false ->
|
||||||
{reply, {error, ets_insert}, S};
|
{reply, {error, ets_insert}, S};
|
||||||
|
@ -119,18 +120,19 @@ handle_call({register_linkset, {LocalPc, RemotePc, Name}}, From, S) ->
|
||||||
{reply, ok, S}
|
{reply, ok, S}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
handle_call({unregister_linkset, {Name}}, From, S) ->
|
handle_call({unregister_linkset, {Name}}, {FromPid, _FromRef}, S) ->
|
||||||
#su_state{linkset_tbl = Tbl} = S,
|
#su_state{linkset_tbl = Tbl} = S,
|
||||||
ets:delete(Tbl, Name),
|
ets:delete(Tbl, Name),
|
||||||
{reply, ok, S};
|
{reply, ok, S};
|
||||||
|
|
||||||
handle_call({register_link, {LsName, Sls, Name}}, From, S) ->
|
handle_call({register_link, {LsName, Sls, Name}},
|
||||||
|
{FromPid, _FromRef}, S) ->
|
||||||
#su_state{linkset_tbl = LinksetTbl, link_tbl = LinkTbl} = S,
|
#su_state{linkset_tbl = LinksetTbl, link_tbl = LinkTbl} = S,
|
||||||
% check if linkset actually exists
|
% check if linkset actually exists
|
||||||
case ets:loookup(LinksetTbl, LsName) of
|
case ets:lookup(LinksetTbl, LsName) of
|
||||||
[#slinkset{}] ->
|
[#slinkset{}] ->
|
||||||
Link = #slink{name = Name, sls = Sls,
|
Link = #slink{name = Name, sls = Sls,
|
||||||
user_pid = From, key = {LsName, Sls}},
|
user_pid = FromPid, key = {LsName, Sls}},
|
||||||
case ets:insert_new(LinkTbl, Link) of
|
case ets:insert_new(LinkTbl, Link) of
|
||||||
false ->
|
false ->
|
||||||
{reply, {error, link_exists}, S};
|
{reply, {error, link_exists}, S};
|
||||||
|
@ -144,13 +146,13 @@ handle_call({register_link, {LsName, Sls, Name}}, From, S) ->
|
||||||
{reply, {error, no_such_linkset}, S}
|
{reply, {error, no_such_linkset}, S}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
handle_call({unregister_link, {LsName, Sls}}, From, S) ->
|
handle_call({unregister_link, {LsName, Sls}}, {FromPid, _FromRef}, S) ->
|
||||||
#su_state{link_tbl = LinkTbl} = S,
|
#su_state{link_tbl = LinkTbl} = S,
|
||||||
ets:delete(LinkTbl, {LsName, Sls}),
|
ets:delete(LinkTbl, {LsName, Sls}),
|
||||||
{reply, ok, S};
|
{reply, ok, S};
|
||||||
|
|
||||||
handle_call({set_link_state, {LsName, Sls, State}}, From, S) ->
|
handle_call({set_link_state, {LsName, Sls, State}}, {FromPid, _}, S) ->
|
||||||
#su_state{linkset_tbl = LinksetTbl, link_tbl = LinkTbl} = S,
|
#su_state{link_tbl = LinkTbl} = S,
|
||||||
case ets:lookup(LinkTbl, {LsName, Sls}) of
|
case ets:lookup(LinkTbl, {LsName, Sls}) of
|
||||||
[] ->
|
[] ->
|
||||||
{reply, {error, no_such_link}, S};
|
{reply, {error, no_such_link}, S};
|
||||||
|
|
|
@ -46,12 +46,12 @@
|
||||||
% initialization code
|
% initialization code
|
||||||
|
|
||||||
start_link() ->
|
start_link() ->
|
||||||
gen_server:start_link({local, ?MODULE}, ?MODULE, []).
|
gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
|
||||||
|
|
||||||
init(_Arg) ->
|
init(_Arg) ->
|
||||||
UserTbl = ets:new(sccp_user_tbl, [ordered_set, named_table,
|
UserTbl = ets:new(sccp_user_tbl, [ordered_set, named_table,
|
||||||
{keypos, #scu_record.ssn_pc}]),
|
{keypos, #scu_record.ssn_pc}]),
|
||||||
#scu_state{user_table = UserTbl}.
|
{ok, #scu_state{user_table = UserTbl}}.
|
||||||
|
|
||||||
% client side code
|
% client side code
|
||||||
|
|
||||||
|
@ -83,9 +83,9 @@ local_ssn_avail(Ssn, Pc) ->
|
||||||
% server side code
|
% server side code
|
||||||
|
|
||||||
% bind a {SSN, PC} tuple to the pid of the caller
|
% bind a {SSN, PC} tuple to the pid of the caller
|
||||||
handle_call({bind_ssn, Ssn, Pc}, From, S) ->
|
handle_call({bind_ssn, Ssn, Pc}, {FromPid, _FromRef}, S) ->
|
||||||
#scu_state{user_table = Tbl} = S,
|
#scu_state{user_table = Tbl} = S,
|
||||||
NewRec = #scu_record{ssn_pc= {Ssn, Pc}, user_pid = From},
|
NewRec = #scu_record{ssn_pc= {Ssn, Pc}, user_pid = FromPid},
|
||||||
case ets:insert_new(Tbl, NewRec) of
|
case ets:insert_new(Tbl, NewRec) of
|
||||||
false ->
|
false ->
|
||||||
{reply, {error, ets_insert}, S};
|
{reply, {error, ets_insert}, S};
|
||||||
|
@ -94,9 +94,9 @@ handle_call({bind_ssn, Ssn, Pc}, From, S) ->
|
||||||
end;
|
end;
|
||||||
|
|
||||||
% unbind a {SSN, PC} tuple from the pid of the caller
|
% unbind a {SSN, PC} tuple from the pid of the caller
|
||||||
handle_call({unbind_ssn, Ssn, Pc}, From, S) ->
|
handle_call({unbind_ssn, Ssn, Pc}, {FromPid, _FromRef}, S) ->
|
||||||
#scu_state{user_table = Tbl} = S,
|
#scu_state{user_table = Tbl} = S,
|
||||||
DelRec = #scu_record{ssn_pc= {Ssn, Pc}, user_pid = From},
|
DelRec = #scu_record{ssn_pc= {Ssn, Pc}, user_pid = FromPid},
|
||||||
ets:delete_object(Tbl, DelRec),
|
ets:delete_object(Tbl, DelRec),
|
||||||
{reply, ok, S}.
|
{reply, ok, S}.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue