April 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-pcu[master]: gprs_rlcmac: convert from C++ to C
by msuraev 13 Apr '23

13 Apr '23

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32278 ) Change subject: gprs_rlcmac: convert from C++ to C ...................................................................... gprs_rlcmac: convert from C++ to C Change-Id: I7260ad1a67ebdc09767a679e579fead262f1627a --- M debian/copyright M src/Makefile.am M src/encoding.cpp M src/encoding.h R src/gprs_rlcmac.c M src/gprs_rlcmac.h M src/pcu_l1_if.h 7 files changed, 24 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/debian/copyright b/debian/copyright index 31b06fa..bb471cd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -45,7 +45,7 @@ src/llc.c src/encoding.cpp src/encoding.h - src/gprs_rlcmac.cpp + src/gprs_rlcmac.c src/ts_alloc.cpp Copyright: 2012 Ivan Klyuchnikov 2012 Andreas Eversberg <jolly(a)eversberg.eu> diff --git a/src/Makefile.am b/src/Makefile.am index 21c37a6..9df0caa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ gsm_rlcmac.c \ gprs_bssgp_pcu.c \ gprs_bssgp_rim.c \ - gprs_rlcmac.cpp \ + gprs_rlcmac.c \ gprs_rlcmac_sched.cpp \ gprs_rlcmac_meas.cpp \ gprs_ms.c \ diff --git a/src/encoding.cpp b/src/encoding.cpp index 243c874..6b626cc 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -801,7 +801,7 @@ } /* Generate paging request. See 44.018, sections 10 and 9.1.22 */ -int Encoding::write_paging_request(bitvec * dest, const struct osmo_mobile_identity *mi) +int write_paging_request(struct bitvec *dest, const struct osmo_mobile_identity *mi) { uint8_t mi_buf[GSM48_MID_MAX_SIZE]; int mi_len; diff --git a/src/encoding.h b/src/encoding.h index 27ffe46..ae4d57f 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -61,8 +61,6 @@ static void encode_rbb(const char *show_rbb, bitvec *rbb); - static int write_paging_request(bitvec * dest, const struct osmo_mobile_identity *mi); - static unsigned write_repeated_page_info(bitvec * dest, unsigned& wp, uint8_t len, uint8_t *identity, uint8_t chan_needed); @@ -98,6 +96,9 @@ #endif void write_packet_access_reject(struct bitvec *dest, uint32_t tlli, unsigned long t3172_ms); + +int write_paging_request(struct bitvec *dest, const struct osmo_mobile_identity *mi); + void write_packet_uplink_assignment(RlcMacDownlink_t *block, uint8_t old_tfi, uint8_t old_downlink, uint32_t tlli, uint8_t use_tlli, const struct gprs_rlcmac_ul_tbf *tbf, uint8_t poll, diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.c similarity index 89% rename from src/gprs_rlcmac.cpp rename to src/gprs_rlcmac.c index ea7fb9a..3163c32 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.c @@ -1,8 +1,9 @@ -/* gprs_rlcmac.cpp +/* gprs_rlcmac.c * * Copyright (C) 2012 Ivan Klyuchnikov * Copyright (C) 2012 Andreas Eversberg <jolly(a)eversberg.eu> * Copyright (C) 2013 by Holger Hans Peter Freyther + * Copyright (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,9 +16,7 @@ * GNU General Public License for more details. */ -extern "C" { - #include <osmocom/gsm/gsm48.h> -} +#include <osmocom/gsm/gsm48.h> #include <pcu_l1_if.h> #include <gprs_rlcmac.h> @@ -36,9 +35,9 @@ osmo_mobile_identity_to_str_buf(str, sizeof(str), mi); LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH) MI=%s\n", str); } - bitvec *paging_request = bitvec_alloc(22, tall_pcu_ctx); + struct bitvec *paging_request = bitvec_alloc(22, tall_pcu_ctx); bitvec_unhex(paging_request, DUMMY_VEC); - int plen = Encoding::write_paging_request(paging_request, mi); + int plen = write_paging_request(paging_request, mi); if (plen <= 0) { LOGP(DRLCMAC, LOGL_ERROR, "TX: [PCU -> BTS] Failed to encode Paging Request\n"); return -1; diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 43f5095..70cf63e 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -2,6 +2,7 @@ * * Copyright (C) 2012 Ivan Klyuchnikov * Copyright (C) 2013 by Holger Hans Peter Freyther + * Copyright (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -14,8 +15,7 @@ * GNU General Public License for more details. */ -#ifndef GPRS_RLCMAC_H -#define GPRS_RLCMAC_H +#pragma once #include <stdbool.h> #include <stdint.h> @@ -92,8 +92,6 @@ int gprs_rlcmac_tx_ul_ud(gprs_rlcmac_tbf *tbf); -struct msgb *gprs_rlcmac_app_info_msg(const struct gsm_pcu_if_app_info_req *req); - int gprs_rlcmac_rcv_rts_block(struct gprs_rlcmac_bts *bts, uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr); @@ -101,9 +99,7 @@ extern "C" { #endif int gprs_rlcmac_paging_request(struct gprs_rlcmac_bts *bts, const struct osmo_mobile_identity *mi, const char *imsi); +struct msgb *gprs_rlcmac_app_info_msg(const struct gsm_pcu_if_app_info_req *req); #ifdef __cplusplus } #endif - - -#endif // GPRS_RLCMAC_H diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index 3865402..f787c40 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -148,7 +148,6 @@ uint8_t *data, size_t data_len); void pcu_l1if_tx_agch(struct gprs_rlcmac_bts *bts, bitvec *block, int len); -void pcu_l1if_tx_pch(struct gprs_rlcmac_bts *bts, bitvec *block, int plen, const char *imsi); void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, bitvec *block, int plen, const char *imsi, uint32_t tlli); #endif @@ -158,6 +157,7 @@ struct gprs_rlcmac_bts; int pcu_tx_neigh_addr_res_req(struct gprs_rlcmac_bts *bts, const struct neigh_cache_entry_key *neigh_key); +void pcu_l1if_tx_pch(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi); int pcu_rx(struct gsm_pcu_if *pcu_prim, size_t pcu_prim_length); int pcu_l1if_open(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7260ad1a67ebdc09767a679e579fead262f1627a Gerrit-Change-Number: 32278 Gerrit-PatchSet: 6 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-pcu[master]: gprs_rlcmac: convert from C++ to C
by fixeria 12 Apr '23

12 Apr '23

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32278 ) Change subject: gprs_rlcmac: convert from C++ to C ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7260ad1a67ebdc09767a679e579fead262f1627a Gerrit-Change-Number: 32278 Gerrit-PatchSet: 6 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 20:44:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: abis_rsl: include osmo_ortp.h explicitly
by fixeria 12 Apr '23

