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

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: rename tlli to msg_id

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34108 ) Change subject: PCUIF: rename tlli to msg_id ...................................................................... PCUIF: rename tlli to msg_id To confirm downlink IMMEDIATE ASSIGNMENT messages, we use the TLLI as an identifier and the related record member is also called "tlli". Unfortunately this is misleading since the message identifier does not necessarly have to be a TLLI. It is just an implementation detail that osmo-pcu uses the TLLI as a message identifier. To make that clear, lets rename the tlli member (and variable and parameter names where it is passed on) to "msg_id". (Since this change only renames variables and struct members it will not break compatibility with other programs that use the PCUIF) Related: OS#5927 Depends: osmo-pcu.git I4a25039dfe329e68879bc68936e49c4b190625e6 Change-Id: I1db29d5b1920e351c452b798c3260654c2cbe0cb --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 38 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/34108/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1ab0f8a..e8ae1c0 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5820,7 +5820,7 @@ f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); } else { var PCUIF_pch_dt pch_dt; - pch_dt.tlli := '01020304'O; + pch_dt.msg_id := '01020304'O; pch_dt.imsi := "00101000000000123"; pch_dt.data := c_PCU_DATA; f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index 8824a11..87a5b15 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -140,7 +140,7 @@ } function f_PCUIF_tx_imm_ass_pch(PCUIF_CODEC_PT pt, integer conn_id, octetstring imm_ass, hexstring imsi, - uint8_t bts_nr := 0, boolean wait_for_cnf := true, OCT4 tlli := '01020304'O) return uint32_t { + uint8_t bts_nr := 0, boolean wait_for_cnf := true, OCT4 msg_id := '01020304'O) return uint32_t { var PCUIF_send_data sd; timer T := 3.0; @@ -156,7 +156,7 @@ ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH, prefix & imm_ass))); } else { var PCUIF_pch_dt pch_dt; - pch_dt.tlli := tlli; + pch_dt.msg_id := msg_id; pch_dt.imsi := hex2str(imsi); pch_dt.data := imm_ass; pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)))); diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 94056b9..2e3667a 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -106,7 +106,7 @@ type record PCUIF_data_cnf_dt { PCUIF_Sapi sapi, - OCT4 tlli, + OCT4 msg_id, uint32_t fn, uint16_t arfcn, uint8_t trx_nr, @@ -315,11 +315,11 @@ /* Record to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The record is sent by the PCU to the BTS as a * data request (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ type record PCUIF_pch_dt { - OCT4 tlli, + OCT4 msg_id, charstring imsi length(17), octetstring data length(23) } with { - variant (tlli) "BYTEORDER(last)" + variant (msg_id) "BYTEORDER(last)" variant (imsi) "FIELDLENGTH(17)" variant (data) "FIELDLENGTH(23)" }; @@ -698,14 +698,14 @@ template (value) uint32_t fn, template (value) uint16_t arfcn, template (value) PCUIF_Sapi sapi, - template (value) OCT4 tlli) := { + template (value) OCT4 msg_id) := { msg_type := PCU_IF_MSG_DATA_CNF_DT, bts_nr := bts_nr, spare := '0000'O, u := { data_cnf_dt := { sapi := sapi, - tlli := tlli, + msg_id := msg_id, fn := fn, arfcn := arfcn, trx_nr := trx_nr, @@ -722,14 +722,14 @@ template uint8_t trx_nr := ?, template uint8_t ts_nr := ?, template PCUIF_Sapi sapi := ?, - template OCT4 tlli := ?) := { + template OCT4 msg_id := ?) := { msg_type := PCU_IF_MSG_DATA_CNF_DT, bts_nr := bts_nr, spare := ?, u := { data_cnf_dt := { sapi := sapi, - tlli := tlli, + msg_id := msg_id, fn := ?, arfcn := ?, trx_nr := trx_nr, diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 8a1207a..a6c5bae 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -140,7 +140,7 @@ type record BTS_CCCH_Block { uint8_t bts_nr, PCUIF_data raw, - OCT4 tlli optional, + OCT4 msg_id optional, charstring imsi optional, GsmRrMessage rr_msg }; @@ -161,11 +161,11 @@ template BTS_CCCH_Block tr_PCUIF_DATA_RR(template uint8_t bts_nr, template PCUIF_data raw, template GsmRrMessage rr_msg := ?, - template OCT4 tlli := *, + template OCT4 msg_id := *, template charstring imsi := *) := { bts_nr := bts_nr, raw := raw, - tlli := tlli, + msg_id := msg_id, imsi := imsi, rr_msg := rr_msg }; @@ -550,11 +550,11 @@ if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_DT) { pch_dt := dec_PCUIF_pch_dt(pcu_msg_rr.raw.data); - pcu_msg_rr.tlli := pch_dt.tlli; + pcu_msg_rr.msg_id := pch_dt.msg_id; pcu_msg_rr.imsi := pch_dt.imsi; pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data); } else { - pcu_msg_rr.tlli := omit; + pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34108 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: I1db29d5b1920e351c452b798c3260654c2cbe0cb Gerrit-Change-Number: 34108 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 ) Change subject: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt ...................................................................... PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt The record PCUIF_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of record PCUIF_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Related: OS#5927 Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d --- M library/PCUIF_Types.ttcn 1 file changed, 28 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/34110/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 2e3667a..2a86b54 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -106,16 +106,7 @@ type record PCUIF_data_cnf_dt { PCUIF_Sapi sapi, - OCT4 msg_id, - uint32_t fn, - uint16_t arfcn, - uint8_t trx_nr, - uint8_t ts_nr, - uint8_t block_nr, - int8_t rssi, - uint16_t ber10k, - int16_t ta_offs_qbits, - int16_t lqual_cb + OCT4 msg_id } with { variant "" }; type record PCUIF_rts_req { @@ -692,11 +683,6 @@ } template (value) PCUIF_Message ts_PCUIF_DATA_CNF_DT(template (value) uint8_t bts_nr, - template (value) uint8_t trx_nr, - template (value) uint8_t ts_nr, - template (value) uint8_t block_nr, - template (value) uint32_t fn, - template (value) uint16_t arfcn, template (value) PCUIF_Sapi sapi, template (value) OCT4 msg_id) := { msg_type := PCU_IF_MSG_DATA_CNF_DT, @@ -705,22 +691,11 @@ u := { data_cnf_dt := { sapi := sapi, - msg_id := msg_id, - fn := fn, - arfcn := arfcn, - trx_nr := trx_nr, - ts_nr := ts_nr, - block_nr := block_nr, - rssi := 0, - ber10k := 0, - ta_offs_qbits := 0, - lqual_cb := 0 + msg_id := msg_id } } } -template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr := ?, - template uint8_t trx_nr := ?, - template uint8_t ts_nr := ?, +template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr, template PCUIF_Sapi sapi := ?, template OCT4 msg_id := ?) := { msg_type := PCU_IF_MSG_DATA_CNF_DT, @@ -729,16 +704,7 @@ u := { data_cnf_dt := { sapi := sapi, - msg_id := msg_id, - fn := ?, - arfcn := ?, - trx_nr := trx_nr, - ts_nr := ts_nr, - block_nr := ?, - rssi := ?, - ber10k := ?, - ta_offs_qbits := ?, - lqual_cb := ? + msg_id := msg_id } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 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: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d Gerrit-Change-Number: 34110 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34107 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Change-Id: Id6109264e4144c2ab7b8410d4087705d857cd4c9 Related: OS#5927 --- M include/osmocom/bsc/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/34107/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 80e3b6d..d28aec0 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -97,15 +97,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6109264e4144c2ab7b8410d4087705d857cd4c9 Gerrit-Change-Number: 34107 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: rename tlli to msg_id

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34106 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... pcuif_proto: rename tlli to msg_id To confirm downlink IMMEDIATE ASSIGNMENT messages, we use the TLLI as an identifier and the related struct member is also called "tlli". Unfortunately this is misleading since the message identifier does not necessarly have to be a TLLI. It is just an implementation detail that osmo-pcu uses the TLLI as a message identifier. To make that clear, lets rename the tlli member (and variable and parameter names where it is passed on) to "msg_id". (Since this change only renames variables and struct members it will not break compatibility with other programs that use the PCUIF) Related: OS#5927 Depends: osmo-pcu.git I4a25039dfe329e68879bc68936e49c4b190625e6 Change-Id: Ifb3f257099b52c50e525768484f9e93282089d0f --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/pcu_if.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 5 files changed, 41 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/34106/1 diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 3da0d6c..a6b2cef 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -67,7 +67,7 @@ int rsl_relase_request(struct gsm_lchan *lchan, uint8_t link_id); /* Ericcson vendor specific RSL extensions */ -int rsl_ericsson_imm_assign_cmd(const struct gsm_bts *bts, uint32_t tlli, uint8_t len, +int rsl_ericsson_imm_assign_cmd(const struct gsm_bts *bts, uint32_t msg_id, uint8_t len, const uint8_t *val, uint8_t pag_grp); /* Siemens vendor-specific RSL extensions */ diff --git a/include/osmocom/bsc/pcu_if.h b/include/osmocom/bsc/pcu_if.h index 525b2e4..d2d3444 100644 --- a/include/osmocom/bsc/pcu_if.h +++ b/include/osmocom/bsc/pcu_if.h @@ -25,7 +25,7 @@ uint8_t is_11bit, enum ph_burst_type burst_type); /* Confirm the sending of an immediate assignment to the pcu */ -int pcu_tx_pch_confirm(struct gsm_bts *bts, uint32_t tlli); +int pcu_tx_pch_confirm(struct gsm_bts *bts, uint32_t msg_id); /* Open connection to PCU */ int pcu_sock_init(struct gsm_network *net); diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 1dda160..80e3b6d 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -41,7 +41,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using TLLI) */ +#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -93,10 +93,10 @@ int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); -/* data confirmation with direct tlli (instead of raw mac block with tlli) */ +/* data confirmation with message id (instead of raw mac block) */ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; - uint32_t tlli; + uint32_t msg_id; uint32_t fn; uint16_t arfcn; uint8_t trx_nr; @@ -274,8 +274,8 @@ /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ struct gsm_pcu_if_pch_dt { - /* TLLI as reference for confirmation */ - uint32_t tlli; + /* message id as reference for confirmation */ + uint32_t msg_id; /* IMSI (to derive paging group) */ char imsi[OSMO_IMSI_BUF_SIZE]; /* GSM mac-block (with immediate assignment message) */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 3bc5808..5440a23 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -995,7 +995,7 @@ } /* Chapter 8.5.6 Immediate Assignment Command (with Ericcson vendor specific RSL extension) */ -int rsl_ericsson_imm_assign_cmd(const struct gsm_bts *bts, uint32_t tlli, uint8_t len, +int rsl_ericsson_imm_assign_cmd(const struct gsm_bts *bts, uint32_t msg_id, uint8_t len, const uint8_t *val, uint8_t pag_grp) { struct msgb *msg = rsl_imm_assign_cmd_common(bts, len, val); @@ -1009,7 +1009,7 @@ /* ericsson can handle a reference at the end of the message which is used in * the confirm message. The confirm message is only sent if the trailer is present */ msgb_put_u8(msg, RSL_IE_ERIC_MOBILE_ID); - msgb_put_u32(msg, tlli); + msgb_put_u32(msg, msg_id); return abis_rsl_sendmsg(msg); } @@ -2552,7 +2552,7 @@ { struct e1inp_sign_link *sign_link = msg->dst; struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); - uint32_t tlli; + uint32_t msg_id; LOGP(DRSL, LOGL_INFO, "IMM.ass sent\n"); msgb_pull(msg, sizeof(*dh)); @@ -2564,8 +2564,8 @@ LOGP(DRSL, LOGL_ERROR, "unsupported IMM.ass message format! (please fix)\n"); else { msgb_pull(msg, 1); /* drop previous data to use msg_pull_u32 */ - tlli = msgb_pull_u32(msg); - pcu_tx_pch_confirm(sign_link->trx->bts, tlli); + msg_id = msgb_pull_u32(msg); + pcu_tx_pch_confirm(sign_link->trx->bts, msg_id); } return 0; } diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 8a1d5b0..5353081 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -436,13 +436,13 @@ } /* Confirm the sending of an immediate assignment to the pcu */ -int pcu_tx_pch_confirm(struct gsm_bts *bts, uint32_t tlli) +int pcu_tx_pch_confirm(struct gsm_bts *bts, uint32_t msg_id) { struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_data_cnf_dt *data_cnf_dt; - LOG_BTS(bts, DPCU, LOGL_INFO, "Sending PCH confirm with direct TLLI\n"); + LOG_BTS(bts, DPCU, LOGL_INFO, "Sending PCH confirm with message id\n"); msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr); if (!msg) @@ -451,7 +451,7 @@ data_cnf_dt = &pcu_prim->u.data_cnf_dt; data_cnf_dt->sapi = PCU_IF_SAPI_PCH_DT; - data_cnf_dt->tlli = tlli; + data_cnf_dt->msg_id = msg_id; return pcu_sock_send(bts->network, msg); } @@ -508,15 +508,15 @@ static int pcu_rx_rr_imm_ass_pch(struct gsm_bts *bts, uint8_t paging_group, const struct gsm_pcu_if_pch_dt *pch_dt) { - LOG_BTS(bts, DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH (TLLI=0x%08x, IMSI=%s, Paging group=0x%02x)\n", - pch_dt->tlli, pch_dt->imsi, paging_group); + LOG_BTS(bts, DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH (msg_id=0x%08x, IMSI=%s, Paging group=0x%02x)\n", + pch_dt->msg_id, pch_dt->imsi, paging_group); /* NOTE: Sending an IMMEDIATE ASSIGNMENT via PCH became necessary with GPRS in order to be able to * assign downlink TBFs directly through the paging channel. However, this method never became part * of the RSL specs. This means that each BTS vendor has to come up with a proprietary method. At * the moment we only support Ericsson RBS here. */ if (is_ericsson_bts(bts)) - return rsl_ericsson_imm_assign_cmd(bts, pch_dt->tlli, sizeof(pch_dt->data), pch_dt->data, paging_group); + return rsl_ericsson_imm_assign_cmd(bts, pch_dt->msg_id, sizeof(pch_dt->data), pch_dt->data, paging_group); LOG_BTS(bts, DPCU, LOGL_ERROR, "BTS model does not support sending immediate assignment via PCH!\n"); return -ENOTSUP; @@ -541,9 +541,6 @@ rc = -EIO; break; case PCU_IF_SAPI_PCH_DT: - /* DT = direct TLLI. A tlli is prefixed so that the BSC/BTS can confirm the sending of the downlink - * IMMEDIATE ASSIGNMENT or PAGING COMMAND towards the PCU using this TLLI as a reference. */ - if (data_req->len < sizeof(struct gsm_pcu_if_pch_dt)) { LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with invalid/small length %d\n", data_req->len); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifb3f257099b52c50e525768484f9e93282089d0f Gerrit-Change-Number: 34106 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34105 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Related: OS#5927 Change-Id: I779605858648e2a1c202c37e197a6e32e6ea3786 --- M include/osmo-bts/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/34105/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 3e3d6cc..b93822d 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -91,15 +91,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I779605858648e2a1c202c37e197a6e32e6ea3786 Gerrit-Change-Number: 34105 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcuif_proto: rename tlli to msg_id

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34103 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... pcuif_proto: rename tlli to msg_id To confirm downlink IMMEDIATE ASSIGNMENT messages, we use the TLLI as an identifier and the related struct member is also called "tlli". Unfortunately this is misleading since the message identifier does not necessarly have to be a TLLI. It is just an implementation detail that osmo-pcu uses the TLLI as a message identifier. To make that clear, lets rename the tlli member (and variable and parameter names where it is passed on) to "msg_id". (Since this change only renames variables and struct members it will not break compatibility with other programs that use the PCUIF) Related: OS#5927 Depends: osmo-pcu.git I4a25039dfe329e68879bc68936e49c4b190625e6 Change-Id: Ie6b34d5df64f4bed6b14581c7957dcba6af44136 --- M include/osmo-bts/paging.h M include/osmo-bts/pcu_if.h M include/osmo-bts/pcuif_proto.h M src/common/paging.c M src/common/pcu_sock.c 5 files changed, 38 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/34103/1 diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index 93e7b38..e74ba3c 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -86,7 +86,7 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, uint32_t tlli, const char *imsi, bool confirm, const uint8_t *macblock); +int paging_add_macblock(struct paging_state *ps, uint32_t msg_id, const char *imsi, bool confirm, const uint8_t *macblock); /* Paging rest octests */ void append_p1_rest_octets(struct bitvec *bv, const struct p1_rest_octets *p1ro, diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index d6e5d24..59e1d3d 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -23,7 +23,7 @@ int pcu_tx_time_ind(uint32_t fn); int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t tlli); +int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); int pcu_sock_send(struct msgb *msg); diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index bae6cda..3e3d6cc 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -17,7 +17,7 @@ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (with direct tlli) */ +#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_ACT_REQ 0x40 /* activate/deactivate PDCH */ @@ -35,7 +35,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using TLLI) */ +#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -87,10 +87,10 @@ int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); -/* data confirmation with direct tlli (instead of raw mac block with tlli) */ +/* data confirmation with message id (instead of raw mac block) */ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; - uint32_t tlli; + uint32_t msg_id; uint32_t fn; uint16_t arfcn; uint8_t trx_nr; @@ -233,8 +233,8 @@ /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ struct gsm_pcu_if_pch_dt { - /* TLLI as reference for confirmation */ - uint32_t tlli; + /* message id as reference for confirmation */ + uint32_t msg_id; /* IMSI (to derive paging group) */ char imsi[OSMO_IMSI_BUF_SIZE]; /* GSM mac-block (with immediate assignment message) */ diff --git a/src/common/paging.c b/src/common/paging.c index 914a4b5..ebfb84b 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -65,7 +65,7 @@ struct { uint8_t msg[GSM_MACBLOCK_LEN]; bool confirm; - uint32_t tlli; /* used as identifier for confirmation */ + uint32_t msg_id; /* used as identifier for confirmation */ } macblock; } u; }; @@ -293,7 +293,7 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, uint32_t tlli, const char *imsi, bool confirm, const uint8_t *macblock) +int paging_add_macblock(struct paging_state *ps, uint32_t msg_id, const char *imsi, bool confirm, const uint8_t *macblock) { struct llist_head *group_q; struct paging_record *pr; @@ -322,7 +322,7 @@ paging_group); memcpy(pr->u.macblock.msg, macblock, GSM_MACBLOCK_LEN); pr->u.macblock.confirm = confirm; - pr->u.macblock.tlli = tlli; + pr->u.macblock.msg_id = msg_id; /* enqueue the new message to the HEAD of the queue */ llist_add(&pr->list, group_q); @@ -734,7 +734,7 @@ GSM_MACBLOCK_LEN); /* send a confirmation back (if required) */ if (pr[num_pr]->u.macblock.confirm) - pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.tlli); + pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg_id); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 9e34fe8..ad645a0 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -618,7 +618,7 @@ return pcu_sock_send(msg); } -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t tlli) +int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id) { struct gsm_bts *bts; struct msgb *msg; @@ -635,7 +635,7 @@ pcu_prim = (struct gsm_pcu_if *) msg->data; pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { .sapi = PCU_IF_SAPI_PCH_DT, - .tlli = tlli, + .msg_id = msg_id, .fn = fn, }; @@ -689,7 +689,7 @@ gsm_pcu_if_pch_dt = (struct gsm_pcu_if_pch_dt *)data_req->data; gsm48_imm_ass = (struct gsm48_imm_ass *)gsm_pcu_if_pch_dt->data; confirm = (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS); - rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch_dt->tlli, + rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch_dt->msg_id, gsm_pcu_if_pch_dt->imsi, confirm, gsm_pcu_if_pch_dt->data); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie6b34d5df64f4bed6b14581c7957dcba6af44136 Gerrit-Change-Number: 34103 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34104 ) Change subject: pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf ...................................................................... pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf The function pcu_tx_pch_data_cnf() gets a parameter fn (frame number). This parameter is then used to populate the member fn in gsm_pcu_if_data_cnf_dt of the PCUIF protocol. However, the PCU only uses this parameter for logging and nothing else. Hence it it is not needed and we can remove it. Related: OS#5927 Depends: osmo-pcu.git I35bc99eaec5d0287ae3916bc668f0babaddfd6ce Change-Id: Id1c8fa77725129ec2ea7e92e1df493f35a277659 --- M include/osmo-bts/pcu_if.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/34104/1 diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 59e1d3d..4b37560 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -23,7 +23,7 @@ int pcu_tx_time_ind(uint32_t fn); int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id); +int pcu_tx_pch_data_cnf(uint32_t msg_id); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); int pcu_sock_send(struct msgb *msg); diff --git a/src/common/paging.c b/src/common/paging.c index ebfb84b..9738bd6 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -734,7 +734,7 @@ GSM_MACBLOCK_LEN); /* send a confirmation back (if required) */ if (pr[num_pr]->u.macblock.confirm) - pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg_id); + pcu_tx_pch_data_cnf(pr[num_pr]->u.macblock.msg_id); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index ad645a0..67958f6 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -618,7 +618,7 @@ return pcu_sock_send(msg); } -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id) +int pcu_tx_pch_data_cnf(uint32_t msg_id) { struct gsm_bts *bts; struct msgb *msg; @@ -636,7 +636,6 @@ pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { .sapi = PCU_IF_SAPI_PCH_DT, .msg_id = msg_id, - .fn = fn, }; return pcu_sock_send(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id1c8fa77725129ec2ea7e92e1df493f35a277659 Gerrit-Change-Number: 34104 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: bts: get rid of fn parameter in bts_rcv_imm_ass_cnf

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34101 ) Change subject: bts: get rid of fn parameter in bts_rcv_imm_ass_cnf ...................................................................... bts: get rid of fn parameter in bts_rcv_imm_ass_cnf The function bts_rcv_imm_ass_cnf, which processes the confirmation message from osmo-bts or osmo-bsc has an fn (frame number) parameter. This parameter not used for anything other than logging. The source of this frame number parameter is the conformation message that comes from osmo-pcu or osmo-bsc. In the case of osmo-bsc the frame number is always 0, since osmo-bsc uses RSL and can not know the exact frame numbers. since we do not really need the frame number for the confirmation, lets remove the fn parameter entirely. Related: OS#5927 Change-Id: I35bc99eaec5d0287ae3916bc668f0babaddfd6ce --- M src/bts.cpp M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 34 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/34101/1 diff --git a/src/bts.cpp b/src/bts.cpp index fe48018..6bc415f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -666,7 +666,7 @@ return best_first_tfi; } -static int tlli_from_imm_ass(uint32_t *tlli, const uint8_t *data, uint32_t fn) +static int tlli_from_imm_ass(uint32_t *tlli, const uint8_t *data) { const struct gsm48_imm_ass *imm_ass = (struct gsm48_imm_ass *)data; uint8_t plen; @@ -680,9 +680,9 @@ data += 1 + plen; if ((*data & 0xf0) != 0xd0) { - LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but rest " + LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but rest " "octets do not start with bit sequence 'HH01' " - "(Packet Downlink Assignment)\n", fn); + "(Packet Downlink Assignment)\n"); return -EINVAL; } @@ -696,7 +696,7 @@ return 0; } -int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli, uint32_t fn) +int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli) { struct gprs_rlcmac_dl_tbf *dl_tbf; GprsMs *ms; @@ -710,30 +710,30 @@ /* Extract TLLI from the presented IMMEDIATE ASSIGNMENT * (if present and only when TLLI that is supplied as function parameter is valid.) */ if (data && tlli == GSM_RESERVED_TMSI) { - rc = tlli_from_imm_ass(&tlli, data, fn); + rc = tlli_from_imm_ass(&tlli, data); if (rc != 0) return -EINVAL; } /* Make sure TLLI is valid */ if (tlli == GSM_RESERVED_TMSI) { - LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but TLLI is invalid!\n", fn); + LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but TLLI is invalid!\n"); return -EINVAL; } /* Find related TBF and send confirmation signal to FSM */ ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { - LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", fn, tlli); + LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", tlli); return -EINVAL; } dl_tbf = ms_dl_tbf(ms); if (!dl_tbf) { - LOGPMS(ms, DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but MS has no DL TBF!\n", fn); + LOGPMS(ms, DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but MS has no DL TBF!\n"); return -EINVAL; } - LOGPTBFDL(dl_tbf, LOGL_DEBUG, "FN=%u Got IMM.ASS confirm\n", fn); + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "Got IMM.ASS confirm\n"); osmo_fsm_inst_dispatch(dl_tbf->state_fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL); return 0; diff --git a/src/bts.h b/src/bts.h index 9a18cf3..3fe4503 100644 --- a/src/bts.h +++ b/src/bts.h @@ -307,7 +307,7 @@ int bts_rcv_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip); int bts_rcv_ptcch_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip); -int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli, uint32_t fn); +int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli); void bts_send_gsmtap(struct gprs_rlcmac_bts *bts, enum pcu_gsmtap_category categ, bool uplink, uint8_t trx_no, diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 8597dd4..a022647 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -534,15 +534,13 @@ static int pcu_rx_data_cnf(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data *data_cnf) { int rc = 0; - int current_fn = bts_current_frame_number(bts); - LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d cur_fn=%d\n", - data_cnf->sapi, data_cnf->fn, current_fn); + LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf->sapi); switch (data_cnf->sapi) { case PCU_IF_SAPI_PCH: if (data_cnf->data[2] == GSM48_MT_RR_IMM_ASS) - bts_rcv_imm_ass_cnf(bts, data_cnf->data, GSM_RESERVED_TMSI, data_cnf->fn); + bts_rcv_imm_ass_cnf(bts, data_cnf->data, GSM_RESERVED_TMSI); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with " @@ -556,14 +554,12 @@ static int pcu_rx_data_cnf_dt(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf_dt *data_cnf_dt) { int rc = 0; - int current_fn = bts_current_frame_number(bts); - LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d cur_fn=%d\n", - data_cnf_dt->sapi, data_cnf_dt->fn, current_fn); + LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf_dt->sapi); switch (data_cnf_dt->sapi) { case PCU_IF_SAPI_PCH_DT: - bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id, data_cnf_dt->fn); + bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35bc99eaec5d0287ae3916bc668f0babaddfd6ce Gerrit-Change-Number: 34101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34102 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Change-Id: Id6109264e4144c2ab7b8410d4087705d857cd4c9 Related: OS#5927 --- M include/osmocom/pcu/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/34102/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 5f07fe5..b06bbec 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -98,15 +98,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id6109264e4144c2ab7b8410d4087705d857cd4c9 Gerrit-Change-Number: 34102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: rename tlli to msg_id

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34100 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... pcuif_proto: rename tlli to msg_id To confirm downlink IMMEDIATE ASSIGNMENT messages, we use the TLLI as an identifier and the related struct member is also called "tlli". Unfortunately this is misleading since the message identifier does not necessarly have to be a TLLI. It is just an implementation detail that osmo-pcu uses the TLLI as a message identifier. To make that clear, lets rename the tlli member (and variable and parameter names where it is passed on) to "msg_id". (Since this change only renames variables and struct members it will not break compatibility with other programs that use the PCUIF) Related: OS#5927 Change-Id: I4a25039dfe329e68879bc68936e49c4b190625e6 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h 3 files changed, 33 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/34100/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 1dda160..5f07fe5 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -18,7 +18,7 @@ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (with direct tlli) */ +#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_E1_CCU_IND 0x33 /* retrieve E1 CCU comm. parameters */ @@ -41,6 +41,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ +#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ #define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using TLLI) */ /* flags */ @@ -93,10 +94,10 @@ int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); -/* data confirmation with direct tlli (instead of raw mac block with tlli) */ +/* data confirmation with message id (instead of raw mac block) */ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; - uint32_t tlli; + uint32_t msg_id; uint32_t fn; uint16_t arfcn; uint8_t trx_nr; @@ -274,8 +275,8 @@ /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ struct gsm_pcu_if_pch_dt { - /* TLLI as reference for confirmation */ - uint32_t tlli; + /* message id as reference for confirmation */ + uint32_t msg_id; /* IMSI (to derive paging group) */ char imsi[OSMO_IMSI_BUF_SIZE]; /* GSM mac-block (with immediate assignment message) */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index ed64cc1..8597dd4 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -300,11 +300,11 @@ /* Send a MAC block via the paging channel. This will (obviously) only work for MAC blocks that contain an * IMMEDIATE ASSIGNMENT or a PAGING COMMAND message. In case the MAC block contains an IMMEDIATE ASSIGNMENT * message, the receiving end is required to confirm when the IMMEDIATE ASSIGNMENT has been sent. */ -void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t tlli) +void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id) { struct gsm_pcu_if_pch_dt pch_dt = { 0 }; - pch_dt.tlli = tlli; + pch_dt.msg_id = msg_id; if (imsi) OSMO_STRLCPY_ARRAY(pch_dt.imsi, imsi); /* OS#6097: if strlen(pch_dt.imsi) == 0: We assume the MS is in non-DRX @@ -563,7 +563,7 @@ switch (data_cnf_dt->sapi) { case PCU_IF_SAPI_PCH_DT: - bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->tlli, data_cnf_dt->fn); + bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id, data_cnf_dt->fn); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi); @@ -789,7 +789,7 @@ /* NOTE: The classic way to confirm an IMMEDIATE assignment is to send the whole MAC block payload back to the * PCU. So it is the MAC block itsself that serves a reference for the confirmation. This method has certain - * disadvantages so it was replaced with a method that uses the TLLI as a reference ("Direct TLLI"). This new + * disadvantages so it was replaced with a method that uses the TLLI as a reference (msg_id). This new * method will replace the old one. The code that handles the old method will be removed in the foreseeable * future. (see also OS#5927) */ if (info_ind->version == 0x0a) { diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index bc036bf..3ff17dc 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -156,7 +156,7 @@ 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); -void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t tlli); +void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id); 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/+/34100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4a25039dfe329e68879bc68936e49c4b190625e6 Gerrit-Change-Number: 34100 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Ensure correct ownership of msgb when sending

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34098 ) Change subject: osmo_io: Ensure correct ownership of msgb when sending ...................................................................... osmo_io: Ensure correct ownership of msgb when sending Use talloc_steal() if a msg is passed in to osmo_io when sending. This avoids the message being free()d early in case the original parent is free()d. Change-Id: Ie36bd68a8bd63e67d76fb41996f8fdf99f51d96c --- M src/core/osmo_io.c 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 37127c1..f9d04fd 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -102,6 +102,8 @@ talloc_free(hdr); return NULL; } + } else { + talloc_steal(iofd->msgb_alloc.ctx, msg); } hdr->action = action; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie36bd68a8bd63e67d76fb41996f8fdf99f51d96c Gerrit-Change-Number: 34098 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-msc[master]: trans_lcls_compose(): Set PLMN fron cell currently in use

