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

[S] Change in libosmocore[master]: lapdm: Track fn of primitives in struct lapdm_msg_ctx

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34130 to look at the new patch set (#2). Change subject: lapdm: Track fn of primitives in struct lapdm_msg_ctx ...................................................................... lapdm: Track fn of primitives in struct lapdm_msg_ctx This field will be used in follow-up commits to provide FN information in RSLms primitives towars upper layers. This is needed for instance on the MS side when a CCCH_DATA.ind is received containing a TBF ImmAss with a relative FN indicating the Starting Time. Without tracking FN advance, the uppers layers are not capable of figuring out the absolute FN of the TBF Starting time. The struct lapdm_msg_ctx is not really used outside of libosmocore, so we are safe extending it. Related: OS#3626 Change-Id: Icf986f4202703eb452bedc1b749bb8ce0c73706f --- M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M tests/lapd/lapd_test.c 3 files changed, 26 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/34130/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icf986f4202703eb452bedc1b749bb8ce0c73706f Gerrit-Change-Number: 34130 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

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

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34100 to look at the new patch set (#2). 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(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/34100/2 -- 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: 2 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-MessageType: newpatchset

2 years

1
0
0 0

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

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34100 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > https://osmocom. […] Done -- 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: 2 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: Thu, 10 Aug 2023 13:27:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-pcu[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34134 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Change-Id: If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/gprs_rlcmac.c M src/pcu_l1_if.cpp M src/pcu_l1_if.h 5 files changed, 42 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/34/34134/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index f9465e4..bf49b06 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 (using message id) */ +#define PCU_IF_MSG_DATA_CNF_2 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,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 message id) */ +#define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -94,7 +94,7 @@ } __attribute__ ((packed)); /* data confirmation with message id (instead of raw mac block) */ -struct gsm_pcu_if_data_cnf_dt { +struct gsm_pcu_if_data_cnf { uint8_t sapi; uint32_t msg_id; } __attribute__ ((packed)); @@ -263,8 +263,8 @@ } __attribute__ ((packed)); /* 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 { + * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +struct gsm_pcu_if_pch { /* message id as reference for confirmation */ uint32_t msg_id; /* IMSI (to derive paging group) */ @@ -282,7 +282,7 @@ union { struct gsm_pcu_if_data data_req; struct gsm_pcu_if_data data_cnf; - struct gsm_pcu_if_data_cnf_dt data_cnf_dt; + struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; diff --git a/src/bts.cpp b/src/bts.cpp index 6bc415f..497c2ce 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1129,7 +1129,7 @@ if (plen >= 0) { bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF); if (the_pcu->pcu_if_version >= 0x0b) - pcu_l1if_tx_pch_dt(bts, immediate_assignment, plen, tbf->imsi(), tbf->tlli()); + pcu_l1if_tx_pch2(bts, immediate_assignment, plen, tbf->imsi(), tbf->tlli()); else pcu_l1if_tx_pch(bts, immediate_assignment, plen, tbf->imsi()); } diff --git a/src/gprs_rlcmac.c b/src/gprs_rlcmac.c index 88fcc59..40fdfaf 100644 --- a/src/gprs_rlcmac.c +++ b/src/gprs_rlcmac.c @@ -45,7 +45,7 @@ bts_do_rate_ctr_inc(bts, CTR_PCH_REQUESTS); if (the_pcu->pcu_if_version >= 0x0b) - pcu_l1if_tx_pch_dt(bts, paging_request, plen, imsi, GSM_RESERVED_TMSI); + pcu_l1if_tx_pch2(bts, paging_request, plen, imsi, GSM_RESERVED_TMSI); else pcu_l1if_tx_pch(bts, paging_request, plen, imsi); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index a022647..654063e 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -281,7 +281,7 @@ * Hence, pgroup 000 is taken "randomly" to send it over it. This of * course not optimal since it can actually be sent on any CCCH blocks, * so we are delaying the ImmAss for no good reason. But anyway, - * pcu_l1if_tx_pch() is deprecated and pcu_l1if_tx_pch_dt() should be + * pcu_l1if_tx_pch() is deprecated and pcu_l1if_tx_pch2() should be * used instead, which doesn't suffer from this problem. */ @@ -300,26 +300,26 @@ /* 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 msg_id) +void pcu_l1if_tx_pch2(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 }; + struct gsm_pcu_if_pch pch = { 0 }; - pch_dt.msg_id = msg_id; + pch.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 + OSMO_STRLCPY_ARRAY(pch.imsi, imsi); + /* OS#6097: if strlen(pch.imsi) == 0: We assume the MS is in non-DRX * mode (TS 44.060 5.5.1.5) and hence it is listening on all CCCH blocks * (TS 45.002 6.5.3, 6.5.6). */ - pch_dt.data[0] = (plen << 2) | 0x01; - bitvec_pack(block, pch_dt.data + 1); + pch.data[0] = (plen << 2) | 0x01; + bitvec_pack(block, pch.data + 1); if (the_pcu->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_PCH)) gsmtap_send(the_pcu->gsmtap, 0, 0, GSMTAP_CHANNEL_PCH, 0, 0, 0, 0, - pch_dt.data, GSM_MACBLOCK_LEN); + pch.data, GSM_MACBLOCK_LEN); - pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_PCH_DT, 0, 0, 0, (uint8_t*)&pch_dt, sizeof(pch_dt)); + pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_PCH_2, 0, 0, 0, (uint8_t*)&pch, sizeof(pch)); } int pcu_tx_neigh_addr_res_req(struct gprs_rlcmac_bts *bts, const struct neigh_cache_entry_key *neigh_key) @@ -551,18 +551,18 @@ return rc; } -static int pcu_rx_data_cnf_dt(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf_dt *data_cnf_dt) +static int pcu_rx_data_cnf2(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf *data_cnf) { int rc = 0; - LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf_dt->sapi); + LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf->sapi); - switch (data_cnf_dt->sapi) { - case PCU_IF_SAPI_PCH_DT: - bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id); + switch (data_cnf->sapi) { + case PCU_IF_SAPI_PCH_2: + bts_rcv_imm_ass_cnf(bts, NULL, data_cnf->msg_id); break; default: - LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi); + LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf->sapi); rc = -EINVAL; } @@ -1272,9 +1272,9 @@ CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_cnf); rc = pcu_rx_data_cnf(bts, &pcu_prim->u.data_cnf); break; - case PCU_IF_MSG_DATA_CNF_DT: - CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_cnf_dt); - rc = pcu_rx_data_cnf_dt(bts, &pcu_prim->u.data_cnf_dt); + case PCU_IF_MSG_DATA_CNF_2: + CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_cnf2); + rc = pcu_rx_data_cnf2(bts, &pcu_prim->u.data_cnf2); break; case PCU_IF_MSG_RTS_REQ: CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.rts_req); diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index 3ff17dc..19ec60a 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 msg_id); +void pcu_l1if_tx_pch2(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/+/34134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If641b507dcb6b176109c99dce7cff2a7561364b0 Gerrit-Change-Number: 34134 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Pass fn from lapdm to L1CTL-CCCH_DATA.ind

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34133 ) Change subject: layer23: modem: Pass fn from lapdm to L1CTL-CCCH_DATA.ind ...................................................................... layer23: modem: Pass fn from lapdm to L1CTL-CCCH_DATA.ind Change-Id: I7a9f31ae363fe7de019ff1a906f3978ff3074036 --- M src/host/layer23/src/modem/grr.c 1 file changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/34133/1 diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index 5df0ac2..514b41d 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -95,9 +95,10 @@ static int forward_to_rlcmac(struct osmocom_ms *ms, struct msgb *msg) { struct osmo_gprs_rlcmac_prim *rlcmac_prim; + uint32_t fn = *(uint32_t *)(&msg->cb[0]); /* Forward SI13 to RLC/MAC layer */ - rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0 /* TODO: fn */, msgb_l3(msg)); + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(fn, msgb_l3(msg)); return osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); } @@ -204,9 +205,10 @@ { const struct gsm48_system_information_type_header *si_hdr = msgb_l3(msg); const uint8_t si_type = si_hdr->system_information; + const uint32_t fn = *(uint32_t *)(&msg->cb[0]); - LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x): %s\n", - si_type, gsm48_rr_msg_name(si_type)); + LOGP(DRR, LOGL_INFO, "FN=%u BCCH message (type=0x%02x): %s\n", + fn, si_type, gsm48_rr_msg_name(si_type)); switch (si_type) { case GSM48_MT_RR_SYSINFO_1: @@ -375,6 +377,13 @@ } msg->l3h = (uint8_t *)TLVP_VAL(&tv, RSL_IE_L3_INFO); + if (TLVP_PRESENT(&tv, RSL_IE_OSMO_ABS_FRAME_NUMBER)) { + memcpy(&msg->cb[0], TLVP_VAL(&tv, RSL_IE_OSMO_ABS_FRAME_NUMBER), + TLVP_LEN(&tv, RSL_IE_OSMO_ABS_FRAME_NUMBER)); + *(uint32_t *)(&msg->cb[0]) = osmo_load32be(&msg->cb[0]); + } else { + *(uint32_t *)(&msg->cb[0]) = UINT32_MAX; + } switch (rllh->chan_nr) { case RSL_CHAN_PCH_AGCH: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7a9f31ae363fe7de019ff1a906f3978ff3074036 Gerrit-Change-Number: 34133 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in libosmocore[master]: rsl: Introduce new osmocom extension IE RSL_IE_OSMO_ABS_FRAME_NUMBER

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34131 ) Change subject: rsl: Introduce new osmocom extension IE RSL_IE_OSMO_ABS_FRAME_NUMBER ...................................................................... rsl: Introduce new osmocom extension IE RSL_IE_OSMO_ABS_FRAME_NUMBER This will be used in RSLms to provide Absolute Frame Number information of the primitive indications being sent to upper layers, so that it's possible to track GSM time in the upper layers. The existing RSL_IE_FRAME_NUMBER and RSL_IE_STARTNG_TIME cannot be used there, since those are 16bit fields containing Relative FN values. Related: OS#3626 Change-Id: Ia28caa24dd141b1162b6e11500d753353fe6500d --- M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/34131/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index 0a44db9..bfb0be2 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -369,6 +369,7 @@ RSL_IE_OSMO_TRAINING_SEQUENCE = 0x61, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP = 0x62, RSL_IE_OSMO_OSMUX_CID = 0x63, + RSL_IE_OSMO_ABS_FRAME_NUMBER = 0x64, /* ip.access */ RSL_IE_IPAC_SRTP_CONFIG = 0xe0, diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index fbba982..eac7fd8 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -126,6 +126,7 @@ [RSL_IE_OSMO_TRAINING_SEQUENCE] = { TLV_TYPE_TLV }, [RSL_IE_OSMO_TEMP_OVP_ACCH_CAP] = { TLV_TYPE_TLV }, [RSL_IE_OSMO_OSMUX_CID] = { TLV_TYPE_TLV }, + [RSL_IE_OSMO_ABS_FRAME_NUMBER] = { TLV_TYPE_FIXED, 4 }, [RSL_IE_IPAC_SRTP_CONFIG] = { TLV_TYPE_TLV }, [RSL_IE_IPAC_PROXY_UDP] = { TLV_TYPE_FIXED, 2 }, [RSL_IE_IPAC_BSCMPL_TOUT] = { TLV_TYPE_TV }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28caa24dd141b1162b6e11500d753353fe6500d Gerrit-Change-Number: 34131 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in libosmocore[master]: lapdm: Track fn of primitives in struct lapdm_msg_ctx

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34130 ) Change subject: lapdm: Track fn of primitives in struct lapdm_msg_ctx ...................................................................... lapdm: Track fn of primitives in struct lapdm_msg_ctx This field will be used in follow-up commits to provide FN information in RSLms primitives towars upper layers. This is needed for instance on the MS side when a CCCH_DATA.ind is received containing a TBF ImmAss with a relative FN indicating the Starting Time. Without tracking FN advance, the uppers layers are not capable of figuring out the absolute FN of the TBF Starting time. The struct lapdm_msg_ctx is not really used outside of libosmocore, so we are safe extending it. Related: OS#3626 Change-Id: Icf986f4202703eb452bedc1b749bb8ce0c73706f --- M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M tests/lapd/lapd_test.c M tests/lapd/lapd_test.ok 4 files changed, 44 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/34130/1 diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h index 0e99743..1a39fca 100644 --- a/include/osmocom/gsm/lapdm.h +++ b/include/osmocom/gsm/lapdm.h @@ -24,6 +24,7 @@ uint8_t link_id; uint8_t ta_ind; /* TA indicated by network */ uint8_t tx_power_ind; /* MS power indicated by network */ + uint32_t fn; }; /*! LAPDm datalink like TS 04.06 / Section 3.5.2 */ diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 4a82c4d..e96e218 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -700,7 +700,7 @@ /* input into layer2 (from layer 1) */ static int l2_ph_data_ind(struct msgb *msg, struct lapdm_entity *le, - uint8_t chan_nr, uint8_t link_id) + uint8_t chan_nr, uint8_t link_id, uint32_t fn) { uint8_t cbits = chan_nr >> 3; uint8_t sapi; /* we cannot take SAPI from link_id, as L1 has no clue */ @@ -715,6 +715,7 @@ memset(&mctx, 0, sizeof(mctx)); mctx.chan_nr = chan_nr; mctx.link_id = link_id; + mctx.fn = fn; /* check for L1 chan_nr/link_id and determine LAPDm hdr format */ if (cbits == 0x10 || cbits == 0x12) { @@ -916,7 +917,7 @@ switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(PRIM_PH_DATA, PRIM_OP_INDICATION): rc = l2_ph_data_ind(oph->msg, le, pp->u.data.chan_nr, - pp->u.data.link_id); + pp->u.data.link_id, pp->u.data.fn); break; case OSMO_PRIM(PRIM_PH_RTS, PRIM_OP_INDICATION): rc = l2_ph_data_conf(oph->msg, le); diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c index 739f9b7..afea822 100644 --- a/tests/lapd/lapd_test.c +++ b/tests/lapd/lapd_test.c @@ -184,6 +184,7 @@ /* LAPDm requires those... */ pp.u.data.chan_nr = 0; pp.u.data.link_id = 0; + pp.u.data.fn = 0; /* feed into the LAPDm code of libosmogsm */ rc = lapdm_phsap_up(&pp.oph, &chan->lapdm_dcch); OSMO_ASSERT(rc == 0 || rc == -EBUSY); @@ -206,6 +207,7 @@ /* LAPDm requires those... */ pp.u.data.chan_nr = 0; pp.u.data.link_id = 0; + pp.u.data.fn = 0; /* feed into the LAPDm code of libosmogsm */ rc = lapdm_phsap_up(&pp.oph, &chan->lapdm_dcch); OSMO_ASSERT(rc == 0 || rc == -EBUSY); @@ -337,11 +339,12 @@ printf("Took message from %s queue: " "L2 header size %d, L3 size %d, " - "SAP %#x, %d/%d, Link 0x%02x\n", + "SAP %#x, %d/%d, Link 0x%02x, FN %u\n", queue_name, l2_header_len, l3_len, pp->oph.sap, pp->oph.primitive, pp->oph.operation, - pp->u.data.link_id); + pp->u.data.link_id, + pp->u.data.fn); printf("Message: %s\n", msgb_hexdump(pp->oph.msg)); return rc; diff --git a/tests/lapd/lapd_test.ok b/tests/lapd/lapd_test.ok index 065886c..a2e5ae3 100644 --- a/tests/lapd/lapd_test.ok +++ b/tests/lapd/lapd_test.ok @@ -6,14 +6,14 @@ Confirming lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b ms_to_bts_tx_cb: BTS->MS(us) message 6 MS: Verifying incoming primitive. Sending back to MS lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 03 00 0d [L3]> 05 04 0d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ms_to_bts_tx_cb: BTS->MS(us) message 12 MS: Verifying incoming MM message: 3 @@ -26,7 +26,7 @@ BTS: Verifying dummy message. lapdm_phsap_dequeue_prim(): got rc 0: Success MSGB: L3 is undefined -Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b lapdm_phsap_dequeue_prim(): got rc -19: No such device lapdm_phsap_dequeue_prim(): got rc -19: No such device @@ -35,17 +35,17 @@ bts_to_ms_tx_cb: MS->BTS(us) message 25 BTS: Verifying CM request. lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b lapdm_phsap_dequeue_prim(): got rc -19: No such device lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b I test RF channel establishment. Testing SAPI3/SDCCH lapdm_rslms_recvmsg(): got rc 0: Success lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03, FN 0 Message: [L2]> 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b lapdm_phsap_dequeue_prim(): got rc -19: No such device lapdm_phsap_dequeue_prim(): got rc -19: No such device @@ -53,7 +53,7 @@ lapdm_rslms_recvmsg(): got rc 0: Success lapdm_phsap_dequeue_prim(): got rc -19: No such device lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from ACCH queue: L2 header size 5, L3 size 18, SAP 0x1000000, 0/0, Link 0x43 +Took message from ACCH queue: L2 header size 5, L3 size 18, SAP 0x1000000, 0/0, Link 0x43, FN 0 Message: [L2]> 00 00 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b lapdm_phsap_dequeue_prim(): got rc -19: No such device lapdm_phsap_dequeue_prim(): got rc -19: No such device @@ -66,7 +66,7 @@ 00 00 17 [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b Sending Classmark Change @@ -77,7 +77,7 @@ lapdm_phsap_dequeue_prim(): got rc 0: Success MSGB: L3 is undefined -Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Enqueueing Ciphering Mode Command @@ -93,7 +93,7 @@ 00 00 17 [L2]> 03 40 0d [L3]> 06 35 01 lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 03 40 0d [L3]> 06 35 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Sending Cipher Mode Complete @@ -104,7 +104,7 @@ lapdm_phsap_dequeue_prim(): got rc 0: Success MSGB: L3 is undefined -Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 61 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Establishing SAPI=3 @@ -113,7 +113,7 @@ Dumping queue: lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03, FN 0 Message: [L2]> 0d 73 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Sending CP-DATA @@ -122,7 +122,7 @@ lapdm_phsap_dequeue_prim(): got rc 0: Success MSGB: L3 is undefined -Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x03 +Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x03, FN 0 Message: [L2]> 0d 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b === I test SAPI0/SAPI3 prioritization === @@ -131,10 +131,10 @@ bts_to_ms_dummy_tx_cb: MS->BTS(us) message 22 BTS is establishing a SAPI=3 link lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 73 35 [L3]> 06 27 07 03 50 58 92 05 f4 44 59 ba 63 2b 2b 2b 2b 2b 2b 2b lapdm_phsap_dequeue_prim(): got rc 0: Success -Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03 +Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03, FN 0 Message: [L2]> 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Checking the func=UA message: OK Checking the func=SABM message: OK -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icf986f4202703eb452bedc1b749bb8ce0c73706f Gerrit-Change-Number: 34130 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in libosmocore[master]: lapdm: Append RSL_IE_OSMO_ABS_FRAME_NUMBER to RSLms msgs towards uppe...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34132 ) Change subject: lapdm: Append RSL_IE_OSMO_ABS_FRAME_NUMBER to RSLms msgs towards upper layers ...................................................................... lapdm: Append RSL_IE_OSMO_ABS_FRAME_NUMBER to RSLms msgs towards upper layers This makes it possible to track GSM time in the upper layers. The existing RSL_IE_FRAME_NUMBER and RSL_IE_STARTNG_TIME cannot be used there, since those are 16bit fields containing Relative FN values. The IE needs to be added before the L3_INFO one, because user code usually assumes the msgb->l3 pointing to L3_INFO value extends until the end of the message, using msgb3_len(msg). Regarding having an extra IE at the middle, it's not a big problem since the libosmocore version submitting this commit to the upper layers is the same which will also be parsing it through rsl_tlv_parse() later on by the app. Related: OS#3626 Change-Id: Id62c18f49f270449067b25b7104eb8b47f1955ec --- M include/osmocom/gsm/rsl.h M src/gsm/lapdm.c M src/gsm/rsl.c M tests/lapd/lapd_test.c M tests/lapd/lapd_test.ok 5 files changed, 68 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/34132/1 diff --git a/include/osmocom/gsm/rsl.h b/include/osmocom/gsm/rsl.h index 285dbc2..b9d3282 100644 --- a/include/osmocom/gsm/rsl.h +++ b/include/osmocom/gsm/rsl.h @@ -51,6 +51,8 @@ /* Push a RSL RLL header with L3_INFO IE */ void rsl_rll_push_l3(struct msgb *msg, uint8_t msg_type, uint8_t chan_nr, uint8_t link_id, int transparent); +void rsl_rll_push_l3_with_fn(struct msgb *msg, uint8_t msg_type, uint8_t chan_nr, + uint8_t link_id, int transparent, uint32_t fn); /* Allocate msgb and fill with simple RSL RLL header */ struct msgb *rsl_rll_simple(uint8_t msg_type, uint8_t chan_nr, diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index e96e218..a2e44a3 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -503,7 +503,7 @@ int transparent = rsl_is_transparent(msg_type); /* Add the RSL + RLL header */ - rsl_rll_push_l3(msg, msg_type, mctx->chan_nr, mctx->link_id, transparent); + rsl_rll_push_l3_with_fn(msg, msg_type, mctx->chan_nr, mctx->link_id, transparent, mctx->fn); /* send off the RSLms message to L3 */ return rslms_sendmsg(msg, mctx->dl->entity); @@ -517,6 +517,8 @@ /* Add the RSL + RLL header */ msgb_tv16_push(msg, RSL_IE_L3_INFO, l3_len); + msgb_tv32_push(msg, RSL_IE_OSMO_ABS_FRAME_NUMBER, mctx->fn); + /* Add two non-standard IEs carrying MS power and TA values for B4 (SACCH) */ if (mctx->lapdm_fmt == LAPDm_FMT_B4) { msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); @@ -535,6 +537,8 @@ int transparent = rsl_is_transparent(msg_type); msg = rsl_rll_simple(msg_type, mctx->chan_nr, mctx->link_id, transparent); + /* Add FN to the end to keep backward compat: */ + msgb_tv32_put(msg, RSL_IE_OSMO_ABS_FRAME_NUMBER, mctx->fn); /* send off the RSLms message to L3 */ return rslms_sendmsg(msg, mctx->dl->entity); @@ -547,6 +551,9 @@ LOGDL(&mctx->dl->dl, LOGL_NOTICE, "sending MDL-ERROR-IND %d\n", cause); msg = rsl_rll_simple(RSL_MT_ERROR_IND, mctx->chan_nr, mctx->link_id, 0); msgb_tlv_put(msg, RSL_IE_RLM_CAUSE, 1, &cause); + /* Add FN to the end to keep backward compat: */ + msgb_tv32_put(msg, RSL_IE_OSMO_ABS_FRAME_NUMBER, mctx->fn); + return rslms_sendmsg(msg, mctx->dl->entity); } diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index eac7fd8..a95d294 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -561,6 +561,31 @@ rsl_rll_push_hdr(msg, msg_type, chan_nr, link_id, transparent); } +/*! Wrap msgb in L3 Info IE and push a RSL RLL header + * \param[in] msg Message Buffer to which L3 Header shall be appended + * \param[in] msg_type RSL Message Type + * \param[in] chan_hr RSL Channel Number + * \param[in] link_id Link Identififer + * \param[in] transparent Transparent to BTS (1) or not (0) + * \param[in] fn Frame Number + */ +void rsl_rll_push_l3_with_fn(struct msgb *msg, uint8_t msg_type, uint8_t chan_nr, + uint8_t link_id, int transparent, uint32_t fn) +{ + uint8_t l3_len = msg->tail - (uint8_t *)msgb_l3(msg); + + /* construct a RSLms RLL message (DATA INDICATION, UNIT DATA + * INDICATION) and send it off via RSLms */ + + /* Push the L3 IE tag and length */ + msgb_tv16_push(msg, RSL_IE_L3_INFO, l3_len); + + msgb_tv32_push(msg, RSL_IE_OSMO_ABS_FRAME_NUMBER, fn); + + /* Then push the RSL header */ + rsl_rll_push_hdr(msg, msg_type, chan_nr, link_id, transparent); +} + /*! Create msgb with RSL RLL header * \param[in] msg_type RSL Message Type * \param[in] chan_nr RSL Channel Number diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c index afea822..791edc8 100644 --- a/tests/lapd/lapd_test.c +++ b/tests/lapd/lapd_test.c @@ -360,7 +360,7 @@ struct abis_rsl_rll_hdr hdr; printf("MS: Verifying incoming primitive.\n"); - OSMO_ASSERT(msg->len == sizeof(struct abis_rsl_rll_hdr)); + OSMO_ASSERT(msg->len >= sizeof(struct abis_rsl_rll_hdr)); /* verify the header */ memset(&hdr, 0, sizeof(hdr)); diff --git a/tests/lapd/lapd_test.ok b/tests/lapd/lapd_test.ok index a2e5ae3..9a3094f 100644 --- a/tests/lapd/lapd_test.ok +++ b/tests/lapd/lapd_test.ok @@ -1,28 +1,28 @@ I do some very simple LAPDm test. Establishing link. ms_to_bts_l1_cb: MS(us) -> BTS prim message -bts_to_ms_tx_cb: MS->BTS(us) message 25 +bts_to_ms_tx_cb: MS->BTS(us) message 30 BTS: Verifying CM request. Confirming lapdm_phsap_dequeue_prim(): got rc 0: Success Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b -ms_to_bts_tx_cb: BTS->MS(us) message 6 +ms_to_bts_tx_cb: BTS->MS(us) message 11 MS: Verifying incoming primitive. Sending back to MS lapdm_phsap_dequeue_prim(): got rc 0: Success Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 Message: [L2]> 03 00 0d [L3]> 05 04 0d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b -ms_to_bts_tx_cb: BTS->MS(us) message 12 +ms_to_bts_tx_cb: BTS->MS(us) message 17 MS: Verifying incoming MM message: 3 ms_to_bts_l1_cb: MS(us) -> BTS prim message lapdm_phsap_dequeue_prim(): got rc -19: No such device Sending back to BTS ms_to_bts_l1_cb: MS(us) -> BTS prim message -bts_to_ms_tx_cb: MS->BTS(us) message 14 +bts_to_ms_tx_cb: MS->BTS(us) message 19 BTS: Verifying dummy message. lapdm_phsap_dequeue_prim(): got rc 0: Success MSGB: L3 is undefined @@ -32,7 +32,7 @@ lapdm_phsap_dequeue_prim(): got rc -19: No such device I test RF channel release of an unestablished channel. I test contention resultion by having two mobiles collide and first mobile repeating SABM. -bts_to_ms_tx_cb: MS->BTS(us) message 25 +bts_to_ms_tx_cb: MS->BTS(us) message 30 BTS: Verifying CM request. lapdm_phsap_dequeue_prim(): got rc 0: Success Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 @@ -60,7 +60,7 @@ I test if desync problems exist in LAPDm Establishing SAPI=0 -bts_to_ms_dummy_tx_cb: MS->BTS(us) message 25 +bts_to_ms_dummy_tx_cb: MS->BTS(us) message 30 Dumping queue: 00 00 17 [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 @@ -70,7 +70,7 @@ Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b Sending Classmark Change -bts_to_ms_dummy_tx_cb: MS->BTS(us) message 27 +bts_to_ms_dummy_tx_cb: MS->BTS(us) message 32 Dumping queue: 00 00 17 [L2]> 01 21 01 @@ -87,7 +87,7 @@ Sending GPRS Suspend Request -bts_to_ms_dummy_tx_cb: MS->BTS(us) message 22 +bts_to_ms_dummy_tx_cb: MS->BTS(us) message 27 Dumping queue: 00 00 17 [L2]> 03 40 0d [L3]> 06 35 01 @@ -97,7 +97,7 @@ Message: [L2]> 03 40 0d [L3]> 06 35 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Sending Cipher Mode Complete -bts_to_ms_dummy_tx_cb: MS->BTS(us) message 11 +bts_to_ms_dummy_tx_cb: MS->BTS(us) message 16 Dumping queue: 00 00 17 [L2]> 01 61 01 @@ -108,7 +108,7 @@ Message: [L2]> 01 61 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Establishing SAPI=3 -bts_to_ms_dummy_tx_cb: MS->BTS(us) message 6 +bts_to_ms_dummy_tx_cb: MS->BTS(us) message 11 Dumping queue: @@ -128,7 +128,7 @@ === I test SAPI0/SAPI3 prioritization === MS is establishing a SAPI=0 link -bts_to_ms_dummy_tx_cb: MS->BTS(us) message 22 +bts_to_ms_dummy_tx_cb: MS->BTS(us) message 27 BTS is establishing a SAPI=3 link lapdm_phsap_dequeue_prim(): got rc 0: Success Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00, FN 0 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id62c18f49f270449067b25b7104eb8b47f1955ec Gerrit-Change-Number: 34132 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: l1ctl: Fix fill ph_data_param fn field

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34129 ) Change subject: l1ctl: Fix fill ph_data_param fn field ...................................................................... l1ctl: Fix fill ph_data_param fn field This commit fixes recent previous commit filling in the fn field. The dl->frame_nr is network order, and we want to pass a host order integer in the primitive. Use the tm.fn which already includes the proper value calculated from dl->frame_nr. Fixes: d524c17d907b39189c1c7b465b8f40db2d79f55b Related: OS#3626 Change-Id: Id96015c8b419932abb8095c6cb85aceef34e366f --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/29/34129/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 08fb646..b2ad505 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -317,7 +317,7 @@ PRIM_OP_INDICATION, msg); pp.u.data.chan_nr = dl->chan_nr; pp.u.data.link_id = dl->link_id; - pp.u.data.fn = dl->frame_nr; + pp.u.data.fn = tm.fn; /* send it up into LAPDm */ return lapdm_phsap_up(&pp.oph, le); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id96015c8b419932abb8095c6cb85aceef34e366f Gerrit-Change-Number: 34129 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_rim: do not check the origin of a RIM message

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 ) Change subject: sgsn_rim: do not check the origin of a RIM message ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Is there even a way to distinguish? I see no identifier in the GTP messages. […] Yes, by looking at the src+dst address of the GTP message, one can know which peer it is (we hold that information per mme, and we'll probably hold that per sgsn-peer in the future? or it maybe goes through GGSN?) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be Gerrit-Change-Number: 34121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 11:43:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023