12 Apr '23

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32276 ) Change subject: abis_rsl: include osmo_ortp.h explicitly ...................................................................... Patch Set 5: Code-Review-2 (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/32276/comment/f5bd3a28_f25abb94 PS5, Line 49: osmocom/netif/rtp.h AFAICS, these constants are not only defined in libosmo-abis.git, but also in libosmo-netif.git. Specifically in this header file. So I think it's fine as it is. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I11297f2ba2ff431153e541c745cf59b7fbb733c0 Gerrit-Change-Number: 32276 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 20:41:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: Speed up tests by lowering retransmission T3,N3 timers
by fixeria 12 Apr '23

12 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 ) Change subject: ggsn: Speed up tests by lowering retransmission T3,N3 timers ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 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: I3798fba89c2c357afeaa83a73759442c6c433cea Gerrit-Change-Number: 32283 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 20:37:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: Add osmo-ggsn.cfg
by fixeria 12 Apr '23

12 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32282 ) Change subject: ggsn: Add osmo-ggsn.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32282 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: Ifbd50b6c1ebfd0371bd384c4ae0c4dc763478f49 Gerrit-Change-Number: 32282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 20:37:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: osmo-bts-virtual: properly activate [CBCH/]BCCH/CCCH
by fixeria 12 Apr '23