by pespin

Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, neels, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/33735 to look at the new patch set (#2). Change subject: trans_lcls_compose(): Set PLMN fron cell currently in use ...................................................................... trans_lcls_compose(): Set PLMN fron cell currently in use The MS in general provides the Selected PLMN ID (IE) in the Complete Layer 3 Information message. osmo-msc handles that message in msc_a_ran_dec_from_msc_i() and stores the information of the PLMN in msc_a->via_cell. If no PLMN information is provided in the message, then at that same place the PLMN configured in the VTY is taken as an implicit default. This patch changes trans_lcls_compose() to use the PLMN stored in msc_a->via_cell instead of the VTY configured one, meaning the PLMN provided by the MS (through the RAN in use) is used if available (otherwise the VTY-configure one is still used, as before). With this patch the PLMN VTY config option use is relegated to a single point of use in msc_a_ran_dec_from_msc_i() where the Complete Layer 3 Information is used. As a result, it becomes clear now that the VTY config is only applied in the scenario where no PLMN is provided at that time. Related: SYS#6360 Change-Id: Ibad0005a1d7cef64dd8fefa3e554ba99a06c3666 --- M src/libmsc/transaction.c 1 file changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/33735/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibad0005a1d7cef64dd8fefa3e554ba99a06c3666 Gerrit-Change-Number: 33735 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 4 weeks

1
0
0 0

[S] Change in osmo-msc[master]: Tx Loc UPD ACC: Use PLMN provided by subscr

by pespin

Attention is currently required from: pespin, fixeria. Hello osmith, Jenkins Builder, neels, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/33732 to look at the new patch set (#2). Change subject: Tx Loc UPD ACC: Use PLMN provided by subscr ...................................................................... Tx Loc UPD ACC: Use PLMN provided by subscr The MS in general provides the Selected PLMN ID (IE) in the Complete Layer 3 Information message. osmo-msc handles that message in msc_a_ran_dec_from_msc_i() and stores the information of the PLMN in msc_a->via_cell. If no PLMN information is provided in the message, then at that same place the PLMN configured in the VTY is taken as an implicit default. The PLMN information stored in msc_a->via_cell is then finally stored into vsub->cgi in evaluate_acceptance_outcome(). This patch changes gsm0408_loc_upd_acc() to avoid re-applying the PLMN configured at the VTY again, and instead use whatever is already in vsub->cgi. This is more correct since the PLMN provided by the MS takes precedence over the implicitly configured one, meaning several PLMNs can be handled. Otherwise, the code is always overwriting the PLMN announced by the network on a specific RAN with the one in the MSC, which may end up with unexpected results. Related: SYS#6360 Change-Id: I421bd63a264db2bf6e1c4a4eea976f389e87b332 --- M src/libmsc/gsm_04_08.c 1 file changed, 29 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/33732/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I421bd63a264db2bf6e1c4a4eea976f389e87b332 Gerrit-Change-Number: 33732 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Use MSG_NOSIGNAL to avoid SIGPIPE on write

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34099 ) Change subject: osmo_io: Use MSG_NOSIGNAL to avoid SIGPIPE on write ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85433124a8e80fc2aa19b551bdaf2655ef1eea2c Gerrit-Change-Number: 34099 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 13:33:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Ensure correct ownership of msgb when sending

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34098 ) Change subject: osmo_io: Ensure correct ownership of msgb when sending ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie36bd68a8bd63e67d76fb41996f8fdf99f51d96c Gerrit-Change-Number: 34098 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 13:33:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_DT

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 ) Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_DT ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > We agreed on IRC to rename the SAPI and don't pass "tlli" but a "msg_id". I am currently working on this. Unfortunately this generates some merge conflicts with the AGCH confirmation stuff. Let's focus on the field renaming now and when it is done I will rebase the AGCH confirmation patches. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 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: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 13:33:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Ensure correct ownership of msgb when sending

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34098 ) Change subject: osmo_io: Ensure correct ownership of msgb when sending ...................................................................... osmo_io: Ensure correct ownership of msgb when sending Use talloc_steal() if a msg is passed in to osmo_io when sending. This avoids the message being free()d early in case the original parent is free()d. Change-Id: Ie36bd68a8bd63e67d76fb41996f8fdf99f51d96c --- M src/core/osmo_io.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/34098/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 37127c1..f9d04fd 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -102,6 +102,8 @@ talloc_free(hdr); return NULL; } + } else { + talloc_steal(iofd->msgb_alloc.ctx, msg); } hdr->action = action; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie36bd68a8bd63e67d76fb41996f8fdf99f51d96c Gerrit-Change-Number: 34098 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Use MSG_NOSIGNAL to avoid SIGPIPE on write

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34099 ) Change subject: osmo_io: Use MSG_NOSIGNAL to avoid SIGPIPE on write ...................................................................... osmo_io: Use MSG_NOSIGNAL to avoid SIGPIPE on write Change-Id: I85433124a8e80fc2aa19b551bdaf2655ef1eea2c --- M src/core/osmo_io.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/34099/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index f9d04fd..db1b5ad 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -321,7 +321,7 @@ if (!msghdr) return -ENOMEM; - msghdr->flags = 0; + msghdr->flags = MSG_NOSIGNAL; msghdr->iov[0].iov_base = msgb_data(msghdr->msg); msghdr->iov[0].iov_len = msgb_length(msghdr->msg); msghdr->hdr.msg_iov = &msghdr->iov[0]; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85433124a8e80fc2aa19b551bdaf2655ef1eea2c Gerrit-Change-Number: 34099 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34097 ) Change subject: ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0 Change-Id: I70c8d8fc61830cb46dcc580b7e344425f7c6c26d --- M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg index 329ea7d..7ccbc7b 100644 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg @@ -19,6 +19,8 @@ line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I70c8d8fc61830cb46dcc580b7e344425f7c6c26d Gerrit-Change-Number: 34097 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34097 ) Change subject: ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I70c8d8fc61830cb46dcc580b7e344425f7c6c26d Gerrit-Change-Number: 34097 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 05:45:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34097 ) Change subject: ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... ttcn3-hnbgw-latest: fixup for cnpool: bind CTRL to 0.0.0.0 Change-Id: I70c8d8fc61830cb46dcc580b7e344425f7c6c26d --- M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/97/34097/1 diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg index 329ea7d..7ccbc7b 100644 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg @@ -19,6 +19,8 @@ line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I70c8d8fc61830cb46dcc580b7e344425f7c6c26d Gerrit-Change-Number: 34097 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34096 ) Change subject: hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg ...................................................................... hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg Change-Id: Ib6175eee69a7f37f987f996049351b9e1a545f58 --- M ttcn3-hnbgw-test/osmo-stp.cfg 1 file changed, 17 insertions(+), 8 deletions(-) Approvals: neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/osmo-stp.cfg b/ttcn3-hnbgw-test/osmo-stp.cfg index fedf6a8..8d94b75 100644 --- a/ttcn3-hnbgw-test/osmo-stp.cfg +++ b/ttcn3-hnbgw-test/osmo-stp.cfg @@ -41,8 +41,8 @@ routing-key 1 0.23.4 asp virt-msc1-0 23907 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-msc1 m3ua @@ -50,8 +50,8 @@ routing-key 3 0.0.2 asp virt-msc2-0 23909 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-msc2 m3ua @@ -68,8 +68,8 @@ routing-key 2 0.23.1 asp virt-sgsn1-0 23908 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-sgsn1 m3ua @@ -77,8 +77,8 @@ routing-key 4 0.1.2 asp virt-sgsn2-0 23910 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-sgsn2 m3ua -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib6175eee69a7f37f987f996049351b9e1a545f58 Gerrit-Change-Number: 34096 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34096 ) Change subject: hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib6175eee69a7f37f987f996049351b9e1a545f58 Gerrit-Change-Number: 34096 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 05:12:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34096 ) Change subject: hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg ...................................................................... hnbgw: fixup for cnpool: fix ASP IP addresses in osmo-stp.cfg Change-Id: Ib6175eee69a7f37f987f996049351b9e1a545f58 --- M ttcn3-hnbgw-test/osmo-stp.cfg 1 file changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/96/34096/1 diff --git a/ttcn3-hnbgw-test/osmo-stp.cfg b/ttcn3-hnbgw-test/osmo-stp.cfg index fedf6a8..8d94b75 100644 --- a/ttcn3-hnbgw-test/osmo-stp.cfg +++ b/ttcn3-hnbgw-test/osmo-stp.cfg @@ -41,8 +41,8 @@ routing-key 1 0.23.4 asp virt-msc1-0 23907 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-msc1 m3ua @@ -50,8 +50,8 @@ routing-key 3 0.0.2 asp virt-msc2-0 23909 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-msc2 m3ua @@ -68,8 +68,8 @@ routing-key 2 0.23.1 asp virt-sgsn1-0 23908 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-sgsn1 m3ua @@ -77,8 +77,8 @@ routing-key 4 0.1.2 asp virt-sgsn2-0 23910 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 172.18.35.200 + remote-ip 172.18.35.203 role sg sctp-role server as virt-sgsn2 m3ua -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib6175eee69a7f37f987f996049351b9e1a545f58 Gerrit-Change-Number: 34096 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup: adjust with-pfcp cfg like without-pfcp

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34095 ) Change subject: hnbgw: fixup: adjust with-pfcp cfg like without-pfcp ...................................................................... hnbgw: fixup: adjust with-pfcp cfg like without-pfcp Change-Id: Ice5aa8a6db512edad3535a55c5dba841670837ec --- M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 1 file changed, 17 insertions(+), 10 deletions(-) Approvals: neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg index b56ac14..377fad8 100644 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg @@ -8,17 +8,20 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category-hex 1 + logging color 0 + logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last logging level set-all debug ! line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua @@ -68,13 +71,8 @@ mgcp mgw local-ip 172.18.35.20 mgw remote-ip 172.18.35.203 - pfcp - remote-addr 172.18.35.203 - local-addr 172.18.35.20 - # so far HNBGW_Tests.ttcn does not heed the port an Assoc Setup Req came from, it always responds to port 8805 - local-port 8805 - # send PFCP Assoc Setup Req more often - timer pfcp x26 5 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 msc 0 remote-addr msc-naught -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ice5aa8a6db512edad3535a55c5dba841670837ec Gerrit-Change-Number: 34095 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in osmocom-bb[master]: Fix VTY command to set IMEISV.

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33836 ) Change subject: Fix VTY command to set IMEISV. ...................................................................... Fix VTY command to set IMEISV. The pointer and size must given for the SV portion of the character array only. Fixes: CID#314049, CID#314048 Change-Id: Ieff4ca886dec71aae1b6ecf2b623d600426580da --- M src/host/layer23/src/common/vty.c 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 526db6f..dd80a14 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -819,7 +819,8 @@ OSMO_STRLCPY_ARRAY(set->imei, argv[0]); OSMO_STRLCPY_ARRAY(set->imeisv, argv[0]); - OSMO_STRLCPY_ARRAY(set->imeisv + 15, sv); + osmo_strlcpy(set->imeisv + GSM23003_IMEI_NUM_DIGITS, sv, + sizeof(set->imeisv) - GSM23003_IMEI_NUM_DIGITS); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ieff4ca886dec71aae1b6ecf2b623d600426580da Gerrit-Change-Number: 33836 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup: adjust with-pfcp cfg like without-pfcp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34095 ) Change subject: hnbgw: fixup: adjust with-pfcp cfg like without-pfcp ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ice5aa8a6db512edad3535a55c5dba841670837ec Gerrit-Change-Number: 34095 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 04:30:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup: adjust with-pfcp cfg like without-pfcp

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34095 ) Change subject: hnbgw: fixup: adjust with-pfcp cfg like without-pfcp ...................................................................... hnbgw: fixup: adjust with-pfcp cfg like without-pfcp Change-Id: Ice5aa8a6db512edad3535a55c5dba841670837ec --- M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 1 file changed, 17 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/34095/1 diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg index b56ac14..377fad8 100644 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg @@ -8,17 +8,20 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category-hex 1 + logging color 0 + logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last logging level set-all debug ! line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua @@ -68,13 +71,8 @@ mgcp mgw local-ip 172.18.35.20 mgw remote-ip 172.18.35.203 - pfcp - remote-addr 172.18.35.203 - local-addr 172.18.35.20 - # so far HNBGW_Tests.ttcn does not heed the port an Assoc Setup Req came from, it always responds to port 8805 - local-port 8805 - # send PFCP Assoc Setup Req more often - timer pfcp x26 5 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 msc 0 remote-addr msc-naught -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ice5aa8a6db512edad3535a55c5dba841670837ec Gerrit-Change-Number: 34095 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: re-add lost MGCP cfg

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34094 ) Change subject: hnbgw: fixup for cnpool: re-add lost MGCP cfg ...................................................................... hnbgw: fixup for cnpool: re-add lost MGCP cfg Change-Id: I3491e2f9a675b737c12d84484f6d0219e8db0900 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 37bd01c..377fad8 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -68,6 +68,9 @@ local-ip 172.18.35.20 local-port 29169 hnbap-allow-tmsi 1 + mgcp + mgw local-ip 172.18.35.20 + mgw remote-ip 172.18.35.203 # don't spam RANAP RESET messages for up to eight CN links across all tests timer hnbgw T4 60 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3491e2f9a675b737c12d84484f6d0219e8db0900 Gerrit-Change-Number: 34094 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: re-add lost MGCP cfg

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34094 ) Change subject: hnbgw: fixup for cnpool: re-add lost MGCP cfg ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3491e2f9a675b737c12d84484f6d0219e8db0900 Gerrit-Change-Number: 34094 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 04:26:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: re-add lost MGCP cfg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34094 ) Change subject: hnbgw: fixup for cnpool: re-add lost MGCP cfg ...................................................................... hnbgw: fixup for cnpool: re-add lost MGCP cfg Change-Id: I3491e2f9a675b737c12d84484f6d0219e8db0900 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/34094/1 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 37bd01c..377fad8 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -68,6 +68,9 @@ local-ip 172.18.35.20 local-port 29169 hnbap-allow-tmsi 1 + mgcp + mgw local-ip 172.18.35.20 + mgw remote-ip 172.18.35.203 # don't spam RANAP RESET messages for up to eight CN links across all tests timer hnbgw T4 60 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3491e2f9a675b737c12d84484f6d0219e8db0900 Gerrit-Change-Number: 34094 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: tweak log

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34093 ) Change subject: hnbgw: tweak log ...................................................................... hnbgw: tweak log Change-Id: I974272b800bad4efc277d9832357e9caf34e2dd8 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index ff6172b..37bd01c 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -8,12 +8,13 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category-hex 1 + logging color 0 + logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last logging level set-all debug ! line vty -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I974272b800bad4efc277d9832357e9caf34e2dd8 Gerrit-Change-Number: 34093 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: tweak log

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34093 ) Change subject: hnbgw: tweak log ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I974272b800bad4efc277d9832357e9caf34e2dd8 Gerrit-Change-Number: 34093 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 08 Aug 2023 04:24:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: tweak log

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34093 ) Change subject: hnbgw: tweak log ...................................................................... hnbgw: tweak log Change-Id: I974272b800bad4efc277d9832357e9caf34e2dd8 --- M ttcn3-hnbgw-test/osmo-hnbgw.cfg 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/34093/1 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index ff6172b..37bd01c 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -8,12 +8,13 @@ ! log stderr logging filter all 1 - logging color 1 - logging print category-hex 1 + logging color 0 + logging print category-hex 0 logging print category 1 + logging print level 1 logging print thread-id 0 logging print extended-timestamp 1 - logging print file 1 + logging print file basename last logging level set-all debug ! line vty -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I974272b800bad4efc277d9832357e9caf34e2dd8 Gerrit-Change-Number: 34093 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34092 ) Change subject: hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name ...................................................................... hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name Change-Id: I80ecfc694adb1cb44dddec30e845237676a4eead --- M ttcn3-hnbgw-test/jenkins.sh 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index ece6f16..308d562 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -37,7 +37,7 @@ fi mkdir $base_dir/stp - cp "$stp_cfg" $base_dir/stp/ + cp "$stp_cfg" $base_dir/stp/osmo-stp.cfg mkdir $base_dir/hnbgw mkdir $base_dir/hnbgw/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I80ecfc694adb1cb44dddec30e845237676a4eead Gerrit-Change-Number: 34092 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34092 ) Change subject: hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: trying to fix test breakage -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I80ecfc694adb1cb44dddec30e845237676a4eead Gerrit-Change-Number: 34092 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 04:01:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34092 ) Change subject: hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name ...................................................................... hnbgw-latest: fixup for cnpool: use correct osmo-stp.cfg file name Change-Id: I80ecfc694adb1cb44dddec30e845237676a4eead --- M ttcn3-hnbgw-test/jenkins.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/34092/1 diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index ece6f16..308d562 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -37,7 +37,7 @@ fi mkdir $base_dir/stp - cp "$stp_cfg" $base_dir/stp/ + cp "$stp_cfg" $base_dir/stp/osmo-stp.cfg mkdir $base_dir/hnbgw mkdir $base_dir/hnbgw/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I80ecfc694adb1cb44dddec30e845237676a4eead Gerrit-Change-Number: 34092 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct cfg file name

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34091 ) Change subject: hnbgw-latest: fixup for cnpool: use correct cfg file name ...................................................................... hnbgw-latest: fixup for cnpool: use correct cfg file name Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 --- M ttcn3-hnbgw-test/jenkins.sh 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 97ce303..ece6f16 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -41,7 +41,7 @@ mkdir $base_dir/hnbgw mkdir $base_dir/hnbgw/unix - cp "$hnbgw_cfg" $base_dir/hnbgw/ + cp "$hnbgw_cfg" $base_dir/hnbgw/osmo-hnbgw.cfg mkdir $base_dir/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 Gerrit-Change-Number: 34091 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct cfg file name

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34091 ) Change subject: hnbgw-latest: fixup for cnpool: use correct cfg file name ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: i broke all hnbgw tests, trying to fix it -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 Gerrit-Change-Number: 34091 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 03:47:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw-latest: fixup for cnpool: use correct cfg file name

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34091 ) Change subject: hnbgw-latest: fixup for cnpool: use correct cfg file name ...................................................................... hnbgw-latest: fixup for cnpool: use correct cfg file name Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 --- M ttcn3-hnbgw-test/jenkins.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/34091/1 diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 97ce303..ece6f16 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -41,7 +41,7 @@ mkdir $base_dir/hnbgw mkdir $base_dir/hnbgw/unix - cp "$hnbgw_cfg" $base_dir/hnbgw/ + cp "$hnbgw_cfg" $base_dir/hnbgw/osmo-hnbgw.cfg mkdir $base_dir/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I40c2aca069114f9a07840eed11e608921ed65d26 Gerrit-Change-Number: 34091 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34090 ) Change subject: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b --- M ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved; Verified diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg index 61d6236..07413a4 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg @@ -19,6 +19,8 @@ line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 9f75d46..ff6172b 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -19,6 +19,8 @@ line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b Gerrit-Change-Number: 34090 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34090 ) Change subject: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: i broke all hnbgw tests, trying to fix it -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b Gerrit-Change-Number: 34090 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Aug 2023 03:41:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

