September 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: library/s1ap: fix wrong IE ID in E-RABReleaseListBearerRelComp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38237?usp=email ) Change subject: library/s1ap: fix wrong IE ID in E-RABReleaseListBearerRelComp ...................................................................... library/s1ap: fix wrong IE ID in E-RABReleaseListBearerRelComp Change-Id: I22e80f418787c10ccd002e30a329c0271cdd1b8a Fixes: e59e681c "library/s1ap: add E-RAB RELEASE templates" --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/38237/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 4f0b5ee..dca5844 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1411,7 +1411,7 @@ template (value) E_RABReleaseListBearerRelComp ts_E_RABReleaseListBearerRelComp(template (value) E_RABReleaseItemBearerRelComp it) := { { - id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + id := S1AP_Constants.id_E_RABReleaseItemBearerRelComp, criticality := ignore, value_ := { E_RABReleaseItemBearerRelComp := it } } @@ -1419,7 +1419,7 @@ template (present) E_RABReleaseListBearerRelComp tr_E_RABReleaseListBearerRelComp(template (present) E_RABReleaseItemBearerRelComp it := ?) := { { - id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + id := S1AP_Constants.id_E_RABReleaseItemBearerRelComp, criticality := ignore, value_ := { E_RABReleaseItemBearerRelComp := it } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I22e80f418787c10ccd002e30a329c0271cdd1b8a Gerrit-Change-Number: 38237 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_release_ind

by fixeria

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38217?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: s1gw: add TC_e_rab_release_ind ...................................................................... s1gw: add TC_e_rab_release_ind Change-Id: Icc28a596b7646441761cc3f56653c5f7b3ddaaca --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 3 files changed, 95 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/38217/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38217?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc28a596b7646441761cc3f56653c5f7b3ddaaca Gerrit-Change-Number: 38217 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: TC_e_rab_setup: complete E-RAB release

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38238?usp=email ) Change subject: s1gw: TC_e_rab_setup: complete E-RAB release ...................................................................... s1gw: TC_e_rab_setup: complete E-RAB release The MME originated E-RAB RELEASE procedure includes both: * [ENB <- MME] E-RAB RELEASE COMMAND, and * [ENB -> MME] E-RAB RELEASE RESPONSE. The later was overlooked in a99224c9, so add it. Change-Id: I856248d825b6ecf0635590b7bf02593cfae893d3 Fixes: a99224c9 "s1gw: TC_e_rab_setup: also test E-RAB release" --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/38238/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index a3d2aec..4c88252 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -445,6 +445,40 @@ return pdu; } +function f_ConnHdlr_tx_erab_release_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABReleaseListBearerRelComp items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABReleaseItemBearerRelComp item; + + item := ts_E_RABReleaseItemBearerRelComp(erabs[i].erab_id); + items[i] := ts_E_RABReleaseListBearerRelComp(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseRsp(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_erab_release_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABReleaseListBearerRelComp items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABReleaseItemBearerRelComp item; + + item := tr_E_RABReleaseItemBearerRelComp(erabs[i].erab_id); + items[i] := tr_E_RABReleaseListBearerRelComp(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseRsp(mme_ue_id, enb_ue_id, items)); + return pdu; +} + function f_ConnHdlr_tx_erab_release_ind(in ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) @@ -663,6 +697,14 @@ f_ConnHdlr_rx_erab_release_cmd(erabs, cause); } +function f_ConnHdlr_erab_release_rsp(inout ERabList erabs) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: E-RAB RELEASE RESPONSE"); + f_ConnHdlr_tx_erab_release_rsp(erabs); + log("eNB -> [S1GW -> MME]: E-RAB RELEASE RESPONSE"); + f_ConnHdlr_rx_erab_release_rsp(erabs); +} + function f_ConnHdlr_erab_release_ind(inout ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 8a259d3..9713c1a 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -308,6 +308,7 @@ f_ConnHdlr_erab_setup_req(g_pars.erabs); f_ConnHdlr_erab_setup_rsp(g_pars.erabs); f_ConnHdlr_erab_release_cmd(g_pars.erabs); + f_ConnHdlr_erab_release_rsp(g_pars.erabs); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38238?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I856248d825b6ecf0635590b7bf02593cfae893d3 Gerrit-Change-Number: 38238 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: .gitignore: ignore ctags

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38234?usp=email ) Change subject: .gitignore: ignore ctags ...................................................................... .gitignore: ignore ctags Change-Id: I90f468049189d919aa0cbc3c1da1ac6f8422bc36 Related: 600ebb235 "Makefile: add target for generating tags" --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/38234/1 diff --git a/.gitignore b/.gitignore index 56f61af..241a1d2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ sms.db-shm sms.db-wal __pycache__ +tags -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38234?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90f468049189d919aa0cbc3c1da1ac6f8422bc36 Gerrit-Change-Number: 38234 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: .gitignore: ignore '.make.*' files (like .make.deps)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38233?usp=email ) Change subject: .gitignore: ignore '.make.*' files (like .make.deps) ...................................................................... .gitignore: ignore '.make.*' files (like .make.deps) Change-Id: I79dfa38bc874a48cb09a6e6fb3f06405ba869491 Related: c7e40d6a "Makefile: avoid fetching deps if not needed" --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/38233/1 diff --git a/.gitignore b/.gitignore index f03b0b3..56f61af 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ */*_Tests selftest/Selftest */Makefile +.make.* !bin/Makefile !deps/Makefile .*.sw? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38233?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79dfa38bc874a48cb09a6e6fb3f06405ba869491 Gerrit-Change-Number: 38233 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: Remove dead links and generated code in bin/*

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38235?usp=email ) Change subject: Remove dead links and generated code in bin/* ...................................................................... Remove dead links and generated code in bin/* Change-Id: I60929c5d4acba4d0d8df3696fade370d7e0100f8 --- D bin/General_Types.ttcn D bin/M3UA_Emulation.ttcn D bin/M3UA_Types.ttcn D bin/MTP3asp_PortType.ttcn D bin/MTP3asp_Types.ttcn D bin/Makefile D bin/SCCP_Emulation.ttcn D bin/SCCP_Mapping.ttcn D bin/SCCP_Mapping.ttcnpp D bin/SCCP_Testcases.cfg D bin/SCCP_Testcases.ttcn D bin/SCCP_Types.ttcn D bin/SCCPasp_Types.ttcn D bin/SCTPasp_PT.cc D bin/SCTPasp_PT.hh D bin/SCTPasp_PortType.ttcn D bin/SCTPasp_Types.ttcn D bin/install.script 18 files changed, 0 insertions(+), 236 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/38235/1 diff --git a/bin/General_Types.ttcn b/bin/General_Types.ttcn deleted file mode 120000 index 206f0e3..0000000 --- a/bin/General_Types.ttcn +++ /dev/null @@ -1 +0,0 @@ -../COMMON/src/General_Types.ttcn \ No newline at end of file diff --git a/bin/M3UA_Emulation.ttcn b/bin/M3UA_Emulation.ttcn deleted file mode 120000 index 920cdcf..0000000 --- a/bin/M3UA_Emulation.ttcn +++ /dev/null @@ -1 +0,0 @@ -../M3UA_CNL113537/src/M3UA_Emulation.ttcn \ No newline at end of file diff --git a/bin/M3UA_Types.ttcn b/bin/M3UA_Types.ttcn deleted file mode 120000 index 3b60f72..0000000 --- a/bin/M3UA_Types.ttcn +++ /dev/null @@ -1 +0,0 @@ -../M3UA_CNL113536/src/M3UA_Types.ttcn \ No newline at end of file diff --git a/bin/MTP3asp_PortType.ttcn b/bin/MTP3asp_PortType.ttcn deleted file mode 120000 index 9f2cae6..0000000 --- a/bin/MTP3asp_PortType.ttcn +++ /dev/null @@ -1 +0,0 @@ -../MTP3asp_CNL113337/src/MTP3asp_PortType.ttcn \ No newline at end of file diff --git a/bin/MTP3asp_Types.ttcn b/bin/MTP3asp_Types.ttcn deleted file mode 120000 index ef67545..0000000 --- a/bin/MTP3asp_Types.ttcn +++ /dev/null @@ -1 +0,0 @@ -../MTP3asp_CNL113337/src/MTP3asp_Types.ttcn \ No newline at end of file diff --git a/bin/Makefile b/bin/Makefile deleted file mode 100644 index ca547bb..0000000 --- a/bin/Makefile +++ /dev/null @@ -1,188 +0,0 @@ -# This Makefile was generated by the Makefile Generator -# of the TTCN-3 Test Executor version CRL 113 200/6 R1A -# for Harald Welte (laforge@nataraja) on Wed Apr 12 11:16:09 2017 - -# Copyright (c) 2000-2016 Ericsson Telecom AB - -# The following make commands are available: -# - make, make all Builds the executable test suite. -# - make archive Archives all source files. -# - make check Checks the semantics of TTCN-3 and ASN.1modules. -# - make port Generates port skeletons. -# - make clean Removes all generated files. -# - make compile Translates TTCN-3 and ASN.1 modules to C++. -# - make dep Creates/updates dependency list. -# - make executable Builds the executable test suite. -# - make library Builds the library archive. -# - make objects Builds the object files without linking the executable. -# -# Set these variables... -# - -# The path of your TTCN-3 Test Executor installation: -# Uncomment this line to override the environment variable. -# The value below points to the location of the TITAN version -# that generated this makefile. -TTCN3_DIR = /usr - -# Your platform: (SOLARIS, SOLARIS8, LINUX, FREEBSD or WIN32) -PLATFORM = LINUX - -# Your C++ compiler: -# (if you change the platform, you may need to change the compiler) -CXX = g++ - -# Flags for the C++ preprocessor (and makedepend as well): -CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)/include/titan - -# Flags for the C++ compiler: -CXXFLAGS = -Wall - -# Flags for the linker: -LDFLAGS = -L$(TTCN3_DIR)/lib/titan - -ifeq ($(PLATFORM), WIN32) -# Silence linker warnings. -LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -endif - -# Utility to create library files -AR = ar -ARFLAGS = - -# Flags for the TTCN-3 and ASN.1 compiler: -COMPILER_FLAGS = -L - -# Execution mode: (either ttcn3 or ttcn3-parallel) -TTCN3_LIB = ttcn3-parallel - -# The path of your libxml2 installation: -# If you do not have your own one, leave it unchanged. -XMLDIR = $(TTCN3_DIR) - -# Directory to store the archived source files: -# Note: you can set any directory except ./archive -ARCHIVE_DIR = backup - -# -# You may change these variables. Add your files if necessary... -# - -# TTCN-3 modules of this project: -TTCN3_MODULES = General_Types.ttcn M3UA_Emulation.ttcn M3UA_Types.ttcn MTP3asp_PortType.ttcn MTP3asp_Types.ttcn SCCP_Emulation.ttcn SCCP_Mapping.ttcn SCCP_Testcases.ttcn SCCP_Types.ttcn SCCPasp_Types.ttcn SCTPasp_PortType.ttcn SCTPasp_Types.ttcn - -# ASN.1 modules of this project: -ASN1_MODULES = - -# C++ source & header files generated from the TTCN-3 & ASN.1 modules of -# this project: -GENERATED_SOURCES = General_Types.cc M3UA_Emulation.cc M3UA_Types.cc MTP3asp_PortType.cc MTP3asp_Types.cc SCCP_Emulation.cc SCCP_Mapping.cc SCCP_Testcases.cc SCCP_Types.cc SCCPasp_Types.cc SCTPasp_PortType.cc SCTPasp_Types.cc -GENERATED_HEADERS = General_Types.hh M3UA_Emulation.hh M3UA_Types.hh MTP3asp_PortType.hh MTP3asp_Types.hh SCCP_Emulation.hh SCCP_Mapping.hh SCCP_Testcases.hh SCCP_Types.hh SCCPasp_Types.hh SCTPasp_PortType.hh SCTPasp_Types.hh - -# C/C++ Source & header files of Test Ports, external functions and -# other modules: -USER_SOURCES = SCTPasp_PT.cc -USER_HEADERS = SCTPasp_PT.hh - -# Object files of this project that are needed for the executable test suite: -OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS) - -GENERATED_OBJECTS = General_Types.o M3UA_Emulation.o M3UA_Types.o MTP3asp_PortType.o MTP3asp_Types.o SCCP_Emulation.o SCCP_Mapping.o SCCP_Testcases.o SCCP_Types.o SCCPasp_Types.o SCTPasp_PortType.o SCTPasp_Types.o - -USER_OBJECTS = SCTPasp_PT.o - -# Other files of the project (Makefile, configuration files, etc.) -# that will be added to the archived source files: -OTHER_FILES = Makefile - -# The name of the executable test suite: -EXECUTABLE = SCCP_Test - - - -LIBRARY = lib$(EXECUTABLE).a - -TARGET = $(EXECUTABLE) - -# -# Do not modify these unless you know what you are doing... -# Platform specific additional libraries: -# -SOLARIS_LIBS = -lsocket -lnsl -lxml2 -SOLARIS8_LIBS = -lsocket -lnsl -lxml2 -LINUX_LIBS = -lxml2 -FREEBSD_LIBS = -lxml2 -WIN32_LIBS = -lxml2 - -# -# Rules for building the executable... -# - -all: $(TARGET) ; - -executable: $(EXECUTABLE) ; - -library: $(LIBRARY) ; - -objects: $(OBJECTS) compile; - -$(EXECUTABLE): $(OBJECTS) - if $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) \ - -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \ - -L$(OPENSSL_DIR)/lib -lcrypto \ - -L$(XMLDIR)/lib $($(PLATFORM)_LIBS); \ - then : ; else $(TTCN3_DIR)/bin/titanver $(OBJECTS); exit 1; fi - -$(LIBRARY): $(OBJECTS) - $(AR) -r $(ARFLAGS) $(LIBRARY) $(OBJECTS) - -%.o: %.c $(GENERATED_HEADERS) - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< - -%.o: %.cc $(GENERATED_HEADERS) - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< - -$(GENERATED_SOURCES) $(GENERATED_HEADERS): compile - @if [ ! -f $@ ]; then rm -f compile; $(MAKE) compile; fi - -check: $(TTCN3_MODULES) $(ASN1_MODULES) - $(TTCN3_DIR)/bin/compiler -s $(COMPILER_FLAGS) \ - $(TTCN3_MODULES) $(PREPROCESSED_TTCN3_MODULES) $(ASN1_MODULES) - -port: $(TTCN3_MODULES) $(ASN1_MODULES) - $(TTCN3_DIR)/bin/compiler -t $(COMPILER_FLAGS) \ - $(TTCN3_MODULES) $(PREPROCESSED_TTCN3_MODULES) $(ASN1_MODULES) - -compile: $(TTCN3_MODULES) $(ASN1_MODULES) - $(TTCN3_DIR)/bin/compiler $(COMPILER_FLAGS) \ - $(TTCN3_MODULES) $(ASN1_MODULES) - $? - touch $@ - -clean: - -rm -f $(EXECUTABLE) $(LIBRARY) $(OBJECTS) $(GENERATED_HEADERS) \ - $(GENERATED_SOURCES) compile \ - tags *.log - -dep: $(GENERATED_SOURCES) $(USER_SOURCES) ; - makedepend $(CPPFLAGS) -DMAKEDEPEND_RUN $(GENERATED_SOURCES) $(USER_SOURCES) - -archive: - mkdir -p $(ARCHIVE_DIR) - tar -cvhf - $(TTCN3_MODULES) $(ASN1_MODULES) \ - $(USER_HEADERS) $(USER_SOURCES) $(OTHER_FILES) \ - | gzip >$(ARCHIVE_DIR)/`basename $(TARGET) .exe`-`date '+%y%m%d-%H%M'`.tgz - -diag: - $(TTCN3_DIR)/bin/compiler -v 2>&1 - $(TTCN3_DIR)/bin/mctr_cli -v 2>&1 - $(CXX) -v 2>&1 - $(AR) -V 2>&1 - @echo TTCN3_DIR=$(TTCN3_DIR) - @echo OPENSSL_DIR=$(OPENSSL_DIR) - @echo XMLDIR=$(XMLDIR) - @echo PLATFORM=$(PLATFORM) - -# -# Add your rules here if necessary... -# - diff --git a/bin/SCCP_Emulation.ttcn b/bin/SCCP_Emulation.ttcn deleted file mode 120000 index 56f9548..0000000 --- a/bin/SCCP_Emulation.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCCP_CNL113341/src/SCCP_Emulation.ttcn \ No newline at end of file diff --git a/bin/SCCP_Mapping.ttcn b/bin/SCCP_Mapping.ttcn deleted file mode 120000 index 49e5098..0000000 --- a/bin/SCCP_Mapping.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCCP_CNL113341/src/SCCP_Mapping.ttcnpp \ No newline at end of file diff --git a/bin/SCCP_Mapping.ttcnpp b/bin/SCCP_Mapping.ttcnpp deleted file mode 120000 index 49e5098..0000000 --- a/bin/SCCP_Mapping.ttcnpp +++ /dev/null @@ -1 +0,0 @@ -../SCCP_CNL113341/src/SCCP_Mapping.ttcnpp \ No newline at end of file diff --git a/bin/SCCP_Testcases.cfg b/bin/SCCP_Testcases.cfg deleted file mode 120000 index 34a3574..0000000 --- a/bin/SCCP_Testcases.cfg +++ /dev/null @@ -1 +0,0 @@ -../SCCP_Test/SCCP_Testcases.cfg \ No newline at end of file diff --git a/bin/SCCP_Testcases.ttcn b/bin/SCCP_Testcases.ttcn deleted file mode 120000 index 044b425..0000000 --- a/bin/SCCP_Testcases.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCCP_Test/SCCP_Testcases.ttcn \ No newline at end of file diff --git a/bin/SCCP_Types.ttcn b/bin/SCCP_Types.ttcn deleted file mode 120000 index 79ab3ba..0000000 --- a/bin/SCCP_Types.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCCP_CNL113341/src/SCCP_Types.ttcn \ No newline at end of file diff --git a/bin/SCCPasp_Types.ttcn b/bin/SCCPasp_Types.ttcn deleted file mode 120000 index 1d80a1d..0000000 --- a/bin/SCCPasp_Types.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCCP_CNL113341/src/SCCPasp_Types.ttcn \ No newline at end of file diff --git a/bin/SCTPasp_PT.cc b/bin/SCTPasp_PT.cc deleted file mode 120000 index 2334484..0000000 --- a/bin/SCTPasp_PT.cc +++ /dev/null @@ -1 +0,0 @@ -../SCTPasp_CNL113469/src/SCTPasp_PT.cc \ No newline at end of file diff --git a/bin/SCTPasp_PT.hh b/bin/SCTPasp_PT.hh deleted file mode 120000 index 5ba6a79..0000000 --- a/bin/SCTPasp_PT.hh +++ /dev/null @@ -1 +0,0 @@ -../SCTPasp_CNL113469/src/SCTPasp_PT.hh \ No newline at end of file diff --git a/bin/SCTPasp_PortType.ttcn b/bin/SCTPasp_PortType.ttcn deleted file mode 120000 index 798fd7b..0000000 --- a/bin/SCTPasp_PortType.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCTPasp_CNL113469/src/SCTPasp_PortType.ttcn \ No newline at end of file diff --git a/bin/SCTPasp_Types.ttcn b/bin/SCTPasp_Types.ttcn deleted file mode 120000 index e067b94..0000000 --- a/bin/SCTPasp_Types.ttcn +++ /dev/null @@ -1 +0,0 @@ -../SCTPasp_CNL113469/src/SCTPasp_Types.ttcn \ No newline at end of file diff --git a/bin/install.script b/bin/install.script deleted file mode 100755 index 799b156..0000000 --- a/bin/install.script +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -SRC_BASE_DIR=~/projects/git/osmo-ttcn3-hacks - -ln -sf $SRC_BASE_DIR/COMMON/src/General_Types.ttcn . - -#M3UA protocol module -ln -sf $SRC_BASE_DIR/deps/titan.ProtocolModules.M3UA/src/M3UA_Types.ttcn . -#M3UA Emulator -ln -sf $SRC_BASE_DIR/src/titan.ProtocolEmulations.M3UA/src/M3UA_Emulation.ttcn . - - -#MTP3 test port (partly) -ln -sf $SRC_BASE_DIR/deps/titan.TestPorts.MTP3asp/src/MTP3asp_Types.ttcn . -ln -sf $SRC_BASE_DIR/deps/titan.TestPorts.MTP3asp/src/MTP3asp_PortType.ttcn . - -#SCCP Emulator + protocol module -ln -sf $SRC_BASE_DIR/deps/titan.ProtocolEmulations.SCCP/src/SCCPasp_Types.ttcn . -ln -sf $SRC_BASE_DIR/deps/titan.ProtocolEmulations.SCCP/src/SCCP_Types.ttcn . -ln -sf $SRC_BASE_DIR/deps/titan.ProtocolEmulations.SCCP/src/SCCP_Mapping.ttcnpp . -ln -sf $SRC_BASE_DIR/deps/titan.ProtocolEmulations.SCCP/src/SCCP_Emulation.ttcn . - -#SCTP test port -ln -sf $SRC_BASE_DIR/deps/titan.TestPorts.SCTPasp/src/SCTPasp_Types.ttcn . -ln -sf $SRC_BASE_DIR/deps/titan.TestPorts.SCTPasp/src/SCTPasp_PortType.ttcn . -ln -sf $SRC_BASE_DIR/deps/titan.TestPorts.SCTPasp/src/SCTPasp_PT.hh . -ln -sf $SRC_BASE_DIR/deps/titan.TestPorts.SCTPasp/src/SCTPasp_PT.cc . - - -#Test cases -ln -sf $SRC_BASE_DIR/SCCP_Test/SCCP_Testcases.ttcn . -ln -sf $SRC_BASE_DIR/SCCP_Test/SCCP_Testcases.cfg . -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38235?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I60929c5d4acba4d0d8df3696fade370d7e0100f8 Gerrit-Change-Number: 38235 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: do not assign SEID=0, increment properly

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38215?usp=email ) Change subject: pfcp_peer: do not assign SEID=0, increment properly ...................................................................... pfcp_peer: do not assign SEID=0, increment properly Change-Id: I76b921047784e727d67cd6c6a5aeb6d827b65e56 --- M src/pfcp_peer.erl 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index f379e69..aa33e3a 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -54,11 +54,13 @@ %% 3GPP TS 29.244, section 4.2 "UDP Header and Port Numbers" -define(PFCP_PORT, 8805). +-define(PFCP_SEID_MAX, 16#ffffffffffffffff). + -type pfcp_session_rsp() :: ok | {error, term()}. -type pfcp_msg_type() :: atom(). -type pfcp_seq_nr() :: 0..16#ffffff. --type pfcp_seid() :: 0..16#ffffffffffffffff. +-type pfcp_seid() :: 0..?PFCP_SEID_MAX. -type pfcp_f_seid() :: #f_seid{}. -type pfcp_ies() :: [term()] | map() | binary(). -type pfcp_msg() :: {pfcp_msg_type(), pfcp_ies()}. @@ -139,7 +141,7 @@ {reuseaddr, true}, {active, true}]), ?LOG_INFO("PFCP peer @ ~p will talk to UPF @ ~p", [LocAddr, RemAddr]), - {ok, connecting, #peer_state{seid = 0, + {ok, connecting, #peer_state{seid = 1, %% SEID=0 is special, see 7.2.2.4.2 sock = Sock, loc_addr = LocAddr, rem_addr = RemAddr, @@ -288,8 +290,12 @@ Ref = erlang:monitor(process, Pid), NReg = dict:store(SEID, {Pid, Ref}, Reg), ?LOG_DEBUG("Allocated SEID ~p to process ~p", [SEID, Pid]), + NSEID = case SEID of + ?PFCP_SEID_MAX -> 1; + _ -> SEID + 1 + end, S#peer_state{registry = NReg, - seid = SEID + 1}. + seid = NSEID}. -spec registry_del({pid(), reference()}, peer_state()) -> peer_state(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I76b921047784e727d67cd6c6a5aeb6d827b65e56 Gerrit-Change-Number: 38215 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: do not assign SEID=0, increment properly

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38215?usp=email ) Change subject: pfcp_peer: do not assign SEID=0, increment properly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I76b921047784e727d67cd6c6a5aeb6d827b65e56 Gerrit-Change-Number: 38215 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Sep 2024 18:25:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: a better PDU routing concept

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38207?usp=email ) Change subject: library/PFCP_Emulation: a better PDU routing concept ...................................................................... Patch Set 3: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38207/comment/dbc3fda3_cb74… : PS2, Line 1967: f_PFCPEM_subscribe_seid(c_SEID0); > In this specific case the problem can be solved a lot simpler, simply by swapping these two functions, i.e. calling f_PFCPEM_subscribe_seid() before f_PFCPEM_unsubscribe_bcast(). This way we have no gap and keep the subscription API simple. I'll do this. Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I25802471519fa297ad4cb2b056adaa6748b00af2 Gerrit-Change-Number: 38207 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Sep 2024 18:23:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

9 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add f_ConnHdlrList_all_done()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38214?usp=email ) Change subject: s1gw: add f_ConnHdlrList_all_done() ...................................................................... Patch Set 5: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38214/comment/3fdd9113_6cbf… : PS4, Line 192: function f_ConnHdlrList_done(in ConnHdlrList vc_conns) > Acknowledged Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I20c472dd8ce7f5a25c349cc079bd5bd873be2950 Gerrit-Change-Number: 38214 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Sep 2024 18:23:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

9 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024