This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
lynxis lazus gerrit-no-reply at lists.osmocom.orglynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22207 )
Change subject: remove unused NS_CodecPort.ttcn/NS_CodecPort_CtrlFunct
......................................................................
remove unused NS_CodecPort.ttcn/NS_CodecPort_CtrlFunct
Change-Id: If885353ec8947309fc7d3ad780448cfc7402e1a4
---
M bts/gen_links.sh
M fr-net/gen_links.sh
M fr-net/regen_makefile.sh
M fr/gen_links.sh
M fr/regen_makefile.sh
M gbproxy/gen_links.sh
M gbproxy/regen_makefile.sh
D library/NS_CodecPort.ttcn
D library/NS_CodecPort_CtrlFunct.ttcn
D library/NS_CodecPort_CtrlFunctDef.cc
10 files changed, 6 insertions(+), 168 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/bts/gen_links.sh b/bts/gen_links.sh
index 7aa8398..cd8e379 100755
--- a/bts/gen_links.sh
+++ b/bts/gen_links.sh
@@ -34,7 +34,6 @@
DIR=../library
FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_VTY_Functions.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn "
-#FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "
#FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn "
FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn RSL_Types.ttcn RSL_Emulation.ttcn AbisOML_Types.ttcn "
FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn "
diff --git a/fr-net/gen_links.sh b/fr-net/gen_links.sh
index 4ab3ed0..29f4399 100755
--- a/fr-net/gen_links.sh
+++ b/fr-net/gen_links.sh
@@ -47,7 +47,7 @@
DIR=../library
FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn Osmocom_Types.ttcn "
-FILES+="NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "
+FILES+="NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp "
FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn "
FILES+="LLC_Templates.ttcn "
gen_links $DIR $FILES
diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh
index 0a05f6c..6aaf577 100755
--- a/fr-net/regen_makefile.sh
+++ b/fr-net/regen_makefile.sh
@@ -3,7 +3,7 @@
FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc "
FILES+="AF_PACKET_PT.cc "
FILES+="Native_FunctionDefs.cc "
-FILES+="NS_CodecPort_CtrlFunctDef.cc LLC_EncDec.cc LLC_Types.cc TELNETasp_PT.cc "
+FILES+="LLC_EncDec.cc LLC_Types.cc TELNETasp_PT.cc "
export CPPFLAGS_TTCN3="-DNS_EMULATION_FR"
diff --git a/fr/gen_links.sh b/fr/gen_links.sh
index 4ab3ed0..29f4399 100755
--- a/fr/gen_links.sh
+++ b/fr/gen_links.sh
@@ -47,7 +47,7 @@
DIR=../library
FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn Osmocom_Types.ttcn "
-FILES+="NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "
+FILES+="NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp "
FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn "
FILES+="LLC_Templates.ttcn "
gen_links $DIR $FILES
diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh
index c38fed4..d17f51c 100755
--- a/fr/regen_makefile.sh
+++ b/fr/regen_makefile.sh
@@ -1,7 +1,7 @@
#!/bin/bash
FILES="*.ttcn *.ttcnpp IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc Native_FunctionDefs.cc "
-FILES+="BSSGP_EncDec.cc NS_CodecPort_CtrlFunctDef.cc LLC_EncDec.cc TELNETasp_PT.cc "
+FILES+="BSSGP_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc "
FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh "
export CPPFLAGS_TTCN3="-DNS_EMULATION_FR"
diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh
index a614191..d6bf22e 100755
--- a/gbproxy/gen_links.sh
+++ b/gbproxy/gen_links.sh
@@ -84,7 +84,7 @@
DIR=../library
FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc "
-FILES+="NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "
+FILES+="NS_Provider_IPL4.ttcn NS_Provider_FR.ttcn NS_Emulation.ttcnpp "
FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn "
FILES+="PCUIF_Types.ttcn "
FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn "
diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh
index 93ef712..e82649c 100755
--- a/gbproxy/regen_makefile.sh
+++ b/gbproxy/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc "
+FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc "
FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh "
export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DBSSGP_EM_L3 -DNS_EMULATION_FR"
diff --git a/library/NS_CodecPort.ttcn b/library/NS_CodecPort.ttcn
deleted file mode 100644
index 82ba55b..0000000
--- a/library/NS_CodecPort.ttcn
+++ /dev/null
@@ -1,61 +0,0 @@
-module NS_CodecPort {
-
- import from IPL4asp_PortType all;
- import from IPL4asp_Types all;
- import from NS_Types all;
-
- type record NS_RecvFrom {
- ConnectionId connId,
- HostName remName,
- PortNumber remPort,
- HostName locName,
- PortNumber locPort,
- PDU_NS msg
- }
-
- template NS_RecvFrom t_NS_RecvFrom(template PDU_NS pdu) := {
- connId := ?,
- remName := ?,
- remPort := ?,
- locName := ?,
- locPort := ?,
- msg := pdu
- };
-
- type record NS_Send {
- ConnectionId connId,
- PDU_NS msg
- }
-
- template NS_Send t_NS_Send(template ConnectionId connId, template PDU_NS msg) := {
- connId := connId,
- msg := msg
- }
-
- private function IPL4_to_NS_RecvFrom(in ASP_RecvFrom pin, out NS_RecvFrom pout) {
- pout.connId := pin.connId;
- pout.remName := pin.remName;
- pout.remPort := pin.remPort;
- pout.locName := pin.locName;
- pout.locPort := pin.locPort;
- pout.msg := dec_PDU_NS(pin.msg);
- } with { extension "prototype(fast)" };
-
- private function NS_to_IPL4_Send(in NS_Send pin, out ASP_Send pout) {
- pout.connId := pin.connId;
- pout.proto := { udp := {} };
- pout.msg := enc_PDU_NS(pin.msg);
- } with { extension "prototype(fast)" };
-
- type port NS_CODEC_PT message {
- out NS_Send;
- in NS_RecvFrom,
- ASP_ConnId_ReadyToRelease,
- ASP_Event;
- } with { extension "user IPL4asp_PT
- out(NS_Send -> ASP_Send: function(NS_to_IPL4_Send))
- in(ASP_RecvFrom -> NS_RecvFrom: function(IPL4_to_NS_RecvFrom);
- ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple;
- ASP_Event -> ASP_Event: simple)"
- }
-}
diff --git a/library/NS_CodecPort_CtrlFunct.ttcn b/library/NS_CodecPort_CtrlFunct.ttcn
deleted file mode 100644
index cc77dda..0000000
--- a/library/NS_CodecPort_CtrlFunct.ttcn
+++ /dev/null
@@ -1,44 +0,0 @@
-module NS_CodecPort_CtrlFunct {
-
- import from NS_CodecPort all;
- import from IPL4asp_Types all;
-
- external function f_IPL4_listen(
- inout NS_CODEC_PT portRef,
- in HostName locName,
- in PortNumber locPort,
- in ProtoTuple proto,
- in OptionList options := {}
- ) return Result;
-
- external function f_IPL4_connect(
- inout NS_CODEC_PT portRef,
- in HostName remName,
- in PortNumber remPort,
- in HostName locName,
- in PortNumber locPort,
- in ConnectionId connId,
- in ProtoTuple proto,
- in OptionList options := {}
- ) return Result;
-
- external function f_IPL4_close(
- inout NS_CODEC_PT portRef,
- in ConnectionId id,
- in ProtoTuple proto := { unspecified := {} }
- ) return Result;
-
- external function f_IPL4_setUserData(
- inout NS_CODEC_PT portRef,
- in ConnectionId id,
- in UserData userData
- ) return Result;
-
- external function f_IPL4_getUserData(
- inout NS_CODEC_PT portRef,
- in ConnectionId id,
- out UserData userData
- ) return Result;
-
-}
-
diff --git a/library/NS_CodecPort_CtrlFunctDef.cc b/library/NS_CodecPort_CtrlFunctDef.cc
deleted file mode 100644
index a6da7ac..0000000
--- a/library/NS_CodecPort_CtrlFunctDef.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "IPL4asp_PortType.hh"
-#include "NS_CodecPort.hh"
-#include "IPL4asp_PT.hh"
-
-namespace NS__CodecPort__CtrlFunct {
-
- IPL4asp__Types::Result f__IPL4__listen(
- NS__CodecPort::NS__CODEC__PT& portRef,
- const IPL4asp__Types::HostName& locName,
- const IPL4asp__Types::PortNumber& locPort,
- const IPL4asp__Types::ProtoTuple& proto,
- const IPL4asp__Types::OptionList& options)
- {
- return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options);
- }
-
- IPL4asp__Types::Result f__IPL4__connect(
- NS__CodecPort::NS__CODEC__PT& portRef,
- const IPL4asp__Types::HostName& remName,
- const IPL4asp__Types::PortNumber& remPort,
- const IPL4asp__Types::HostName& locName,
- const IPL4asp__Types::PortNumber& locPort,
- const IPL4asp__Types::ConnectionId& connId,
- const IPL4asp__Types::ProtoTuple& proto,
- const IPL4asp__Types::OptionList& options)
- {
- return f__IPL4__PROVIDER__connect(portRef, remName, remPort,
- locName, locPort, connId, proto, options);
- }
-
- IPL4asp__Types::Result f__IPL4__close(
- NS__CodecPort::NS__CODEC__PT& portRef,
- const IPL4asp__Types::ConnectionId& connId,
- const IPL4asp__Types::ProtoTuple& proto)
- {
- return f__IPL4__PROVIDER__close(portRef, connId, proto);
- }
-
- IPL4asp__Types::Result f__IPL4__setUserData(
- NS__CodecPort::NS__CODEC__PT& portRef,
- const IPL4asp__Types::ConnectionId& connId,
- const IPL4asp__Types::UserData& userData)
- {
- return f__IPL4__PROVIDER__setUserData(portRef, connId, userData);
- }
-
- IPL4asp__Types::Result f__IPL4__getUserData(
- NS__CodecPort::NS__CODEC__PT& portRef,
- const IPL4asp__Types::ConnectionId& connId,
- IPL4asp__Types::UserData& userData)
- {
- return f__IPL4__PROVIDER__getUserData(portRef, connId, userData);
- }
-
-}
-
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22207
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If885353ec8947309fc7d3ad780448cfc7402e1a4
Gerrit-Change-Number: 22207
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210117/fa84eb24/attachment.htm>