Merge branch 'master' of git.osmocom.org:erlang/osmo_ss7
diff --git a/src/m3ua_example.erl b/src/m3ua_example.erl
new file mode 100644
index 0000000..2bce515
--- /dev/null
+++ b/src/m3ua_example.erl
@@ -0,0 +1,68 @@
+-module(m3ua_example).
+
+-include("osmo_util.hrl").
+-include("m3ua.hrl").
+-include("sccp.hrl").
+
+-export([init/0]).
+
+-record(loop_dat, {
+ scrc_pid,
+ m3ua_pid
+ }).
+
+init() ->
+ % start the M3UA link to the SG
+ Opts = [{user_pid, self()}, {sctp_remote_ip, {192,168,104,2}}, {sctp_remote_port, 2905},
+ {sctp_local_port, 60180}, {user_fun, fun m3ua_tx_to_user/2}, {user_args, self()}],
+ {ok, M3uaPid} = m3ua_core:start_link(Opts),
+ % instantiate SCCP routing instance
+ {ok, ScrcPid} = sccp_scrc:start_link([{mtp_tx_action, {callback_fn, fun scrc_tx_to_mtp/2, M3uaPid}}]),
+ loop(#loop_dat{m3ua_pid = M3uaPid, scrc_pid = ScrcPid}).
+
+loop(L) ->
+ io:format("Example: Entering main loop~n"),
+ receive
+ {m3ua_prim, Prim} ->
+ io:format("Example: Rx M3UA Prim ~p~n", [Prim]),
+ rx_m3ua_prim(Prim, L);
+ Stop ->
+ io:format("Example: Received ~p~n", [Stop]),
+ exit(stop_received)
+ end,
+ loop(L).
+
+
+scrc_tx_to_mtp(Prim, Args) ->
+ M3uaPid = Args,
+ gen_fsm:send_event(M3uaPid, Prim).
+
+m3ua_tx_to_user(Prim, Args) ->
+ UserPid = Args,
+ UserPid ! {m3ua_prim, Prim}.
+
+
+rx_m3ua_prim(#primitive{subsystem = 'M', gen_name = 'SCTP_ESTABLISH', spec_name = confirm}, L) ->
+ gen_fsm:send_event(L#loop_dat.m3ua_pid, osmo_util:make_prim('M','ASP_UP',request));
+
+rx_m3ua_prim(#primitive{subsystem = 'M', gen_name = 'ASP_UP', spec_name = confirm}, L) ->
+ gen_fsm:send_event(L#loop_dat.m3ua_pid, osmo_util:make_prim('M','ASP_ACTIVE',request));
+
+rx_m3ua_prim(#primitive{subsystem = 'M', gen_name = 'ASP_ACTIVE', spec_name = confirm}, L) ->
+ io:format("Example: M3UA now active and ready~n"),
+ tx_sccp_udt(L#loop_dat.scrc_pid);
+
+rx_m3ua_prim(P, _L) ->
+ io:format("Example: Ignoring M3UA prim ~p~n", [P]),
+ ok.
+
+
+tx_sccp_udt(ScrcPid) ->
+ CallingP = #sccp_addr{ssn = ?SCCP_SSN_MSC, point_code = osmo_util:pointcode2int(itu, {1,2,2})},
+ CalledP = #sccp_addr{ssn = ?SCCP_SSN_HLR, point_code = osmo_util:pointcode2int(itu, {1,1,1})},
+ Data = <<1,2,3,4>>,
+ Opts = [{protocol_class, 0}, {called_party_addr, CalledP},
+ {calling_party_addr, CallingP}, {user_data, Data}],
+ io:format("Example: Sending N-UNITDATA.req to SCRC~n"),
+ gen_fsm:send_event(ScrcPid, osmo_util:make_prim('N','UNITDATA',request,Opts)).
+
diff --git a/src/osmo_ss7_gtt.erl b/src/osmo_ss7_gtt.erl
index 75d4f7d..a3e9785 100644
--- a/src/osmo_ss7_gtt.erl
+++ b/src/osmo_ss7_gtt.erl
@@ -34,7 +34,8 @@
global_title_match([{Match, Action}|Tail], Gt) when is_record(Gt, global_title) ->
PhoneNumInt = osmo_util:digit_list2int(Gt#global_title.phone_number),
if Match#gtt_match.gt_range_from >= PhoneNumInt ->
- % in an ordered list, we can assume that no trailing rules will match
+ % in an ordered list, we can assume that no trailing rules will
+ % match
false;
true ->
case single_gt_match(Match, Gt) of
@@ -46,11 +47,13 @@
end
end;
% Same as above, but for SCCP Address (i.e. GT + point code and SSN)
-global_title_match([{Match, Action}|Tail], SccpAddr) when is_record(SccpAddr, sccp_addr) ->
+global_title_match([{Match, Action}|Tail], SccpAddr) when
+ is_record(SccpAddr, sccp_addr) ->
Gt = SccpAddr#sccp_addr.global_title,
PhoneNumInt = osmo_util:digit_list2int(Gt#global_title.phone_number),
if Match#gtt_match.gt_range_from >= PhoneNumInt ->
- % in an ordered list, we can assume that no trailing rules will match
+ % in an ordered list, we can assume that no trailing rules will
+ % match
false;
true ->
case single_gt_match(Match, SccpAddr) of
@@ -64,16 +67,22 @@
% perform matching of a given global title against a single match
-single_gt_match(Match, Gt) when is_record(Match, gtt_match), is_record(Gt, global_title) ->
+single_gt_match(Match, Gt) when is_record(Match, gtt_match),
+ is_record(Gt, global_title) ->
#gtt_match{gt_range_from = RangeFrom, gt_range_to = RangeTo,
- numbering_plan = NumPlan, nature_of_addr_ind = NatureInd} = Match,
+ numbering_plan = NumPlan,
+ nature_of_addr_ind = NatureInd} = Match,
+ #global_title{phone_number = GtPhoneNum,
+ numbering_plan = GtNumPlan,
+ nature_of_addr_ind = GtNature} = Gt,
% build a list of the individual criteria that all have to match
- SubMatchList = [{digits, {RangeFrom, RangeTo}, Gt#global_title.phone_number},
- {numbering_plan, NumPlan, Gt#global_title.numbering_plan},
- {nature_of_addr_ind, NatureInd, Gt#global_title.nature_of_addr_ind}],
+ SubMatchList = [{digits, {RangeFrom, RangeTo}, GtPhoneNum},
+ {numbering_plan, NumPlan, GtNumPlan},
+ {nature_of_addr_ind, NatureInd, GtNature}],
gt_sub_match_list(SubMatchList);
% Same as above, but for SCCP Address (i.e. GT + point code and SSN)
-single_gt_match(Match, SccpAddr) when is_record(Match, gtt_match), is_record(SccpAddr, sccp_addr) ->
+single_gt_match(Match, SccpAddr) when is_record(Match, gtt_match),
+ is_record(SccpAddr, sccp_addr) ->
#gtt_match{dpc = Dpc, ssn = Ssn} = Match,
Gt = SccpAddr#sccp_addr.global_title,
% First match the GT part
@@ -117,7 +126,8 @@
% Execute a single action: Replac some digits in the GT
-gtt_action(Gt, Action) when is_record(Gt, global_title), is_record(Action, gtt_act_repl_digits) ->
+gtt_action(Gt, Action) when is_record(Gt, global_title),
+ is_record(Action, gtt_act_repl_digits) ->
#gtt_act_repl_digits{replace_digit_start = ReplDigStart,
replace_digit_end = ReplDigEnd,
new_digits = NewDigits} = Action,
@@ -127,11 +137,13 @@
Gt#global_title{phone_number = Header ++ NewDigits ++ Trailer};
% Execute a single action: Replac the numbering plan in the GT
-gtt_action(Gt, #gtt_act_repl_num_plan{numbering_plan = NewNumPlan}) when is_record(Gt, global_title) ->
+gtt_action(Gt, #gtt_act_repl_num_plan{numbering_plan = NewNumPlan})
+ when is_record(Gt, global_title) ->
Gt#global_title{numbering_plan = NewNumPlan};
% Execute a single 'generic purpose' action that will call apply/2
-gtt_action(Gt, #gtt_act_apply{funct = Funct, args = Args}) when is_record(Gt, global_title) ->
+gtt_action(Gt, #gtt_act_apply{funct = Funct, args = Args}) when
+ is_record(Gt, global_title) ->
apply(Funct, Args).
@@ -145,7 +157,8 @@
gtt_action(Gt, Action).
% Execute a complete GTT operation: matching + executing the action
-execute_gtt(Gt, RulesList) when is_record(Gt, global_title), is_list(RulesList) ->
+execute_gtt(Gt, RulesList) when is_record(Gt, global_title),
+ is_list(RulesList) ->
case global_title_match(RulesList, Gt) of
false ->
Gt;
@@ -153,7 +166,8 @@
apply_gtt_actions(Gt, Action)
end;
% Same as above, but for SCCP Address (i.e. GT + point code and SSN)
-execute_gtt(SccpAddr, RulesList) when is_record(SccpAddr, sccp_addr), is_list(RulesList) ->
+execute_gtt(SccpAddr, RulesList) when is_record(SccpAddr, sccp_addr),
+ is_list(RulesList) ->
Gt = SccpAddr#sccp_addr.global_title,
NewGt = execute_gtt(Gt, RulesList),
SccpAddr#sccp_addr{global_title = NewGt}.