12 Apr '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32285 ) Change subject: osmo-bts-virtual: properly activate [CBCH/]BCCH/CCCH ...................................................................... osmo-bts-virtual: properly activate [CBCH/]BCCH/CCCH In change 8e04613e I overlooked that osmo-bts-virtual is re-using the scheduler of osmo-bts-trx and forgot to update its OML logic. As a result, osmo-bts-virtual is broken and does not transmit anything on the broadcast channels. Change-Id: I2276f7e5e4042e56ddf1fd1642c917dba0005ac4 Fixes: 8e04613e "osmo-bts-trx: properly activate [CBCH/]BCCH/CCCH" Related: OS#6001, OS#1572 --- M src/osmo-bts-virtual/bts_model.c M src/osmo-bts-virtual/l1_if.c 2 files changed, 38 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/32285/1 diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index eb71138..5ea517e 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -125,6 +125,28 @@ if (trx_sched_set_pchan(ts, pchan) != 0) return NM_NACK_RES_NOTAVAIL; + /* activate lchans for [CBCH/]BCCH/CCCH */ + switch (pchan) { + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* using RSL_CHAN_OSMO_CBCH4 is correct here, because the scheduler + * does not distinguish between SDCCH/4+CBCH abd SDCCH/8+CBCH. */ + trx_sched_set_lchan(&ts->lchan[CBCH_LCHAN], + RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true); + break; + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + trx_sched_set_lchan(&ts->lchan[CBCH_LCHAN], + RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true); + /* fall-through */ + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH: + trx_sched_set_bcch_ccch(&ts->lchan[CCCH_LCHAN], true); + ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; + lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); + break; + default: + break; + } + return 0; } diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 469e84f..6410d9d 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -192,14 +192,6 @@ if (vbts_sched_start(pinst->trx->bts) < 0) return -ENOLINK; - /* Only start the scheduler for the transceiver on C0. - * If we have multiple transceivers, CCCH is always on C0 - * and has to be auto active */ - pinst->trx->ts[0].lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; - - /* Other TRX are activated via OML by a PRIM_INFO_MODIFY / PRIM_INFO_ACTIVATE */ - lchan_set_state(&pinst->trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2276f7e5e4042e56ddf1fd1642c917dba0005ac4 Gerrit-Change-Number: 32285 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn: Speed up tests by lowering retransmission T3,N3 timers
by pespin 12 Apr '23

12 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/32284 ) Change subject: ttcn3-ggsn: Speed up tests by lowering retransmission T3,N3 timers ...................................................................... ttcn3-ggsn: Speed up tests by lowering retransmission T3,N3 timers Every test needs to wait for T3*N3 seconds before exiting in order to make sure the queues waiting for duplicates are cleared, otherwise state from previous state may affect next tests. Since 1.10.0, osmo-ggsn supports having those timers changed through VTY. Let's set them to a lower value than default specified by spec, in order to speed up each test 15 seconds -> 2 seconds. Only ttcn3-ggsn (against osmo-ggsn) and not ttcn3-ggsn-ogs (against open5gs-smfd) is updated, since the later doesn't support changing the default timer values using the config files yet. Related: OS#5485 Change-Id: Ica346bd791a67b72fad597702d750383e8ac5895 --- M ttcn3-ggsn-test/GGSN_Tests.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/84/32284/1 diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/GGSN_Tests.cfg index 36603c8..cb548b3 100644 --- a/ttcn3-ggsn-test/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/GGSN_Tests.cfg @@ -19,5 +19,10 @@ GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201" +# local T3-RESPONSE timeout, seconds: +GGSN_Tests.mp_t3_response := 1 +# local N3-REQUESTS counter: +GGSN_Tests.mp_n3_requests := 2 + [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index b27a6e4..2f09990 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -44,6 +44,9 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 + timer gtp T3 1 + timer gtp T1003 2 + timer gtp X3 2 apn internet gtpu-mode tun tun-device tun4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/32284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ica346bd791a67b72fad597702d750383e8ac5895 Gerrit-Change-Number: 32284 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: Speed up tests by lowering retransmission T3,N3 timers
by pespin 12 Apr '23

