fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41623?usp=email )
Change subject: Rename sctp_proxy -> enb_proxy
......................................................................
Rename sctp_proxy -> enb_proxy
This module is no longer an abstract SCTP proxy, ever since we
started processing and/or patching S1AP PDUs via the s1ap_proxy.
Change-Id: I8beaea9aa98dfa1c2e6f1d1c823b033892bd00cb
Related: SYS#7052
---
R src/enb_proxy.erl
M src/enb_registry.erl
M src/osmo_s1gw_sup.erl
M src/rest_server.erl
4 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw
refs/changes/23/41623/1
diff --git a/src/sctp_proxy.erl b/src/enb_proxy.erl
similarity index 99%
rename from src/sctp_proxy.erl
rename to src/enb_proxy.erl
index 305d7d7..7a51221 100644
--- a/src/sctp_proxy.erl
+++ b/src/enb_proxy.erl
@@ -32,7 +32,7 @@
%% for the parts of the runtime libraries of Erlang/OTP used as well as
%% that of the covered work.
--module(sctp_proxy).
+-module(enb_proxy).
-behaviour(gen_statem).
-behaviour(sctp_client).
diff --git a/src/enb_registry.erl b/src/enb_registry.erl
index 80d264b..e40d9f5 100644
--- a/src/enb_registry.erl
+++ b/src/enb_registry.erl
@@ -64,7 +64,7 @@
| s1setup. %% S1 SETUP procedure completed
-type enb_event() :: {connecting, sctp_server:conn_info()}
- | {connected, sctp_proxy:conn_info()}
+ | {connected, enb_proxy:conn_info()}
| {s1setup, s1ap_utils:genb_id()}.
-type enb_filter() :: {genb_id_str, string()}
@@ -82,7 +82,7 @@
genb_id => s1ap_utils:genb_id(), %%
Global-eNB-ID
genb_id_str => string(), %%
Global-eNB-ID string
enb_conn_info => sctp_server:conn_info(), %% eNB ->
S1GW connection info
- mme_conn_info => sctp_proxy:conn_info() %% S1GW ->
MME connection info
+ mme_conn_info => enb_proxy:conn_info() %% S1GW ->
MME connection info
}.
-record(state, {enbs :: #{enb_handle() => enb_info()},
diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl
index bde7b54..980b8f3 100644
--- a/src/osmo_s1gw_sup.erl
+++ b/src/osmo_s1gw_sup.erl
@@ -139,7 +139,7 @@
#{laddr => maps:get(laddr, Cfg, ?ENV_DEFAULT_S1GW_BIND_ADDR),
lport => maps:get(lport, Cfg, ?ENV_DEFAULT_S1GW_BIND_PORT),
sockopts => sctp_common:gen_sockopts(SockOpts),
- handler => sctp_proxy,
+ handler => enb_proxy,
priv => client_cfg()}.
diff --git a/src/rest_server.erl b/src/rest_server.erl
index 6e1f892..9535939 100644
--- a/src/rest_server.erl
+++ b/src/rest_server.erl
@@ -120,7 +120,7 @@
case fetch_enb_info(ID) of
[EnbInfo | _] ->
Pid = maps:get(pid, EnbInfo),
- shutdown(sctp_proxy, Pid);
+ shutdown(enb_proxy, Pid);
[] ->
{404, [], undefined};
error ->
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41623?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I8beaea9aa98dfa1c2e6f1d1c823b033892bd00cb
Gerrit-Change-Number: 41623
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