10 months

1
0
0 0

[S] Change in docker-playground[master]: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34090 ) Change subject: hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 ...................................................................... hnbgw: fixup for cnpool: bind CTRL to 0.0.0.0 Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b --- M ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/34090/1 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg index 61d6236..07413a4 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg @@ -19,6 +19,8 @@ line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 9f75d46..ff6172b 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -19,6 +19,8 @@ line vty no login bind 0.0.0.0 +ctrl + bind 0.0.0.0 ! cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia71688f5468b3eabdead2996cc1470e467b9c10b Gerrit-Change-Number: 34090 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

10 months

1
0
0 0

[L] Change in docker-playground[master]: hnbgw: adjust cfg for cnpool tests

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33668 ) Change subject: hnbgw: adjust cfg for cnpool tests ...................................................................... hnbgw: adjust cfg for cnpool tests Config changes matching cnpool tests added in osmo-ttcn3-hacks, see 'Related'. Keep a copy of the old config files named "-legacy", to not break the 'latest' tests, because osmo-hnbgw 'latest' does not yet support the new config options. Depends: osmo-ttcn3-hacks I027a059faed3f140f8801f84338956cd004043b5 Change-Id: I94aa0b2adfc48b98cb4b1efe595c2432fc603d6c --- M ttcn3-hnbgw-test/jenkins.sh A ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/osmo-hnbgw.cfg A ttcn3-hnbgw-test/osmo-stp-legacy.cfg M ttcn3-hnbgw-test/osmo-stp.cfg A ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 7 files changed, 400 insertions(+), 15 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 51dd825..97ce303 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -82,9 +82,19 @@ docker_kill_wait ${BUILD_TAG}-stp } +osmo_stp_cfg="osmo-stp.cfg" +osmo_hnbgw_cfg="osmo-hnbgw.cfg" +osmo_hnbgw_with_pfcp_cfg="with-pfcp/osmo-hnbgw.cfg" + +if image_suffix_is_latest; then + osmo_stp_cfg="osmo-stp-legacy.cfg" + osmo_hnbgw_cfg="osmo-hnbgw-legacy.cfg" + osmo_hnbgw_with_pfcp_cfg="with-pfcp/osmo-hnbgw-legacy.cfg" +fi + echo Testing without PFCP -run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg" +run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_cfg echo Testing with PFCP mkdir "$VOL_BASE_DIR_PFCP" -run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg" +run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" $osmo_stp_cfg $osmo_hnbgw_with_pfcp_cfg diff --git a/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg new file mode 100644 index 0000000..61d6236 --- /dev/null +++ b/ttcn3-hnbgw-test/osmo-hnbgw-legacy.cfg @@ -0,0 +1,48 @@ +! +! OsmoHNBGW (1.1.0) configuration saved from vty +!! +! +log gsmtap 172.18.35.203 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 1 + logging print category 1 + logging print thread-id 0 + logging print extended-timestamp 1 + logging print file 1 + logging level set-all debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + asp asp-clnt-msc-0 2905 2905 m3ua + local-ip 172.18.35.20 + remote-ip 172.18.35.200 + role asp + sctp-role client + point-code 0.23.5 + sccp-address msc + routing-indicator PC + point-code 0.23.4 + sccp-address sgsn + routing-indicator PC + point-code 0.23.1 +hnbgw + log-prefix hnb-id + iuh + local-ip 172.18.35.20 + local-port 29169 + hnbap-allow-tmsi 1 + iucs + remote-addr msc + iups + remote-addr sgsn + mgcp + mgw local-ip 172.18.35.20 + mgw remote-ip 172.18.35.203 diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg index 61d6236..9f75d46 100644 --- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg @@ -27,22 +27,101 @@ role asp sctp-role client point-code 0.23.5 - sccp-address msc + sccp-address msc-naught routing-indicator PC point-code 0.23.4 - sccp-address sgsn + + sccp-address msc-one + routing-indicator PC + point-code 0.0.2 + + sccp-address msc-two + routing-indicator PC + point-code 0.0.3 + + sccp-address msc-three + routing-indicator PC + point-code 0.0.4 + + sccp-address sgsn-naught routing-indicator PC point-code 0.23.1 + + sccp-address sgsn-one + routing-indicator PC + point-code 0.1.2 + + sccp-address sgsn-two + routing-indicator PC + point-code 0.1.3 + + sccp-address sgsn-three + routing-indicator PC + point-code 0.1.4 + hnbgw log-prefix hnb-id iuh local-ip 172.18.35.20 local-port 29169 hnbap-allow-tmsi 1 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 + +msc 0 + remote-addr msc-naught + +msc 1 + remote-addr msc-one + +msc 2 + remote-addr msc-two + +msc 3 + remote-addr msc-three + +sgsn 0 + remote-addr sgsn-naught + +sgsn 1 + remote-addr sgsn-one + +sgsn 2 + remote-addr sgsn-two + +sgsn 3 + remote-addr sgsn-three + +hnbgw iucs - remote-addr msc + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the MSCs: + nri null add 0 + # a NULL NRI that is also used by an MSC: + nri null add 1 +msc 0 + nri add 1 255 +msc 1 + nri add 256 511 +msc 2 + nri add 512 767 + # range 768-1000 is not assigned to any MSC on purpose +msc 3 + nri add 1001 1023 + +hnbgw iups - remote-addr sgsn - mgcp - mgw local-ip 172.18.35.20 - mgw remote-ip 172.18.35.203 + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the SGSNs: + nri null add 0 + # a NULL NRI that is also used by an SGSN: + nri null add 1 +sgsn 0 + nri add 1 255 +sgsn 1 + nri add 256 511 +sgsn 2 + nri add 512 767 + # range 768-1000 is not assigned to any SGSN on purpose +sgsn 3 + nri add 1001 1023 diff --git a/ttcn3-hnbgw-test/osmo-stp-legacy.cfg b/ttcn3-hnbgw-test/osmo-stp-legacy.cfg new file mode 100644 index 0000000..16ab3fa --- /dev/null +++ b/ttcn3-hnbgw-test/osmo-stp-legacy.cfg @@ -0,0 +1,56 @@ +! +! OsmoSTP (0.8.1) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + 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 notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug + logging level lmgcp notice +! +line vty + no login +! +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + asp virt-msc0-0 23905 2905 m3ua + local-ip 172.18.35.200 + remote-ip 172.18.35.203 + role sg + sctp-role server + as virt-msc0 m3ua + asp virt-msc0-0 + routing-key 1 0.23.4 + asp virt-sgsn0-0 23906 2905 m3ua + local-ip 172.18.35.200 + remote-ip 172.18.35.203 + role sg + sctp-role server + as virt-sgsn0 m3ua + asp virt-sgsn0-0 + routing-key 2 0.23.1 + + + route-table system + update route 0.23.4 7.255.7 linkset virt-msc0 + update route 0.23.1 7.255.7 linkset virt-sgsn0 + listen m3ua 2905 + accept-asp-connections dynamic-permitted diff --git a/ttcn3-hnbgw-test/osmo-stp.cfg b/ttcn3-hnbgw-test/osmo-stp.cfg index 16ab3fa..fedf6a8 100644 --- a/ttcn3-hnbgw-test/osmo-stp.cfg +++ b/ttcn3-hnbgw-test/osmo-stp.cfg @@ -39,6 +39,25 @@ as virt-msc0 m3ua asp virt-msc0-0 routing-key 1 0.23.4 + + asp virt-msc1-0 23907 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-msc1 m3ua + asp virt-msc1-0 + routing-key 3 0.0.2 + + asp virt-msc2-0 23909 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-msc2 m3ua + asp virt-msc2-0 + routing-key 5 0.0.3 + asp virt-sgsn0-0 23906 2905 m3ua local-ip 172.18.35.200 remote-ip 172.18.35.203 @@ -48,9 +67,30 @@ asp virt-sgsn0-0 routing-key 2 0.23.1 + asp virt-sgsn1-0 23908 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-sgsn1 m3ua + asp virt-sgsn1-0 + routing-key 4 0.1.2 + + asp virt-sgsn2-0 23910 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-sgsn2 m3ua + asp virt-sgsn2-0 + routing-key 6 0.1.3 route-table system update route 0.23.4 7.255.7 linkset virt-msc0 + update route 0.0.2 7.255.7 linkset virt-msc1 + update route 0.0.3 7.255.7 linkset virt-msc2 update route 0.23.1 7.255.7 linkset virt-sgsn0 + update route 0.1.2 7.255.7 linkset virt-sgsn1 + update route 0.1.3 7.255.7 linkset virt-sgsn2 listen m3ua 2905 accept-asp-connections dynamic-permitted diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg new file mode 100644 index 0000000..329ea7d --- /dev/null +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw-legacy.cfg @@ -0,0 +1,55 @@ +! +! OsmoHNBGW (1.1.0) configuration saved from vty +!! +! +log gsmtap 172.18.35.203 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 1 + logging print category 1 + logging print thread-id 0 + logging print extended-timestamp 1 + logging print file 1 + logging level set-all debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + asp asp-clnt-msc-0 2905 2905 m3ua + local-ip 172.18.35.20 + remote-ip 172.18.35.200 + role asp + sctp-role client + point-code 0.23.5 + sccp-address msc + routing-indicator PC + point-code 0.23.4 + sccp-address sgsn + routing-indicator PC + point-code 0.23.1 +hnbgw + log-prefix hnb-id + iuh + local-ip 172.18.35.20 + local-port 29169 + hnbap-allow-tmsi 1 + iucs + remote-addr msc + iups + remote-addr sgsn + mgcp + mgw local-ip 172.18.35.20 + mgw remote-ip 172.18.35.203 + pfcp + remote-addr 172.18.35.203 + local-addr 172.18.35.20 + # so far HNBGW_Tests.ttcn does not heed the port an Assoc Setup Req came from, it always responds to port 8805 + local-port 8805 + # send PFCP Assoc Setup Req more often + timer pfcp x26 5 diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg index 329ea7d..b56ac14 100644 --- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg +++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg @@ -27,22 +27,44 @@ role asp sctp-role client point-code 0.23.5 - sccp-address msc + sccp-address msc-naught routing-indicator PC point-code 0.23.4 - sccp-address sgsn + + sccp-address msc-one + routing-indicator PC + point-code 0.0.2 + + sccp-address msc-two + routing-indicator PC + point-code 0.0.3 + + sccp-address msc-three + routing-indicator PC + point-code 0.0.4 + + sccp-address sgsn-naught routing-indicator PC point-code 0.23.1 + + sccp-address sgsn-one + routing-indicator PC + point-code 0.1.2 + + sccp-address sgsn-two + routing-indicator PC + point-code 0.1.3 + + sccp-address sgsn-three + routing-indicator PC + point-code 0.1.4 + hnbgw log-prefix hnb-id iuh local-ip 172.18.35.20 local-port 29169 hnbap-allow-tmsi 1 - iucs - remote-addr msc - iups - remote-addr sgsn mgcp mgw local-ip 172.18.35.20 mgw remote-ip 172.18.35.203 @@ -53,3 +75,61 @@ local-port 8805 # send PFCP Assoc Setup Req more often timer pfcp x26 5 + +msc 0 + remote-addr msc-naught + +msc 1 + remote-addr msc-one + +msc 2 + remote-addr msc-two + +msc 3 + remote-addr msc-three + +sgsn 0 + remote-addr sgsn-naught + +sgsn 1 + remote-addr sgsn-one + +sgsn 2 + remote-addr sgsn-two + +sgsn 3 + remote-addr sgsn-three + +hnbgw + iucs + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the MSCs: + nri null add 0 + # a NULL NRI that is also used by an MSC: + nri null add 1 +msc 0 + nri add 1 255 +msc 1 + nri add 256 511 +msc 2 + nri add 512 767 + # range 768-1000 is not assigned to any MSC on purpose +msc 3 + nri add 1001 1023 + +hnbgw + iups + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the SGSNs: + nri null add 0 + # a NULL NRI that is also used by an SGSN: + nri null add 1 +sgsn 0 + nri add 1 255 +sgsn 1 + nri add 256 511 +sgsn 2 + nri add 512 767 + # range 768-1000 is not assigned to any SGSN on purpose +sgsn 3 + nri add 1001 1023 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I94aa0b2adfc48b98cb4b1efe595c2432fc603d6c Gerrit-Change-Number: 33668 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ctrl: f_counter_name_vals_get_n(): add start_idx, for hnbgw

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33483 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ctrl: f_counter_name_vals_get_n(): add start_idx, for hnbgw ...................................................................... ctrl: f_counter_name_vals_get_n(): add start_idx, for hnbgw Allow starting with a specific 'msc' / 'sgsn' instance without having to read all the lower numbers along. For HNBGW_Tests.ttcn. Change-Id: I9b74a1df9e115883b4b0ac0f606a370c6aca7f40 --- M library/Osmocom_CTRL_Functions.ttcn 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index 2c90de4..75f8646 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -233,10 +233,11 @@ /* Retrieve the first N instances' rate counter values of the given names */ function f_counter_name_vals_get_n(IPA_CTRL_PT pt, charstring instance_name := "msc", - integer instance_count, CounterNameVals counternames) + integer instance_count, CounterNameVals counternames, + integer start_idx := 0) return CounterNameValsList { var CounterNameValsList valslist; - for (var integer instance_nr := 0; instance_nr < instance_count; instance_nr := instance_nr + 1) { + for (var integer instance_nr := start_idx; instance_nr < start_idx + instance_count; instance_nr := instance_nr + 1) { valslist[instance_nr] := f_counter_name_vals_get(pt, instance_name, instance_nr, counternames); } log("retrieved rate counters: ", instance_name, ": ", valslist); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33483 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: I9b74a1df9e115883b4b0ac0f606a370c6aca7f40 Gerrit-Change-Number: 33483 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: do not duplicate MSC_RanOps

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33481 ) Change subject: hnbgw: do not duplicate MSC_RanOps ...................................................................... hnbgw: do not duplicate MSC_RanOps Change-Id: I556eb4293f51b56a526d4e60c3ac2aa357a8d3e7 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 10 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index a89837a..fb618b4 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -430,19 +430,7 @@ } /* MSC emulation */ - var RanOps ranops := { - ranap_create_cb := refers(RAN_Emulation.RanapExpectedCreateCallback), - ranap_unitdata_cb := omit, - ps_domain := false, - decode_dtap := false, - role_ms := false, - protocol := RAN_PROTOCOL_RANAP, - transport := RANAP_TRANSPORT_IuCS, - use_osmux := false, - bssap_reset_retries := 1, - sccp_addr_local := omit, - sccp_addr_peer := omit - }; + var RanOps ranops := MSC_RanOps; for (var integer i := 0; i < nr_msc; i := i + 1) { var integer cn_idx := FIRST_MSC_IDX + i; f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test", ranops); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33481 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: I556eb4293f51b56a526d4e60c3ac2aa357a8d3e7 Gerrit-Change-Number: 33481 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: call f_start_hnbs() by default

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33482 ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: call f_start_hnbs() by default ...................................................................... hnbgw: call f_start_hnbs() by default Most tests need to run f_start_hnbs() directly after f_init(), so make that the default behavior. The three tests that don't want f_start_hnbs() to run now pass a new arg, f_init(start_hnb := false). Change-Id: I2b29ce66aee0b2d57fa26e6110f06292c481ab6b --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 25 insertions(+), 20 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index fb618b4..f196e64 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -408,7 +408,8 @@ } /* global initialization function */ -function f_init(charstring id := "HNBGW", float guard_timeout := 30.0, integer nr_msc := 1, integer nr_sgsn := 1) runs on test_CT { +function f_init(charstring id := "HNBGW", float guard_timeout := 30.0, integer nr_msc := 1, integer nr_sgsn := 1, + boolean start_hnb := true) runs on test_CT { T_guard.start(guard_timeout); activate(as_Tguard()); @@ -447,6 +448,10 @@ f_init_mgcp(id); f_init_vty("VirtHNBGW"); + + if (start_hnb) { + f_start_hnbs(); + } } friend function f_shutdown_helper() runs on test_CT { @@ -828,7 +833,7 @@ testcase TC_hnb_register() runs on test_CT { g_num_hnbs := 1; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); f_shutdown_helper(); } @@ -837,7 +842,7 @@ * one should be rejected. */ testcase TC_hnb_register_duplicate() runs on test_CT { g_num_hnbs := 2; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); f_hnbap_register(1, 0, expect_reject := true); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); @@ -849,7 +854,7 @@ * applied. TS 25.469 8.2.4 */ testcase TC_hnb_register_duplicate_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); f_hnbap_register(0); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); @@ -860,7 +865,7 @@ * Related: OS#5676, SYS#6113 */ testcase TC_hnb_reregister_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; - f_init(); + f_init(start_hnb := false); f_hnbap_register(0); HNBAP[0].send(ts_HNBAP_HNBDe_Register(ts_HnbapCause(unspecified))); f_hnbap_register(0); @@ -913,7 +918,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(1)); vc_conn.done; @@ -925,7 +929,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(2, true)); vc_conn.done; @@ -952,7 +955,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); f_vty_set_sccp_max_optional_data(HNBGWVTY, 0); @@ -969,7 +971,6 @@ g_num_hnbs := 1; f_init(); - f_start_hnbs(); f_vty_set_sccp_max_optional_data(HNBGWVTY, 0); @@ -992,7 +993,6 @@ testcase TC_sccp_cr_limit() runs on test_CT { g_num_hnbs := 1; f_init(); - f_start_hnbs(); const Testdata_CR_Limits tests := { { data_len := 130, max_optional_data := -1, expect_separate_sccp_cr := false }, @@ -1250,7 +1250,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assignment), t_pars(3)); vc_conn.done; @@ -1288,7 +1287,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_fail), t_pars(4)); vc_conn.done; @@ -1330,7 +1328,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_release), t_pars(5)); vc_conn.done; @@ -1381,7 +1378,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_mgcp_to), t_pars(6)); vc_conn.done; @@ -1408,7 +1404,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_bidir), t_pars(3)); vc_conn.done; @@ -1419,7 +1414,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_bidir), t_pars(4, true)); vc_conn.done; @@ -1446,7 +1440,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_mo_disconnect), t_pars(5)); vc_conn.done; @@ -1457,7 +1450,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); vc_conn := f_start_handler_with_pars(refers(f_tc_ranap_mo_disconnect), t_pars(6)); vc_conn.done; @@ -1626,7 +1618,6 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); - f_start_hnbs(); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_with_pfcp), t_pars(7, ps_domain := true)); @@ -1690,7 +1681,6 @@ testcase TC_ps_rab_assignment_without_pfcp() runs on test_CT { var ConnHdlr vc_conn; f_init(); - f_start_hnbs(); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_without_pfcp), t_pars(7, ps_domain := true)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33482 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: I2b29ce66aee0b2d57fa26e6110f06292c481ab6b Gerrit-Change-Number: 33482 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: add CTRL port

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33484 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: add CTRL port ...................................................................... hnbgw: add CTRL port Change-Id: I4c06e1fda135d87ce52151fd574f481cd414722f --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index f196e64..84d0b3a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -79,6 +79,7 @@ /* IP address at which the test binds */ charstring mp_hnbgw_ip := "127.0.0.1"; integer mp_hnbgw_iuh_port := 29169; + integer mp_hnbgw_ctrl_port := 4262; charstring mp_mgw_ip := "127.0.0.1"; integer mp_mgw_port := 2427; @@ -430,6 +431,8 @@ f_init_hnodeb(testcasename(), i, rua_ops); } + f_ipa_ctrl_start_client(mp_hnbgw_ip, mp_hnbgw_ctrl_port); + /* MSC emulation */ var RanOps ranops := MSC_RanOps; for (var integer i := 0; i < nr_msc; i := i + 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33484 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: I4c06e1fda135d87ce52151fd574f481cd414722f Gerrit-Change-Number: 33484 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: CN links: implement 'allow attach'

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33485 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: CN links: implement 'allow attach' ...................................................................... hnbgw: CN links: implement 'allow attach' Prep for I027a059faed3f140f8801f84338956cd004043b5 Change-Id: I5c9db4b31298ca9855b4390481a709f863459172 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 89 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 84d0b3a..92f93cf 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -408,6 +408,60 @@ vc_RUA[hnb_idx].start(RUA_Emulation.main(rua_ops, id & "-RUA")); } +private type record of boolean BooleanList; + +private function f_vty_cnlink_allow_attach(TELNETasp_PT pt, boolean ps_domain, BooleanList allow_attach_list) +{ + var charstring config := f_vty_transceive_ret(pt, "show running-config"); + + var charstring msc_sgsn; + if (ps_domain) { + msc_sgsn := "sgsn"; + } else { + msc_sgsn := "msc"; + } + + f_vty_enter_config(pt); + for (var integer cn_nr := 0; cn_nr < sizeof(allow_attach_list); cn_nr := cn_nr+1) { + if (f_strstr(config, "\n" & msc_sgsn & " " & int2str(cn_nr) & "\n") < 0) { + /* There is no 'msc N' for this cn_nr in the running config, so don't create an empty cn by + * stepping into that config node. */ + log(msc_sgsn, cn_nr, " is not configured, skipping"); + continue; + } + f_vty_transceive(pt, msc_sgsn & " " & int2str(cn_nr)); + + if (allow_attach_list[cn_nr]) { + /* strict := false: ignore if osmo-hnbgw does not support this config option (latest build) */ + f_vty_transceive(pt, "allow-attach", strict := false); + } else { + f_vty_transceive(pt, "no allow-attach", strict := false); + } + f_vty_transceive(pt, "exit"); + } + f_vty_transceive(pt, "exit"); +} + +/* Start RAN adapter for CN link N. + * e.g. link for 'msc 0' = (ps_domain := false, cn_nr := 0) + * link for 'sgsn 3' = (ps_domain := true, cn_nr := 3) + */ +private function f_cn_nr_init(boolean ps_domain, integer cn_nr) runs on test_CT { + var RanOps ranops := MSC_RanOps; + ranops.ps_domain := ps_domain; + var integer cn_idx := f_cn_idx(ps_domain, cn_nr); + var charstring msc_sgsn := "msc"; + if (ps_domain) { + msc_sgsn := "sgsn"; + } + f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test." & msc_sgsn & int2str(cn_nr), ranops); + f_ran_adapter_start(g_cn[cn_idx]); +} + +private function f_cn_idx_disconnect(integer cn_idx) runs on test_CT { + f_ran_adapter_cleanup(g_cn[cn_idx]); +} + /* global initialization function */ function f_init(charstring id := "HNBGW", float guard_timeout := 30.0, integer nr_msc := 1, integer nr_sgsn := 1, boolean start_hnb := true) runs on test_CT { @@ -431,26 +485,41 @@ f_init_hnodeb(testcasename(), i, rua_ops); } + f_init_vty("VirtHNBGW"); f_ipa_ctrl_start_client(mp_hnbgw_ip, mp_hnbgw_ctrl_port); /* MSC emulation */ - var RanOps ranops := MSC_RanOps; + + /* Make sure each MSC's internal state is "DISCONNECTED" at first */ + for (var integer i := 0; i < NUM_MSC; i := i + 1) { + f_vty_transceive(HNBGWVTY, "msc " & int2str(i) & " ranap reset", strict := false); + } + + var BooleanList allow_attach := { false, false, false, false }; for (var integer i := 0; i < nr_msc; i := i + 1) { var integer cn_idx := FIRST_MSC_IDX + i; - f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test", ranops); - f_ran_adapter_start(g_cn[cn_idx]); + allow_attach[i] := true; + f_cn_nr_init(ps_domain := false, cn_nr := i); } + /* start the test with exactly all enabled MSCs allowed to attach */ + f_vty_cnlink_allow_attach(HNBGWVTY, false, allow_attach); /* SGSN emulation */ - ranops.ps_domain := true; - for (var integer i := 0; i < nr_sgsn; i := i + 1) { - var integer cn_idx := FIRST_SGSN_IDX + i; - f_ran_adapter_init(g_cn[cn_idx], mp_cn_cfg[cn_idx], "HNBGW_Test", ranops); - f_ran_adapter_start(g_cn[cn_idx]); + + /* Make sure each SGSN's internal state is "DISCONNECTED" at first */ + for (var integer i := 0; i < NUM_SGSN; i := i + 1) { + f_vty_transceive(HNBGWVTY, "sgsn " & int2str(i) & " ranap reset", strict := false); } + allow_attach := { false, false, false, false }; + for (var integer i := 0; i < nr_sgsn; i := i + 1) { + var integer cn_idx := FIRST_SGSN_IDX + i; + allow_attach[i] := true; + f_cn_nr_init(ps_domain := true, cn_nr := i); + } + f_vty_cnlink_allow_attach(HNBGWVTY, true, allow_attach); + f_init_mgcp(id); - f_init_vty("VirtHNBGW"); if (start_hnb) { f_start_hnbs(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33485 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: I5c9db4b31298ca9855b4390481a709f863459172 Gerrit-Change-Number: 33485 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: hnbgw: add CN pool tests

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: add CN pool tests ...................................................................... hnbgw: add CN pool tests docker-playground.git needs a config file change to be committed at the same time as this patch, see 'Related'. Depends: osmo-ttcn3-hacks I94aa0b2adfc48b98cb4b1efe595c2432fc603d6c Change-Id: I027a059faed3f140f8801f84338956cd004043b5 --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg M hnbgw/osmo-stp.cfg M library/L3_Templates.ttcn M library/Osmocom_Types.ttcn 7 files changed, 959 insertions(+), 22 deletions(-) Approvals: neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 92f93cf..df6fc8e 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -63,7 +63,10 @@ import from TCCConversion_Functions all; import from MobileL3_Types all; +import from MobileL3_CommonIE_Types all; +import from MobileL3_GMM_SM_Types all; import from L3_Templates all; +import from L3_Common all; const integer NUM_MSC := 4; const integer NUM_SGSN := 4; @@ -270,7 +273,8 @@ HnbConfig hnb optional, boolean expect_separate_sccp_cr, integer tx_sccp_cr_data_len, - charstring pfcp_local_addr + charstring pfcp_local_addr, + octetstring nas_pdu optional } /* We extend: @@ -324,6 +328,11 @@ port TELNETasp_PT HNBGWVTY; /* global test case guard timer (actual timeout value is set in f_init()) */ timer T_guard := 30.0; + + /* The cnlink type 'msc' or 'sgsn', to be used in CTRL commands to obtain counters */ + var charstring g_ctr_cn_node_name; + /* Counter state */ + var CounterNameValsList g_ctr_cn; } /* global altstep for global guard timer; */ @@ -976,7 +985,8 @@ hnb := omit, /* filled in later */ expect_separate_sccp_cr := expect_separate_sccp_cr, tx_sccp_cr_data_len := tx_sccp_cr_data_len, - pfcp_local_addr := mp_pfcp_ip_local + pfcp_local_addr := mp_pfcp_ip_local, + nas_pdu := omit } /* Create an Iuh connection; send InitialUE; expect it to appear on new SCCP conenction */ @@ -1761,6 +1771,648 @@ f_shutdown_helper(); } +/* Default list of counters for a 'cn' entity to test the cnpool feature. */ +const CounterNameVals counternames_cnpool := { + { "cnpool:subscr:new", 0 }, + { "cnpool:subscr:known", 0 }, + { "cnpool:subscr:reattach", 0 }, + { "cnpool:subscr:attach_lost", 0 }, + { "cnpool:subscr:paged", 0 } +}; +private function f_ctrs_cn_init(boolean ps_domain, integer cn_count := 0, + CounterNameVals counternames := counternames_cnpool) runs on test_CT { + if (ps_domain) { + g_ctr_cn_node_name := "sgsn"; + if (cn_count == 0) { + cn_count := NUM_SGSN; + } + } else { + g_ctr_cn_node_name := "msc"; + if (cn_count == 0) { + cn_count := NUM_MSC; + } + } + g_ctr_cn := f_counter_name_vals_get_n(IPA_CTRL, g_ctr_cn_node_name, cn_count, counternames); + log("initial " & g_ctr_cn_node_name & " rate counters: ", g_ctr_cn); +} + +/* f_ctrs_cn_init(); + * f_do_thing(on_cn := 0); + * f_do_thing(on_cn := 0); + * f_do_other(on_cn := 1); + * f_ctrs_cn_add(0, "thing", 2); + * f_ctrs_cn_add(1, "other"); + * f_ctrs_cn_verify(); + */ +private function f_ctrs_cn_verify() runs on test_CT { + log("verifying", g_ctr_cn_node_name, " rate counters: ", g_ctr_cn); + f_counter_name_vals_expect_n(IPA_CTRL, g_ctr_cn_node_name, g_ctr_cn); +} + +/* convenience: f_ctrs_cn_add() and f_ctrs_cn_verify() in one call. + * f_ctrs_cn_init(); + * f_do_thing(on_cn := 0); + * f_do_thing(on_cn := 0); + * f_do_thing(on_cn := 0); + * f_ctrs_cn_expect(0, "thing", 3); + */ +private function f_ctrs_cn_expect(integer cn_nr, charstring countername, integer val := 1) runs on test_CT { + f_ctrs_cn_add(cn_nr, countername, val); + f_ctrs_cn_verify(); +} + +private function f_ctrs_cn_add(integer cn_nr, charstring countername, integer val := 1) runs on test_CT { + f_counter_name_vals_list_add(g_ctr_cn, cn_nr, countername, val); +} + +private function f_perform_compl_l3(octetstring nas, boolean do_clear := true, boolean expect_iu_l3 := true) +runs on ConnHdlr { + timer T := 10.0; + + /* create an expect on the Iu side for the random NAS portion */ + if (g_pars.expect_separate_sccp_cr) { + f_ran_register_sccp_cr_without_payload(); + } else { + f_ran_register_exp(nas); + } + + /* send Connect via Iuh (creating a RUA connection) */ + var RANAP_PDU tx := f_build_initial_ue_with_nas(g_pars, nas); + RUA.send(RUA_Conn_Req:{g_pars.ps_domain, tx}); + + if (expect_iu_l3) { + /* Expect same message to arrive at CN */ + f_bssap_expect(tx); + } +} + +private function f_tc_cnpool_compl_l3(charstring id, TestHdlrParams pars) runs on ConnHdlr { + f_init_handler(pars); + f_perform_compl_l3(g_pars.nas_pdu); +} + +private function f_TC_cnpool_compl_l3(boolean ps_domain, octetstring nas_pdu, integer cn_nr, + template (omit) charstring inc_countername := omit) runs on test_CT { + var ConnHdlr vc_conn; + var template (value) TestHdlrParams pars := t_pars(0, ps_domain := ps_domain, cn_nr := cn_nr); + pars.nas_pdu := nas_pdu; + log("XXX ", pars); + vc_conn := f_start_handler_with_pars(refers(f_tc_cnpool_compl_l3), pars); + vc_conn.done; + + if (not istemplatekind(inc_countername, "omit")) { + f_ctrs_cn_expect(cn_nr, valueof(inc_countername)); + } +} + +function f_TC_cnpool_compl_l3_list(boolean ps_domain, ro_octetstring compl3, Osmocom_Types.ro_integer cn_nrs, + charstring inc_countername) runs on test_CT { + var integer n := lengthof(compl3); + if (n < lengthof(cn_nrs)) { + n := lengthof(cn_nrs); + } + for (var integer i := 0; i < n; i := i + 1) { + var integer cn_nr := cn_nrs[i mod lengthof(cn_nrs)]; + f_TC_cnpool_compl_l3(ps_domain, compl3[i mod lengthof(compl3)], cn_nr, inc_countername); + } +} + +type enumerated Compl3Type { + /* CS */ + LU, + CMSERV, + PAGRESP, + IMSIDETACH, + + /* PS */ + ATTACHREQ, + RAUREQ, + DETREQ +}; + +private function f_gen_one_compl_l3(Compl3Type compl3type, template (value) MobileIdentityLV mi, + integer ps_nri := -1 + ) return octetstring +{ + /* CS */ + if (compl3type == LU) { + return enc_PDU_ML3_MS_NW(valueof(ts_LU_REQ(LU_Type_IMSI_Attach, valueof(mi), '00F110'O))); + } + if (compl3type == CMSERV) { + return enc_PDU_ML3_MS_NW(valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, valueof(mi)))); + } + if (compl3type == PAGRESP) { + return enc_PDU_ML3_MS_NW(valueof(ts_PAG_RESP(valueof(mi)))); + } + if (compl3type == IMSIDETACH) { + return enc_PDU_ML3_MS_NW(valueof(ts_ML3_MO_MM_IMSI_DET_Ind(valueof(mi)))); + } + + /* PS */ + var template (omit) NetworkResourceIdentifierContainerTLV nri := omit; + if (ps_nri >= 0) { + nri := valueof(ts_GMM_NRI(ps_nri)); + } + + if (compl3type == ATTACHREQ) { + return enc_PDU_L3_MS_SGSN(valueof(ts_GMM_ATTACH_REQ(valueof(mi), f_RAI('001'H, '01'H, '2a2a'O, '17'O), + nri := nri))); + } + if (compl3type == RAUREQ) { + return enc_PDU_L3_MS_SGSN(valueof(ts_GMM_RAU_REQ(valueof(mi), GPRS_UPD_T_PERIODIC, + f_RAI('001'H, '01'H, '2a2a'O, '17'O), + nri := nri))); + } + if (compl3type == DETREQ) { + return enc_PDU_L3_MS_SGSN(valueof(ts_GMM_DET_REQ_MO_mi(c_GMM_DTT_MO_GPRS, power_off := false, + p_tmsi := valueof(ts_MI_TLV(mi.mobileIdentityV))))); + } + + setverdict(fail, "unknown complete layer 3 type"); + mtc.stop; +} + +type record of Compl3Type ro_Compl3Type; +type record of MobileIdentityLV ro_MobileIdentityLV; +type record of octetstring ro_octetstring; + +/* Generate a list of n Complete Layer 3 NAS PDUs, + * rotating through the message kinds listed in 'types' and the mobile identities in mis. + */ +private function f_gen_compl_l3(ro_Compl3Type types, ro_MobileIdentityLV mis, integer n) return ro_octetstring +{ + var ro_octetstring res := {}; + for (var integer i := 0; i < n; i := i + 1) { + var integer ti := i mod lengthof(types); + var integer mi := i mod lengthof(mis); + res[i] := f_gen_one_compl_l3(types[ti], mis[mi]); + } + return res; +} + +private function f_gen_mi_imsi(integer n) return MobileIdentityLV +{ + return valueof(ts_MI_IMSI_LV(f_gen_imsi(n))); +} + +private function f_gen_mi_imsis(integer n) return ro_MobileIdentityLV +{ + var ro_MobileIdentityLV mis := {}; + for (var integer i := 0; i < n; i := i + 1) { + mis[i] := f_gen_mi_imsi(n); + } + return mis; +} + +function f_vty_set_roundrobin_next(TELNETasp_PT VTY, boolean ps_domain, integer cn_nr) +{ + var charstring msc_sgsn; + if (ps_domain) { + msc_sgsn := "sgsn"; + } else { + msc_sgsn := "msc"; + } + f_vty_transceive(VTY, "cnpool roundrobin next " & msc_sgsn & " " & int2str(cn_nr)); +} + +private function f_gen_compl3_by_domain(boolean ps_domain, integer n, template (omit) ro_MobileIdentityLV mis := omit) return ro_octetstring{ + var ro_Compl3Type types; + if (ps_domain) { + types := { ATTACHREQ, RAUREQ, DETREQ }; + } else { + types := { LU, CMSERV, PAGRESP, IMSIDETACH }; + } + if (istemplatekind(mis, "omit")) { + mis := f_gen_mi_imsis(n); + } + return f_gen_compl_l3(types, valueof(mis), n); +} + +/* Various Complete Layer 3 by IMSI all end up with the first MSC, because the other MSCs are not connected. */ +testcase TC_mscpool_L3Compl_on_1_cnlink() runs on test_CT { + f_TC_cnpool_L3Compl_on_1_cnlink(ps_domain := false); +} +testcase TC_sgsnpool_L3Compl_on_1_cnlink() runs on test_CT { + f_TC_cnpool_L3Compl_on_1_cnlink(ps_domain := true); +} +function f_TC_cnpool_L3Compl_on_1_cnlink(boolean ps_domain) runs on test_CT { + + f_init(); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 4); + f_TC_cnpool_compl_l3_list(ps_domain, compl3, {0, 0, 0, 0}, "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* Three Layer 3 Complete by IMSI are round-robin'ed across two connected MSCs */ +testcase TC_mscpool_L3Complete_by_imsi_round_robin() runs on test_CT { + f_TC_cnpool_L3Complete_by_imsi_round_robin(ps_domain := false); +} +testcase TC_sgsnpool_L3Complete_no_nri_round_robin() runs on test_CT { + f_TC_cnpool_L3Complete_by_imsi_round_robin(ps_domain := true); +} +function f_TC_cnpool_L3Complete_by_imsi_round_robin(boolean ps_domain) runs on test_CT { + + f_init(nr_msc := 2, nr_sgsn := 2); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 3); + + f_TC_cnpool_compl_l3_list(ps_domain, compl3, + /* Third Complete Layer 3 wraps back to msc 0 */ + cn_nrs := {0, 1, 0}, + inc_countername := "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* Three LU by TMSI are round-robin'ed across two connected MSCs, because they contain a NULL-NRI (0, 1) + * (configured in osmo-hnbgw.cfg). */ +testcase TC_mscpool_LU_by_tmsi_null_nri_0_round_robin() runs on test_CT { + f_TC_cnpool_LU_by_tmsi_null_nri_N_round_robin(ps_domain := false, nri_val := 0); +} +/* For NRI == 1, one of the MSC also has the NULL-NRI as part of its owned NRIs, but the NULL-NRI setting is stronger + * than that. */ +testcase TC_mscpool_LU_by_tmsi_null_nri_1_round_robin() runs on test_CT { + f_TC_cnpool_LU_by_tmsi_null_nri_N_round_robin(ps_domain := false, nri_val := 1); +} +function f_TC_cnpool_LU_by_tmsi_null_nri_N_round_robin(boolean ps_domain, integer nri_val) runs on test_CT { + + f_init(nr_msc := 2, nr_sgsn := 2); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_MobileIdentityLV mis := { valueof(ts_MI_TMSI_NRI_LV(nri_val)) }; + var ro_octetstring compl3; + if (ps_domain) { + compl3 := { + f_gen_one_compl_l3(ATTACHREQ, mis[0], nri_val) + }; + } else { + compl3 := f_gen_compl_l3({LU}, mis, 1); + } + + f_TC_cnpool_compl_l3_list(ps_domain, compl3, + /* The third Complete Layer 3 wraps back to msc 0 */ + {0, 1, 0}, + "cnpool:subscr:reattach"); + f_shutdown_helper(); +} + +/* Three Layer 3 Complete by TMSI are round-robin'ed across two connected MSCs, because they contain an NRI not + * assigned to any MSC (configured in osmo-hnbgw.cfg). */ +testcase TC_mscpool_L3Complete_by_tmsi_unassigned_nri_round_robin() runs on test_CT { + f_TC_cnpool_L3Complete_by_tmsi_unassigned_nri_round_robin(ps_domain := false); +} +function f_TC_cnpool_L3Complete_by_tmsi_unassigned_nri_round_robin(boolean ps_domain) runs on test_CT { + + f_init(nr_msc := 2, nr_sgsn := 2); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + /* 3 NRIs that are not assigned to any MSC */ + var ro_MobileIdentityLV mis := { + valueof(ts_MI_TMSI_NRI_LV(1000)), + valueof(ts_MI_TMSI_NRI_LV(768)), + valueof(ts_MI_TMSI_NRI_LV(819)) + }; + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 3, mis); + f_TC_cnpool_compl_l3_list(ps_domain, compl3, { 0, 1, 0 }, "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* Three Layer 3 Complete by TMSI are round-robin'ed across two connected MSCs, because they contain an NRI + * assigned to a CN link that is currently not connected (configured in osmo-hnbgw.cfg). */ +testcase TC_mscpool_L3Complete_by_tmsi_valid_nri_msc_not_connected_round_robin() runs on test_CT { + f_TC_cnpool_L3Complete_by_tmsi_valid_nri_msc_not_connected_round_robin(ps_domain := false); +} +function f_TC_cnpool_L3Complete_by_tmsi_valid_nri_msc_not_connected_round_robin(boolean ps_domain) runs on test_CT { + + f_init(nr_msc := 2, nr_sgsn := 2); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + /* 3 NRIs that are assigned to an unconnected MSC */ + var ro_MobileIdentityLV mis := { + valueof(ts_MI_TMSI_NRI_LV(512)), + valueof(ts_MI_TMSI_NRI_LV(767)), + valueof(ts_MI_TMSI_NRI_LV(750)) + }; + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 3, mis); + + f_TC_cnpool_compl_l3(ps_domain, compl3[0], cn_nr := 0); + f_ctrs_cn_add(2, "cnpool:subscr:attach_lost"); + f_ctrs_cn_add(0, "cnpool:subscr:new"); + f_ctrs_cn_verify(); + + f_TC_cnpool_compl_l3(ps_domain, compl3[1], cn_nr := 1); + f_ctrs_cn_add(2, "cnpool:subscr:attach_lost"); + f_ctrs_cn_add(1, "cnpool:subscr:new"); + f_ctrs_cn_verify(); + + f_TC_cnpool_compl_l3(ps_domain, compl3[2], cn_nr := 0); + f_ctrs_cn_add(2, "cnpool:subscr:attach_lost"); + f_ctrs_cn_add(0, "cnpool:subscr:new"); + f_ctrs_cn_verify(); + + f_shutdown_helper(); +} + +/* Three Layer 3 Complete by TMSI with valid NRI for the second MSC are all directed to the second MSC (configured in + * osmo-hnbgw.cfg). */ +testcase TC_mscpool_L3Complete_by_tmsi_valid_nri_1() runs on test_CT { + f_TC_cnpool_L3Complete_valid_nri_1(ps_domain := false); +} +testcase TC_sgsnpool_L3Complete_valid_nri_1() runs on test_CT { + f_TC_cnpool_L3Complete_valid_nri_1(ps_domain := true); +} +function f_TC_cnpool_L3Complete_valid_nri_1(boolean ps_domain) runs on test_CT { + + f_init(nr_msc := 2, nr_sgsn := 2); + f_sleep(1.0); + + /* All TMSIs in this test point at the second MSC, set the round robin to point at the first MSC to make sure + * this is not using round-robin. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_octetstring compl3; + + /* 3 NRIs of the second MSC's range (256-511) */ + var ro_MobileIdentityLV mis := { + valueof(ts_MI_TMSI_NRI_LV(256)), + valueof(ts_MI_TMSI_NRI_LV(260)), + valueof(ts_MI_TMSI_NRI_LV(511)) + }; + if (ps_domain) { + compl3 := { + f_gen_one_compl_l3(RAUREQ, mis[0], 256), + f_gen_one_compl_l3(RAUREQ, mis[1], 260), + f_gen_one_compl_l3(RAUREQ, mis[2], 511) + }; + } else { + compl3 := f_gen_compl3_by_domain(ps_domain, 3, mis); + } + + f_TC_cnpool_compl_l3_list(ps_domain, compl3, {1, 1, 1}, "cnpool:subscr:known"); + + f_shutdown_helper(); +} + +/* Layer 3 Complete by TMSI with valid NRI for the third MSC are directed to the third MSC (configured in osmo-hnbgw.cfg), + * while a round-robin remains unaffected by that. */ +testcase TC_mscpool_L3Complete_by_tmsi_valid_nri_2() runs on test_CT { + f_TC_cnpool_L3Complete_valid_nri_2(ps_domain := false); +} +testcase TC_sgsnpool_L3Complete_valid_nri_2() runs on test_CT { + f_TC_cnpool_L3Complete_valid_nri_2(ps_domain := true); +} +function f_TC_cnpool_L3Complete_valid_nri_2(boolean ps_domain) runs on test_CT { + + f_init(nr_msc := 3, nr_sgsn := 3); + f_sleep(1.0); + + /* All TMSIs in this test point at the third MSC, set the round robin to point at the second MSC to make sure + * this is not using round-robin. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 1); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_octetstring compl3; + + /* 2 NRIs of the third MSC's range (512-767) */ + var ro_MobileIdentityLV mis := { + valueof(ts_MI_TMSI_NRI_LV(512)), + valueof(ts_MI_TMSI_NRI_LV(678)) + }; + if (ps_domain) { + compl3 := { + f_gen_one_compl_l3(ATTACHREQ, mis[0], 512), + f_gen_one_compl_l3(ATTACHREQ, mis[1], 678) + }; + } else { + compl3 := f_gen_compl3_by_domain(ps_domain, 2, mis); + } + + f_TC_cnpool_compl_l3_list(ps_domain, compl3, {2, 2}, "cnpool:subscr:known"); + + /* The above forwardings to third MSC have not affected the round robin, which still points at the second MSC */ + f_TC_cnpool_compl_l3_list(ps_domain, f_gen_compl3_by_domain(ps_domain, 1), {1}, "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* LU with a TMSI but indicating a different PLMN in its previous LAI: ignore the NRI. */ +testcase TC_mscpool_LU_by_tmsi_from_other_PLMN() runs on test_CT { + f_TC_cnpool_nri_from_other_PLMN(ps_domain := false); +} +testcase TC_sgsnpool_nri_from_other_PLMN() runs on test_CT { + f_TC_cnpool_nri_from_other_PLMN(ps_domain := true); +} +function f_TC_cnpool_nri_from_other_PLMN(boolean ps_domain) runs on test_CT { + + f_init(nr_msc := 3, nr_sgsn := 3); + f_sleep(1.0); + + /* The TMSIs in this test points at the second MSC, but since it is from a different PLMN, round-robin is used + * instead, and hits msc 0. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_octetstring compl3; + + var ro_MobileIdentityLV mis := { + valueof(ts_MI_TMSI_NRI_LV(260)), + valueof(ts_MI_TMSI_NRI_LV(555)) + }; + if (ps_domain) { + compl3 := { + /* An NRI of the second MSC's range (256-511), but a PLMN that doesn't match with osmo-hnbgw.cfg */ + enc_PDU_L3_MS_SGSN(valueof(ts_GMM_ATTACH_REQ(mis[0], f_RAI('999'H, '99'H, '2a2a'O, + '17'O), + nri := ts_GMM_NRI(260) + ))), + /* An NRI of the third MSC's range (512-767) and a matching PLMN gets directed by NRI. */ + f_gen_one_compl_l3(ATTACHREQ, mis[1], 555) + } + } else { + compl3 := { + /* An NRI of the second MSC's range (256-511), but a PLMN that doesn't match with osmo-hnbgw.cfg */ + enc_PDU_ML3_MS_NW(valueof(ts_LU_REQ(LU_Type_IMSI_Attach, mis[0], '99F999'O))), + /* An NRI of the third MSC's range (512-767) and a matching PLMN gets directed by NRI. */ + enc_PDU_ML3_MS_NW(valueof(ts_LU_REQ(LU_Type_IMSI_Attach, mis[1], '00F110'O))) + }; + } + + /* Foreign NRI: roundrobin */ + f_TC_cnpool_compl_l3(ps_domain, compl3[0], cn_nr := 0, inc_countername := "cnpool:subscr:new"); + + /* Local NRI: matching msc */ + f_TC_cnpool_compl_l3(ps_domain, compl3[1], cn_nr := 2, inc_countername := "cnpool:subscr:known"); + + f_shutdown_helper(); +} + +/* For round-robin, skip a CN link that has 'no allow-attach' set. */ +testcase TC_mscpool_no_allow_attach_round_robin() runs on test_CT { + + f_init(nr_msc := 3); + f_sleep(1.0); + + var boolean ps_domain := false; + + /* Mark the second MSC as offloading, round-robin should skip this MSC now. */ + f_vty_cnlink_allow_attach(HNBGWVTY, ps_domain, {true, false, true}); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + f_TC_cnpool_compl_l3_list(ps_domain, f_gen_compl3_by_domain(ps_domain, 3), + /* msc 1 is skipped */ + {0, 2, 0}, + "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* An MSC that has 'no allow-attach' set should still serve subscribers that are already attached according to their + * TMSI NRI. */ +testcase TC_mscpool_no_allow_attach_valid_nri() runs on test_CT { + + f_init(nr_msc := 3); + f_sleep(1.0); + + var boolean ps_domain := false; + + /* Mark the second MSC as offloading, round-robin should skip this MSC now. */ + f_vty_cnlink_allow_attach(HNBGWVTY, ps_domain, {true, false, true}); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_MobileIdentityLV mis := { + valueof(ts_MI_TMSI_NRI_LV(260)), + valueof(ts_MI_IMSI_LV('001010000000002'H)), + valueof(ts_MI_IMSI_LV('001010000000003'H)) + }; + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 3, mis); + + /* Round robin points at msc 0, but the valid NRI directs to msc 1, even though msc 1 has 'no allow-attach'. */ + f_TC_cnpool_compl_l3(ps_domain, compl3[0], cn_nr := 1, inc_countername := "cnpool:subscr:known"); + + /* Normal round robin skips msc 1, because it has 'no allow-attach' */ + f_TC_cnpool_compl_l3(ps_domain, compl3[1], cn_nr := 0, inc_countername := "cnpool:subscr:new"); + f_TC_cnpool_compl_l3(ps_domain, compl3[2], cn_nr := 2, inc_countername := "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* When a peer point-code gets an SCCP N-PCSTATE saying it is unreachable, immediately mark the CN link as unusable. */ +testcase TC_mscpool_sccp_n_pcstate_detaches_cnlink() runs on test_CT { + f_TC_cnpool_sccp_n_pcstate_detaches_cnlink(ps_domain := false); +} +testcase TC_sgsnpool_sccp_n_pcstate_detaches_cnlink() runs on test_CT { + f_TC_cnpool_sccp_n_pcstate_detaches_cnlink(ps_domain := true); +} +function f_TC_cnpool_sccp_n_pcstate_detaches_cnlink(boolean ps_domain) runs on test_CT +{ + + f_init(nr_msc := 2, nr_sgsn := 2); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + f_ctrs_cn_init(ps_domain := ps_domain); + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 3); + + f_TC_cnpool_compl_l3(ps_domain, compl3[0], cn_nr := 0, inc_countername := "cnpool:subscr:new"); + f_TC_cnpool_compl_l3(ps_domain, compl3[1], cn_nr := 1, inc_countername := "cnpool:subscr:new"); + + f_logp(HNBGWVTY, "disconnecting msc0"); + f_cn_idx_disconnect(f_cn_idx(ps_domain, 0)); + + /* Now round-robin would wrap to the first MSC, but since the first MSC is disconnected, it wraps around to the + * second. */ + f_TC_cnpool_compl_l3(ps_domain, compl3[2], cn_nr := 1, inc_countername := "cnpool:subscr:new"); + + f_shutdown_helper(); +} + +/* When a CN link point-code gets an SCCP N-PCSTATE saying it is now reachable, immediately trigger RESET and bring up the + * MSC. */ +testcase TC_mscpool_sccp_n_pcstate_attaches_cnlink() runs on test_CT { + f_TC_cnpool_sccp_n_pcstate_attaches_cnlink(ps_domain := false); +} +testcase TC_sgsnpool_sccp_n_pcstate_attaches_cnlink() runs on test_CT { + f_TC_cnpool_sccp_n_pcstate_attaches_cnlink(ps_domain := true); +} +function f_TC_cnpool_sccp_n_pcstate_attaches_cnlink(boolean ps_domain) runs on test_CT +{ + f_init(nr_msc := 1, nr_sgsn := 1); + f_sleep(1.0); + + /* Control which MSC gets chosen next by the round-robin, otherwise + * would be randomly affected by which other tests ran before this. */ + f_vty_set_roundrobin_next(HNBGWVTY, ps_domain, 0); + + var ro_octetstring compl3 := f_gen_compl3_by_domain(ps_domain, 3); + + f_ctrs_cn_init(ps_domain := ps_domain); + + /* There is only one MSC, round robin stays on msc0 */ + f_TC_cnpool_compl_l3(ps_domain := ps_domain, nas_pdu := compl3[0], cn_nr := 0, inc_countername := "cnpool:subscr:new"); + f_TC_cnpool_compl_l3(ps_domain := ps_domain, nas_pdu := compl3[1], cn_nr := 0, inc_countername := "cnpool:subscr:new"); + + f_logp(HNBGWVTY, "connecting cnlink 1"); + f_cn_nr_init(ps_domain, 1); + f_vty_cnlink_allow_attach(HNBGWVTY, ps_domain, { true, true }); + f_sleep(1.0); + + /* This time round-robin wraps to the second MSC, because it is now online. */ + f_TC_cnpool_compl_l3(ps_domain := ps_domain, nas_pdu := compl3[2], cn_nr := 1, inc_countername := "cnpool:subscr:new"); + + f_shutdown_helper(); +} + control { execute(TC_hnb_register()); execute(TC_hnb_register_duplicate()); @@ -1784,6 +2436,28 @@ execute(TC_ps_rab_assignment_without_pfcp()); } + execute( TC_mscpool_L3Compl_on_1_cnlink() ); + execute( TC_mscpool_L3Complete_by_imsi_round_robin() ); + execute( TC_mscpool_LU_by_tmsi_null_nri_0_round_robin() ); + execute( TC_mscpool_LU_by_tmsi_null_nri_1_round_robin() ); + execute( TC_mscpool_L3Complete_by_tmsi_unassigned_nri_round_robin() ); + execute( TC_mscpool_L3Complete_by_tmsi_valid_nri_msc_not_connected_round_robin() ); + execute( TC_mscpool_L3Complete_by_tmsi_valid_nri_1() ); + execute( TC_mscpool_L3Complete_by_tmsi_valid_nri_2() ); + execute( TC_mscpool_LU_by_tmsi_from_other_PLMN() ); + execute( TC_mscpool_no_allow_attach_round_robin() ); + execute( TC_mscpool_no_allow_attach_valid_nri() ); + execute( TC_mscpool_sccp_n_pcstate_detaches_cnlink() ); + execute( TC_mscpool_sccp_n_pcstate_attaches_cnlink() ); + + execute( TC_sgsnpool_L3Compl_on_1_cnlink() ); + execute( TC_sgsnpool_L3Complete_no_nri_round_robin() ); + execute( TC_sgsnpool_L3Complete_valid_nri_1() ); + execute( TC_sgsnpool_L3Complete_valid_nri_2() ); + execute( TC_sgsnpool_nri_from_other_PLMN() ); + execute( TC_sgsnpool_sccp_n_pcstate_detaches_cnlink() ); + execute( TC_sgsnpool_sccp_n_pcstate_attaches_cnlink() ); + /* Run at the end since it makes osmo-hnbgw <= 1.3.0 crash: OS#5676 */ execute(TC_hnb_reregister_reuse_sctp_assoc()); } diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index 17addbd..b651113 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -103,7 +103,7 @@ FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " -FILES+="L3_Templates.ttcn " +FILES+="L3_Templates.ttcn L3_Common.ttcn " gen_links $DIR $FILES diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index 178369a..550657b 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -20,30 +20,112 @@ logging level lpfcp info logging level lsua notice logging level lsccp notice + logging print timestamp date ! line vty no login ! cs7 instance 0 point-code 0.23.5 - sccp-address msc + + sccp-address msc-naught routing-indicator PC point-code 0.23.4 - sccp-address sgsn + + sccp-address msc-one + routing-indicator PC + point-code 0.0.2 + + sccp-address msc-two + routing-indicator PC + point-code 0.0.3 + + sccp-address msc-three + routing-indicator PC + point-code 0.0.4 + + sccp-address sgsn-naught routing-indicator PC point-code 0.23.1 + + sccp-address sgsn-one + routing-indicator PC + point-code 0.1.2 + + sccp-address sgsn-two + routing-indicator PC + point-code 0.1.3 + + sccp-address sgsn-three + routing-indicator PC + point-code 0.1.4 + hnbgw log-prefix hnb-id iuh local-ip 127.0.0.1 local-port 29169 hnbap-allow-tmsi 1 - iucs - remote-addr msc - iups - remote-addr sgsn pfcp remote-addr 127.0.0.1 local-addr 127.0.0.2 local-port 8805 timer pfcp x26 5 + +msc 0 + remote-addr msc-naught + +msc 1 + remote-addr msc-one + +msc 2 + remote-addr msc-two + +msc 3 + remote-addr msc-three + +sgsn 0 + remote-addr sgsn-naught + +sgsn 1 + remote-addr sgsn-one + +sgsn 2 + remote-addr sgsn-two + +sgsn 3 + remote-addr sgsn-three + +hnbgw + iucs + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the MSCs: + nri null add 0 + # a NULL NRI that is also used by an MSC: + nri null add 1 +msc 0 + nri add 1 255 +msc 1 + nri add 256 511 +msc 2 + nri add 512 767 + # range 768-1000 is not assigned to any MSC on purpose +msc 3 + nri add 1001 1023 + +hnbgw + iups + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the SGSNs: + nri null add 0 + # a NULL NRI that is also used by an SGSN: + nri null add 1 +sgsn 0 + nri add 1 255 +sgsn 1 + nri add 256 511 +sgsn 2 + nri add 512 767 + # range 768-1000 is not assigned to any SGSN on purpose +sgsn 3 + nri add 1001 1023 diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index f11f613..3ccc28d 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -15,21 +15,97 @@ line vty no login ! + cs7 instance 0 point-code 0.23.5 - sccp-address msc - routing-indicator PC + + sccp-address msc-naught point-code 0.23.4 - sccp-address sgsn - routing-indicator PC + + sccp-address msc-one + point-code 0.0.2 + + sccp-address msc-two + point-code 0.0.3 + + sccp-address msc-three + point-code 0.0.4 + + sccp-address sgsn-naught point-code 0.23.1 + + sccp-address sgsn-one + point-code 0.1.2 + + sccp-address sgsn-two + point-code 0.1.3 + + sccp-address sgsn-three + point-code 0.1.4 + hnbgw log-prefix hnb-id iuh local-ip 127.0.0.1 local-port 29169 hnbap-allow-tmsi 1 + # don't spam RANAP RESET messages for up to eight CN links across all tests + timer hnbgw T4 60 + +msc 0 + remote-addr msc-naught + +msc 1 + remote-addr msc-one + +msc 2 + remote-addr msc-two + +msc 3 + remote-addr msc-three + +sgsn 0 + remote-addr sgsn-naught + +sgsn 1 + remote-addr sgsn-one + +sgsn 2 + remote-addr sgsn-two + +sgsn 3 + remote-addr sgsn-three + +hnbgw iucs - remote-addr msc + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the MSCs: + nri null add 0 + # a NULL NRI that is also used by an MSC: + nri null add 1 +msc 0 + nri add 1 255 +msc 1 + nri add 256 511 +msc 2 + nri add 512 767 + # range 768-1000 is not assigned to any MSC on purpose +msc 3 + nri add 1001 1023 + +hnbgw iups - remote-addr sgsn + nri bitlen 10 + # a NULL NRI that is outside the NRI ranges used by the SGSNs: + nri null add 0 + # a NULL NRI that is also used by an SGSN: + nri null add 1 +sgsn 0 + nri add 1 255 +sgsn 1 + nri add 256 511 +sgsn 2 + nri add 512 767 + # range 768-1000 is not assigned to any SGSN on purpose +sgsn 3 + nri add 1001 1023 diff --git a/hnbgw/osmo-stp.cfg b/hnbgw/osmo-stp.cfg index 651975b..e4b80d4 100644 --- a/hnbgw/osmo-stp.cfg +++ b/hnbgw/osmo-stp.cfg @@ -39,6 +39,25 @@ as virt-msc0 m3ua asp virt-msc0-0 routing-key 1 0.23.4 + + asp virt-msc1-0 23907 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-msc1 m3ua + asp virt-msc1-0 + routing-key 3 0.0.2 + + asp virt-msc2-0 23909 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-msc2 m3ua + asp virt-msc2-0 + routing-key 5 0.0.3 + asp virt-sgsn0-0 23906 2905 m3ua local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -48,8 +67,30 @@ asp virt-sgsn0-0 routing-key 2 0.23.1 + asp virt-sgsn1-0 23908 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-sgsn1 m3ua + asp virt-sgsn1-0 + routing-key 4 0.1.2 + + asp virt-sgsn2-0 23910 2905 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as virt-sgsn2 m3ua + asp virt-sgsn2-0 + routing-key 6 0.1.3 + route-table system update route 0.23.4 7.255.7 linkset virt-msc0 + update route 0.0.2 7.255.7 linkset virt-msc1 + update route 0.0.3 7.255.7 linkset virt-msc2 update route 0.23.1 7.255.7 linkset virt-sgsn0 + update route 0.1.2 7.255.7 linkset virt-sgsn1 + update route 0.1.3 7.255.7 linkset virt-sgsn2 listen m3ua 2905 accept-asp-connections dynamic-permitted diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index c31ce1f..710b0ea 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -177,6 +177,9 @@ } } +template MobileIdentityLV ts_MI_TMSI_NRI_LV(integer nri_v, integer nri_bitlen := 10) := + ts_MI_TMSI_LV(tmsi := f_gen_tmsi(suffix := 0, nri_v := nri_v, nri_bitlen := nri_bitlen)); + template MobileIdentityTLV ts_MI_IMEISV_TLV(hexstring imeisv) := { elementIdentifier := '0100011'B, spare1 := '0'B, @@ -2425,11 +2428,23 @@ } } +template (value) NetworkResourceIdentifierContainerTLV ts_GMM_NRI(integer nri) := { + elementIdentifier := '10'O, + networkResourceIdentifierContainerLV := { + lengthIndicator := 2, + networkResourceIdentifierContainerV := { + nRIContainerValue := f_bits_reversed(int2bit(nri, 10)), + spare := '000000'B + } + } +} + template (value) PDU_L3_MS_SGSN ts_GMM_ATTACH_REQ(MobileIdentityLV mi_lv, RoutingAreaIdentificationV old_ra, boolean combined := false, boolean follow_on_pending := false, - template (omit) MobileStationClassmark2_TLV cm2_tlv, - template (omit) MobileStationClassmark3_TLV cm3_tlv + template (omit) MobileStationClassmark2_TLV cm2_tlv := omit, + template (omit) MobileStationClassmark3_TLV cm3_tlv := omit, + template (omit) NetworkResourceIdentifierContainerTLV nri := omit ) := { discriminator := '0000'B, /* overwritten */ tiOrSkip := { @@ -2462,7 +2477,7 @@ mS_NetworkFeatureSupport := omit, oldLocationAreaIdentification := omit, additionalUpdateType := omit, - tMSIBasedNRIcontainer := omit, + tMSIBasedNRIcontainer := nri, t3324 := omit, t3312_ExtendedValue := omit, extendedDRXParameters := omit @@ -2577,9 +2592,10 @@ ts_GMM_RAU_REQ(MobileIdentityLV mi_lv, GprsUpdateType upd_type, RoutingAreaIdentificationV old_ra, boolean follow_on_pending := false, - template (omit) MobileStationClassmark2_TLV cm2_tlv, - template (omit) MobileStationClassmark3_TLV cm3_tlv, - template (omit) OCT4 p_tmsi := omit + template (omit) MobileStationClassmark2_TLV cm2_tlv := omit, + template (omit) MobileStationClassmark3_TLV cm3_tlv := omit, + template (omit) OCT4 p_tmsi := omit, + template (omit) NetworkResourceIdentifierContainerTLV nri := omit ) := { discriminator := '0000'B, /* overwritten */ tiOrSkip := { @@ -2614,7 +2630,7 @@ mS_NetworkFeatureSupport := omit, oldLocationAreaIdentification := omit, additionalUpdateType := omit, - tMSIBasedNRIcontainer := omit, + tMSIBasedNRIcontainer := nri, t3324 := omit, t3312_ExtendedValue := omit, extendedDRXParameters := omit @@ -2898,6 +2914,27 @@ } } +template (value) PDU_L3_MS_SGSN ts_GMM_DET_REQ_MO_mi(BIT3 dtt := c_GMM_DTT_MO_GPRS, + boolean power_off := false, + template (value) MobileIdentityTLV p_tmsi, + template (omit) OCT3 p_tmsi_sig := omit) := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + detachRequest_MS_SGSN := { + messageType := '00000000'B, /* overwritten */ + detachType := valueof(ts_GMM_DetType(dtt, power_off)), + spare := '0000'B, + ptmsi := p_tmsi, + ptmsiSignature := ts_PtmsiSigTLV(p_tmsi_sig) + } + } + } +} + template PDU_L3_SGSN_MS tr_GMM_DET_ACCEPT_MT := { discriminator := '1000'B, tiOrSkip := { diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 52490ca..8892631 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -344,5 +344,19 @@ } } +/* Return a reversed bitstring */ +function f_bits_reversed(in bitstring bits) return bitstring { + for (var integer i := 0; i < lengthof(bits) / 2; i := i + 1) { + var integer reverse_i := lengthof(bits) - 1 - i; + if (i >= reverse_i) { + break; + } + var bitstring tmp; + tmp[0] := bits[i]; + bits[i] := bits[reverse_i]; + bits[reverse_i] := tmp[0]; + } + return bits; +} } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 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: I027a059faed3f140f8801f84338956cd004043b5 Gerrit-Change-Number: 33486 Gerrit-PatchSet: 8 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

10 months

1
0
0 0

2024

2023

2022

gerrit-log August 2023