Rename s/epdg_diameter_swx/aaa_diameter_swx

The Swx interface is part of the internal AAA server node implemented in
osmo-epdg. Hence, change the prefix of the module/file name so that it
becomes clear it's part of the AAA and keep it separated from ePDG node
code.

Change-Id: Ie6a056bb8616fcda262f285241d38ba26e47f184

TODO.md

@@ -4,7 +4,7 @@
 - async calls (e.g. terminate subscription)
 - improve and understand the supervisor
  - when the gsup_server dies, it should only restart the gsup_server
- - same for epdg_diameter_swx
+ - same for aaa_diameter_swx
 
 - linting for erlang?
 

src/aaa_diameter_swx.erl

@@ -35,7 +35,7 @@
 % that of the covered work.
 
 
--module(epdg_diameter_swx).
+-module(aaa_diameter_swx).
 -author('Alexander Couzens <lynxis@fe80.eu>').
 
 -behaviour(gen_server).
@@ -57,7 +57,7 @@
 -define(SERVER, ?MODULE).
 -define(SVC_NAME, ?MODULE).
 -define(APP_ALIAS, ?MODULE).
--define(CALLBACK_MOD, epdg_diameter_swx_cb).
+-define(CALLBACK_MOD, aaa_diameter_swx_cb).
 -define(DIAMETER_DICT_SWX, diameter_3gpp_ts29_273_swx).
 -define(ENV_APP_NAME, osmo_epdg).
 -define(ENV_DEFAULT_SESSION_ID, "epdg@localdomain").

src/aaa_diameter_swx_cb.erl

@@ -1,7 +1,7 @@
 %%
 %% The diameter application callback module configured by client.erl.
 %%
--module(epdg_diameter_swx_cb).
+-module(aaa_diameter_swx_cb).
 
 -include_lib("diameter/include/diameter.hrl").
 -include_lib("diameter_3gpp_ts29_273_swx.hrl").

src/auth_handler.erl

@@ -33,7 +33,7 @@ handle_call({epdg_auth_req, Imsi}, From, State) ->
 	% request the diameter code for a tuple
 	CKey = [],
 	IntegrityKey = [],
-	Result = epdg_diameter_swx:multimedia_auth_request(Imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey),
+	Result = aaa_diameter_swx:multimedia_auth_request(Imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey),
 	case Result of
 		{ok, Mar} -> {reply, {ok, Mar}, State};
 		{error, Err} -> {reply, {error, Err}, State};

src/epdg_ue_fsm.erl

@@ -143,7 +143,7 @@ state_new({call, From}, purge_ms_request, Data) ->
 
 state_authenticated({call, From}, lu_request, Data) ->
         lager:info("ue_fsm state_authenticated event=lu_request, ~p~n", [Data]),
-        Result = epdg_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, "internet"),
+        Result = aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, "internet"),
         gsup_server:lu_response(Data#ue_fsm_data.imsi, Result),
         case Result of
                 {ok, _} ->

src/osmo_epdg_sup.erl

@@ -23,16 +23,16 @@ init([]) ->
 	GtpcLocalPort = application:get_env(?ENV_APP_NAME, gtpc_local_port, ?ENV_DEFAULT_GTPC_LOCAL_PORT),
 	GtpcRemoteIp = application:get_env(?ENV_APP_NAME, gtpc_remote_ip, ?ENV_DEFAULT_GTPC_REMOTE_IP),
 	GtpcRemotePort = application:get_env(?ENV_APP_NAME, gtpc_remote_port, ?ENV_DEFAULT_GTPC_REMOTE_PORT),
-	DiaServer = {epdg_diameter_swx, {epdg_diameter_swx,start_link,[]},
-		     permanent,
-		     5000,
-		     worker,
-		     [epdg_diameter_swx_cb]},
-	DiaS6bServer = {aaa_diameter_s6b, {aaa_diameter_s6b,start_link,[]},
-			permanent,
-			5000,
-			worker,
-			[aaa_diameter_s6b_cb]},
+	AAADiaSWxServer = {aaa_diameter_swx, {aaa_diameter_swx,start_link,[]},
+			   permanent,
+			   5000,
+			   worker,
+			   [aaa_diameter_swx_cb]},
+	AAADiaS6bServer = {aaa_diameter_s6b, {aaa_diameter_s6b,start_link,[]},
+			   permanent,
+			   5000,
+			   worker,
+			   [aaa_diameter_s6b_cb]},
 	GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, []]},
 		      permanent,
 		      5000,
@@ -48,4 +48,4 @@ init([]) ->
 		       5000,
 		       worker,
 		       [auth_handler]},
-	{ok, { {one_for_all, 5, 10}, [DiaServer, DiaS6bServer, GtpcServer, GsupServer, AuthHandler]} }.
+	{ok, { {one_for_all, 5, 10}, [AAADiaSWxServer, AAADiaS6bServer, GtpcServer, GsupServer, AuthHandler]} }.