12 Apr '23

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 ) Change subject: ggsn: Speed up tests by lowering retransmission T3,N3 timers ...................................................................... ggsn: Speed up tests by lowering retransmission T3,N3 timers The params are set in GGSN_Tests.default and not in GGSN_Tests.default, because those lower values are not really good default ones as per spec. For instance when running against open5gs-smfd, these values should be left to the default in code of 5 and 3 seconds, because open5gs-smfd doesn't support changing the values through cfg file yet. Related: OS#5485 Change-Id: I3798fba89c2c357afeaa83a73759442c6c433cea --- M ggsn_tests/GGSN_Tests.cfg M ggsn_tests/osmo-ggsn.cfg 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/32283/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 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: I3798fba89c2c357afeaa83a73759442c6c433cea Gerrit-Change-Number: 32283 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: Speedup tests by lowering retransmission T3,N3 timers
by pespin 12 Apr '23

12 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 ) Change subject: ggsn: Speedup tests by lowering retransmission T3,N3 timers ...................................................................... ggsn: Speedup tests by lowering retransmission T3,N3 timers The params are set in GGSN_Tests.default and not in GGSN_Tests.default, because those lower values are not really good default ones as per spec. For instance when running against open5gs-smfd, these values should be left to the default in code of 5 and 3 seconds, because open5gs-smfd doesn't support changing the values through cfg file yet. Related: OS#5485 Change-Id: I3798fba89c2c357afeaa83a73759442c6c433cea --- M ggsn_tests/GGSN_Tests.cfg M ggsn_tests/osmo-ggsn.cfg 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/32283/1 diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg index e849ed4..b542108 100644 --- a/ggsn_tests/GGSN_Tests.cfg +++ b/ggsn_tests/GGSN_Tests.cfg @@ -13,6 +13,10 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] +# local T3-RESPONSE timeout, seconds: +GGSN_Tests.mp_t3_response := 1; +# local N3-REQUESTS counter: +GGSN_Tests.mp_n3_requests := 2; [EXECUTE] GGSN_Tests.control diff --git a/ggsn_tests/osmo-ggsn.cfg b/ggsn_tests/osmo-ggsn.cfg index 5fdcf15..28284e7 100644 --- a/ggsn_tests/osmo-ggsn.cfg +++ b/ggsn_tests/osmo-ggsn.cfg @@ -45,6 +45,9 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 127.0.0.2 + timer gtp T3 1 + timer gtp T1003 2 + timer gtp X3 2 apn internet gtpu-mode tun tun-device tun4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32283 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: I3798fba89c2c357afeaa83a73759442c6c433cea Gerrit-Change-Number: 32283 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: Add osmo-ggsn.cfg
by pespin 12 Apr '23

12 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32282 ) Change subject: ggsn: Add osmo-ggsn.cfg ...................................................................... ggsn: Add osmo-ggsn.cfg Taken from docker-playground/ttcn3-ggsn-test/osmo-ggsn.cfg Change-Id: Ifbd50b6c1ebfd0371bd384c4ae0c4dc763478f49 --- A ggsn_tests/osmo-ggsn.cfg 1 file changed, 91 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/32282/1 diff --git a/ggsn_tests/osmo-ggsn.cfg b/ggsn_tests/osmo-ggsn.cfg new file mode 100644 index 0000000..5fdcf15 --- /dev/null +++ b/ggsn_tests/osmo-ggsn.cfg @@ -0,0 +1,80 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log gsmtap 127.0.0.1 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level lgtp debug +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 127.0.0.2 + apn internet + gtpu-mode tun + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.16.0/20 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.16.0/20 + no shutdown + apn inet6 + gtpu-mode tun + tun-device tun6 + type-support v6 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 + no shutdown + apn inet46 + gtpu-mode tun + tun-device tun46 + type-support v4v6 + ip prefix dynamic 176.16.32.0/20 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.32.0/20 + ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 + no shutdown + default-apn internet + no shutdown ggsn -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32282 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: Ifbd50b6c1ebfd0371bd384c4ae0c4dc763478f49 Gerrit-Change-Number: 32282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0