From fde0fd989d337c0d9b623f96842540998ecda035 Mon Sep 17 00:00:00 2001
From: Andrey Velikiy <agreat22@gmail.com>
Date: Fri, 2 Aug 2019 09:42:22 +0300
Subject: [PATCH] Change xx_forward_xxx to xx_forward_sm_xxx

---
 include/gsup_protocol.hrl        | 24 ++++++++++++------------
 src/osmo_gsup.app.src            |  2 +-
 test/gsup_encode_decode_test.erl | 10 +++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/gsup_protocol.hrl b/include/gsup_protocol.hrl
index d6f0235..de3158e 100644
--- a/include/gsup_protocol.hrl
+++ b/include/gsup_protocol.hrl
@@ -29,12 +29,12 @@
                   | ss_req
                   | ss_err
                   | ss_res
-                  | mo_forward_req
-                  | mo_forward_err
-                  | mo_forward_res
-                  | mt_forward_req
-                  | mt_forward_err
-                  | mt_forward_res
+                  | mo_forward_sm_req
+                  | mo_forward_sm_err
+                  | mo_forward_sm_res
+                  | mt_forward_sm_req
+                  | mt_forward_sm_err
+                  | mt_forward_sm_res
                   | ready_for_sm_req
                   | ready_for_sm_err
                   | ready_for_sm_res
@@ -181,12 +181,12 @@
   16#20 => #{message_type => ss_req, mandatory => [session_id, session_state], optional => [ss_info]},
   16#21 => #{message_type => ss_err, mandatory => [session_id, session_state, cause]},
   16#22 => #{message_type => ss_res, mandatory => [session_id, session_state], optional => [ss_info]},
-  16#24 => #{message_type => mo_forward_req, mandatory => [sm_rp_mr, sm_rp_da, sm_rp_oa, sm_rp_ui]},
-  16#25 => #{message_type => mo_forward_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]},
-  16#26 => #{message_type => mo_forward_res, mandatory => [sm_rp_mr], optional => [sm_rp_ui]},
-  16#28 => #{message_type => mt_forward_req, mandatory => [sm_rp_mr, sm_rp_da, sm_rp_oa, sm_rp_ui], optional => [sm_rp_mms]},
-  16#29 => #{message_type => mt_forward_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]},
-  16#2a => #{message_type => mt_forward_res, mandatory => [sm_rp_mr], optional => [sm_rp_ui]},
+  16#24 => #{message_type => mo_forward_sm_req, mandatory => [sm_rp_mr, sm_rp_da, sm_rp_oa, sm_rp_ui]},
+  16#25 => #{message_type => mo_forward_sm_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]},
+  16#26 => #{message_type => mo_forward_sm_res, mandatory => [sm_rp_mr], optional => [sm_rp_ui]},
+  16#28 => #{message_type => mt_forward_sm_req, mandatory => [sm_rp_mr, sm_rp_da, sm_rp_oa, sm_rp_ui], optional => [sm_rp_mms]},
+  16#29 => #{message_type => mt_forward_sm_err, mandatory => [sm_rp_mr, sm_rp_cause], optional => [sm_rp_ui]},
+  16#2a => #{message_type => mt_forward_sm_res, mandatory => [sm_rp_mr], optional => [sm_rp_ui]},
   16#2c => #{message_type => ready_for_sm_req, mandatory => [sm_alert_reason]},
   16#2d => #{message_type => ready_for_sm_err, mandatory => [sm_rp_cause], optional => [sm_rp_ui]},
   16#2e => #{message_type => ready_for_sm_res, mandatory => []},
diff --git a/src/osmo_gsup.app.src b/src/osmo_gsup.app.src
index e93b1e3..3eec33d 100644
--- a/src/osmo_gsup.app.src
+++ b/src/osmo_gsup.app.src
@@ -1,6 +1,6 @@
 {application, osmo_gsup, [
   {description, "OSMOCOM GSUP library"},
-  {vsn, "0.2.0"},
+  {vsn, "0.2.1"},
   {registered, []},
   {applications, [
     kernel,
diff --git a/test/gsup_encode_decode_test.erl b/test/gsup_encode_decode_test.erl
index 9fcba6c..77bf017 100644
--- a/test/gsup_encode_decode_test.erl
+++ b/test/gsup_encode_decode_test.erl
@@ -19,7 +19,7 @@
 
 missing_params_test() ->
   ?assertError({mandatory_ie_missing,location_cancellation_err,[cause]}, gsup_protocol:decode(<<16#1d, ?TEST_IMSI_IE>>)),
-  ?assertError({mandatory_ie_missing,mo_forward_req,[sm_rp_mr,sm_rp_da,sm_rp_oa,sm_rp_ui]}, gsup_protocol:encode(#{message_type => mo_forward_req, imsi => <<"123456">>})).
+  ?assertError({mandatory_ie_missing,mo_forward_sm_req,[sm_rp_mr,sm_rp_da,sm_rp_oa,sm_rp_ui]}, gsup_protocol:encode(#{message_type => mo_forward_sm_req, imsi => <<"123456">>})).
 
 excess_params_test() ->
   ?assertError({ie_not_expected,location_upd_err,[pdp_info_complete]}, gsup_protocol:encode(#{message_type => location_upd_err,imsi => <<"1234">>,cause => 1,pdp_info_complete => <<>>})).
@@ -309,7 +309,7 @@ mo_forward_sm_req_test() ->
       16#de, 16#ad, 16#be, 16#ef
   >>,
   Map = #{imsi => <<"123456789012345">>,
-                   message_type => mo_forward_req,
+                   message_type => mo_forward_sm_req,
                    sm_rp_da => <<3,145,82,117,71,153,9,130>>,
                    sm_rp_mr => 250,sm_rp_oa => <<16#ff>>,sm_rp_ui => <<16#de, 16#ad, 16#be, 16#ef>>},
   ?assertEqual(Map, gsup_protocol:decode(Bin)),
@@ -331,7 +331,7 @@ mt_forward_sm_req_test() ->
       16#01
   >>,
   Map = #{imsi => <<"123456789012345">>,
-                   message_type => mt_forward_req,
+                   message_type => mt_forward_sm_req,
                    sm_rp_da => <<1,33,67,101,135,9,33,67,245>>,
                    sm_rp_mms => 1,sm_rp_mr => 250,
                    sm_rp_oa => <<3,145,82,117,71,153,9,130>>,
@@ -347,7 +347,7 @@ mo_forward_sm_err_test() ->
       16#af
   >>,
   Map = #{imsi => <<"123456789012345">>,
-                   message_type => mo_forward_err,sm_rp_cause => 175,
+                   message_type => mo_forward_sm_err,sm_rp_cause => 175,
                    sm_rp_mr => 250},
   ?assertEqual(Map, gsup_protocol:decode(Bin)),
   ?assertEqual(Bin, gsup_protocol:encode(Map)).
@@ -360,7 +360,7 @@ mt_forward_sm_res_test() ->
       16#de, 16#ad, 16#be, 16#ef
   >>,
   Map = #{imsi => <<"123456789012345">>,
-                   message_type => mt_forward_res,sm_rp_mr => 250,
+                   message_type => mt_forward_sm_res,sm_rp_mr => 250,
                    sm_rp_ui => <<16#de, 16#ad, 16#be, 16#ef>>},
   ?assertEqual(Map, gsup_protocol:decode(Bin)),
   ?assertEqual(Bin, gsup_protocol:encode(Map)).