January 2026 - gerrit-log - lists.osmocom.org

[S] Change in android-apdu-proxy[master]: OmapiCallbackHandlerVpcd: fetch SELECT response from OMAPI
by dexter 09 Jan '26

09 Jan '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/41804?usp=email ) Change subject: OmapiCallbackHandlerVpcd: fetch SELECT response from OMAPI ...................................................................... OmapiCallbackHandlerVpcd: fetch SELECT response from OMAPI At the moment we get the select response by selecting 7FFF, which is an alias for the currently selected application. This returns a select response when an ISIM or USIM application is selected. Other applications may react differently here. OMAPI has a getSelectResponse method through which we can get the actual response that was received from the card when the application was selected when openLogicalChannel was called. This is far more accurate, so lets use getSelectResponse instead of selecting 7FFF. Change-Id: Iacbc907ef157f20bed88325fcf6b58717990005a --- M app/src/main/java/org/osmocom/androidApduProxy/Omapi.java M app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java 2 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy refs/changes/04/41804/1 diff --git a/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java b/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java index afd4515..6d88273 100644 --- a/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java +++ b/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java @@ -192,6 +192,28 @@ } /** + * Read the SELECT response after method open was called successfully. + * @param channelId id-number of the OMAPI Channel + * @return array of bytes that contains the SELECT response or, throws Exception on error + */ + public byte[] getSelRes(int channelId) throws Exception { + try { + ensureSeService(); + if (!channels.containsKey(channelId)) + throw new Exception(String.format("no channel open under channelId = %d", channelId)); + Channel channel = channels.get(channelId); + byte[] response = channel.getSelectResponse(); + if (response == null) + throw new Exception("unresponsive card!"); + Log.d("OMAPI","SELECT RESPONSE: " + Utils.b2h(response) + "\n"); + return response; + } catch (Exception e) { + Log.e("OMAPI",e.getMessage() + "\n"); + throw e; + } + } + + /** * Perform an APDU transaction on the card. * @param channelId id-number of the OMAPI Channel * @param apdu array of bytes that contains the command APDU (to card) diff --git a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java index 8f1d8c7..8bb41ac 100644 --- a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java +++ b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java @@ -163,7 +163,7 @@ int newOmapiChannel; byte[] response; newOmapiChannel = omapi.open(omapiReader, aidReq); - response = omapi.transact(newOmapiChannel, Utils.h2b("00a40004027fff")); + response = omapi.getSelRes(newOmapiChannel); Log.i("PROXY", String.format("Opening new channel (%d) for AID (%s) was successful, now closing the old channel (%d)...\n", newOmapiChannel, Utils.b2h(aidReq), omapiChannel)); omapi.close(omapiChannel); -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/41804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Iacbc907ef157f20bed88325fcf6b58717990005a Gerrit-Change-Number: 41804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in android-apdu-proxy[master]: OmapiCallbackHandlerVpcd: pass SELECT parameter P2 to OMAPI
by dexter 09 Jan '26

09 Jan '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/41805?usp=email ) Change subject: OmapiCallbackHandlerVpcd: pass SELECT parameter P2 to OMAPI ...................................................................... OmapiCallbackHandlerVpcd: pass SELECT parameter P2 to OMAPI The OMAPI method openLogicalChannel may take an optional parameter p2, This parameter. Among other function, this paramter in particular controls how to deal with short DF-Names that match the AIDs of several applications. Since we always know this parameter from the TPDU that we receive from VPCD, let's pass it on to OMAPI when we create a new channel. Related OS#6836 Change-Id: Ibab2cc197284e6177a83338007a0b7f77e0ab8b9 --- M app/src/main/java/org/osmocom/androidApduProxy/Omapi.java M app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy refs/changes/05/41805/1 diff --git a/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java b/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java index 6d88273..c814a0e 100644 --- a/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java +++ b/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java @@ -170,13 +170,14 @@ * Open a channel on the specified reader to the specified AID. * @param readerName string that contains the reader name (e.g. "SIM1") * @param aid array of bytes that contains the AID of the application to access + * @param p2 parameter value to use with the SELECT APDU * @return OMAPI Channel number on success, throws Exception on error */ - public int open(String readerName, byte[] aid) throws Exception { + public int open(String readerName, byte[] aid, byte p2) throws Exception { try { ensureSeService(); Session session = getOrCreateSession(readerName); - Channel channel = session.openLogicalChannel(aid); + Channel channel = session.openLogicalChannel(aid, p2); if (channel == null) throw new Exception(String.format("could not open channel for AID (%s) on reader: %s!\n", Utils.b2h(aid), readerName)); @@ -192,6 +193,16 @@ } /** + * Open a channel on the specified reader to the specified AID. + * @param readerName string that contains the reader name (e.g. "SIM1") + * @param aid array of bytes that contains the AID of the application to access + * @return OMAPI Channel number on success, throws Exception on error + */ + public int open(String readerName, byte[] aid) throws Exception { + return open(readerName, aid, (byte)0x04); + } + + /** * Read the SELECT response after method open was called successfully. * @param channelId id-number of the OMAPI Channel * @return array of bytes that contains the SELECT response or, throws Exception on error diff --git a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java index 8bb41ac..d82a23a 100644 --- a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java +++ b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java @@ -162,7 +162,7 @@ try { int newOmapiChannel; byte[] response; - newOmapiChannel = omapi.open(omapiReader, aidReq); + newOmapiChannel = omapi.open(omapiReader, aidReq, tpdu[3]); response = omapi.getSelRes(newOmapiChannel); Log.i("PROXY", String.format("Opening new channel (%d) for AID (%s) was successful, now closing the old channel (%d)...\n", newOmapiChannel, Utils.b2h(aidReq), omapiChannel)); -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/41805?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Ibab2cc197284e6177a83338007a0b7f77e0ab8b9 Gerrit-Change-Number: 41805 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in android-apdu-proxy[master]: OmapiCallbackHandlerVpcd: simplify/fix SELECT by DF-Name (aid)
by dexter 09 Jan '26

09 Jan '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/41806?usp=email ) Change subject: OmapiCallbackHandlerVpcd: simplify/fix SELECT by DF-Name (aid) ...................................................................... OmapiCallbackHandlerVpcd: simplify/fix SELECT by DF-Name (aid) When a TPDU with a SELECT by DF-Name is received from the VPCD end, it cannot be transparently passed through the OMAPI channel as OMAPI will block those TDPUs for security reasons. To overcome this, we close the current OMAPI channel and re-open a new one under the new DF-Name (AID). To reduce the likelyhood for unexpected behaviour and possible loss of state we have replaced the SELECT by DF-Name with a SELECT to 7fff (alias for the currently selected application), in case the SELECT by DF-Name would target the currently selected application. This workaround requires preceise tracking of which application is currently selected. Unfortunately this has proven as difficult and error prone. After looking closer at the problem we noticed that we do not even need the aforementioned workaround. The opening and closing of the OMAPI channel just opens and closes logical channels on the card. It does not perform a reset. This in particular means that the ADM or PIN verification state is retained. (states like the currently selected file, the current tag and the current record are reset by SELECT anyway). So let's remove the workaround and re-open the OMAPI channel each time a SELECT by DF-Name is received. Related: OS#6836 Change-Id: Ib4873b18d233e549e075b9384906a536907c6260 --- M app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java 1 file changed, 24 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy refs/changes/06/41806/1 diff --git a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java index d82a23a..973361e 100644 --- a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java +++ b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java @@ -17,7 +17,6 @@ private int remotePort = 0; private Handler uiHandler = null; private int omapiChannel = -1; - private byte[] omapiAid = null; //When we open the OMPI channel the first time, we must provide an AID. The following AID is //the prefix (RID) of 3GPP (see also ETSI TS 101 220, section 4.1) This prefix should select @@ -74,7 +73,6 @@ sendErrorMessage(e); return; } - omapiAid = DEFAULT_AID; sendMessageInd(MainActivity.IND_CHANNEL_OPEN); } @Override @@ -89,14 +87,12 @@ return; } sendMessageInd(MainActivity.IND_CHANNEL_OPEN); - omapiAid = DEFAULT_AID; } @Override public void vpcdPwrOff() { Log.i("PROXY", "Closing OMAPI channel as an alternative to power-off...\n"); omapi.close(omapiChannel); sendMessageInd(MainActivity.IND_CHANNEL_CLOSE); - omapiAid = null; } @Override public byte[] vpcdTransact(byte[] tpdu) { @@ -111,14 +107,11 @@ return (Utils.h2b("6700")); } - //In case the TPDU contains a SELECT by DF-Name, which is forbidden by OMAPI by design, we must - //find an alternative solution: In case the SELECT targets the currently selected application, - //we just use the FID 7FFF, which is an alias for the currently selected application. In case the - //AID is different, we close the OMAPI channel and re-open it with the new AID. If this fails, we - //we just pretend that we haven't found the file. + //In case the TPDU contains a SELECT by DF-Name (AID), we cannot transparently pass on the TPDU through + //the OMAPI channel since OMAPI will block such TPDUs for security reasons. The only way to archive a + //similar result is to close the existing OMAPI channel to and re-open a new OMAPI channel under the + //DF-Name (AID) given in in the TPDU. if (Arrays.equals(Arrays.copyOf(tpdu, 3), Utils.h2b("00A404"))) { - int compareLength = 0; - //Make sure that the Lc field of the TPDU does not exceed the TPDU length if (tpdu[4] > tpdu.length - 5) { Log.e("PROXY", String.format("SELECT by DF-Name with invalid length field, rejecting TPDU (%s)...\n", @@ -142,39 +135,26 @@ aidReq = new byte[0]; } - if (omapiAid != null) { - if (aidReq.length < omapiAid.length) - compareLength = aidReq.length; - else - compareLength = omapiAid.length; - } - if (omapiAid != null && Arrays.equals(Arrays.copyOf(omapiAid, compareLength), Arrays.copyOf(aidReq, compareLength))) { - Log.i("PROXY", String.format("Selecting the currently selected ADF (%s->7fff), as a replacement for SELECT by DF-Name...\n", - Utils.b2h(aidReq))); - try { - return omapi.transact(omapiChannel, Utils.h2b("00a40004027fff")); - } catch (Exception e) { - sendErrorMessage(e); - } - } else { - Log.i("PROXY", String.format("Opening new channel for AID (%s) as a replacement for SELECT by DF-Name...\n", - Utils.b2h(aidReq))); - try { - int newOmapiChannel; - byte[] response; - newOmapiChannel = omapi.open(omapiReader, aidReq, tpdu[3]); - response = omapi.getSelRes(newOmapiChannel); - Log.i("PROXY", String.format("Opening new channel (%d) for AID (%s) was successful, now closing the old channel (%d)...\n", - newOmapiChannel, Utils.b2h(aidReq), omapiChannel)); - omapi.close(omapiChannel); - omapiAid = aidReq; - omapiChannel = newOmapiChannel; - return response; - } catch (Exception e) { - Log.i("PROXY", String.format("Opening new channel for new AID (%s) was not successful, pretending that the file was not found...\n", - Utils.b2h(aidReq))); - return (Utils.h2b("6A82")); - } + //Compare the given DF-Name to the AID of the current OMAPI channel. If the DF-Name still matches + //the AID of the current OMAPI channel, we stay on the current OMAPI channel. If the DF-Name + //references the AID of a different application, we will close the current OMAPI channel and open a + //new one. + Log.i("PROXY", String.format("Opening new channel for AID (%s) as a replacement for SELECT by DF-Name...\n", + Utils.b2h(aidReq))); + try { + int newOmapiChannel; + byte[] response; + newOmapiChannel = omapi.open(omapiReader, aidReq, tpdu[3]); + response = omapi.getSelRes(newOmapiChannel); + Log.i("PROXY", String.format("Opening new channel (%d) for AID (%s) was successful, now closing the old channel (%d)...\n", + newOmapiChannel, Utils.b2h(aidReq), omapiChannel)); + omapi.close(omapiChannel); + omapiChannel = newOmapiChannel; + return response; + } catch (Exception e) { + Log.i("PROXY", String.format("Opening new channel for new AID (%s) was not successful, pretending that the file was not found...\n", + Utils.b2h(aidReq))); + return (Utils.h2b("6A82")); } } -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/41806?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Ib4873b18d233e549e075b9384906a536907c6260 Gerrit-Change-Number: 41806 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: ta_power_control: reset during lchan activation
by pespin 09 Jan '26

09 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41796?usp=email ) Change subject: ta_power_control: reset during lchan activation ...................................................................... ta_power_control: reset during lchan activation This way lchan->ta_ctrl.skip_block_num is also reset to 0 during chan re-activation case, in which case we allow the TA control loop to kick in during first input after re-activation. Change-Id: I149fffa73ef651fd21e52e5423b31f8e95e57941 --- M src/common/rsl.c M src/common/ta_control.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/41796/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 07d5e6d..3a52167 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2056,10 +2056,9 @@ } /* 9.3.24 Timing Advance */ + lchan_ms_ta_ctrl_reset(lchan); if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1)) lchan->ta_ctrl.current = *TLVP_VAL(&tp, RSL_IE_TIMING_ADVANCE); - else /* assume TA=0 if not indicated by the BSC */ - lchan->ta_ctrl.current = 0; /* 9.3.31 (TLV) MS Power Parameters IE (vendor specific) */ if ((ie = TLVP_GET(&tp, RSL_IE_MS_POWER_PARAM)) != NULL) { diff --git a/src/common/ta_control.c b/src/common/ta_control.c index b5d9cb2..85e5f81 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -46,6 +46,7 @@ { /* Trigger loop on first TA input: */ lchan->ta_ctrl.skip_block_num = 0; + /* Assume TA=0 if not indicated by the BSC */ lchan->ta_ctrl.current = 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I149fffa73ef651fd21e52e5423b31f8e95e57941 Gerrit-Change-Number: 41796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: bs_power_control: Apply defaults during reset
by pespin 09 Jan '26

09 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41794?usp=email ) Change subject: bs_power_control: Apply defaults during reset ...................................................................... bs_power_control: Apply defaults during reset lchan_bs_pwr_ctrl_reset() is already called furhter above in rsl_rx_chan_activ(), so simplify mode the default values there and no need to re-apply them twice. Change-Id: I00d9205d114b2d507c1048375693de4aa06bebbe --- M src/common/power_control.c M src/common/rsl.c 2 files changed, 4 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/41794/1 diff --git a/src/common/power_control.c b/src/common/power_control.c index 0520ed8..bf310c6 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -325,9 +325,12 @@ struct lchan_power_ctrl_state *state = &lchan->bs_power_ctrl; /* This below implicitly sets: + * state->current = 0 (it's safer to start from 0 unless told differently). * state->dpc_params = NULL (static mode). * state->skip_block_num = 0, so that 1st power input is taken into account. */ memset(state, 0, sizeof(*state)); + + state->max = 2 * 15; /* maximum defined in 9.3.4 */ } /*! compute the new Downlink attenuation value for the given logical channel. diff --git a/src/common/rsl.c b/src/common/rsl.c index cb13977..863167e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1989,8 +1989,6 @@ } } - /* Initialize MS/BS Power Control state */ - lchan_bs_pwr_ctrl_reset(lchan); lchan_ms_pwr_ctrl_reset(lchan); /* 9.3.6 Channel Mode */ @@ -2028,6 +2026,7 @@ } /* 9.3.4 BS Power */ + lchan_bs_pwr_ctrl_reset(lchan); if (TLVP_PRES_LEN(&tp, RSL_IE_BS_POWER, 1)) { if (*TLVP_VAL(&tp, RSL_IE_BS_POWER) & (1 << 4)) { LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, @@ -2048,9 +2047,6 @@ LOGPLCHAN(lchan, DRSL, LOGL_DEBUG, "BS Power attenuation %u dB\n", lchan->bs_power_ctrl.current); - } else { - lchan->bs_power_ctrl.max = 2 * 15; /* maximum defined in 9.3.4 */ - lchan->bs_power_ctrl.current = 0; } /* 9.3.13 MS Power */ @@ -2096,9 +2092,6 @@ LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Failed to parse BS Power Parameters IE\n"); return rsl_tx_chan_act_nack(lchan, RSL_ERR_IE_CONTENT); } - - /* NOTE: it's safer to start from 0 */ - lchan->bs_power_ctrl.current = 0; lchan->bs_power_ctrl.dpc_params = params; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I00d9205d114b2d507c1048375693de4aa06bebbe Gerrit-Change-Number: 41794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: ms_power_control: Apply defaults during reset
by pespin 09 Jan '26

09 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41795?usp=email ) Change subject: ms_power_control: Apply defaults during reset ...................................................................... ms_power_control: Apply defaults during reset lchan_ms_pwr_ctrl_reset() is already called furhter above in rsl_rx_chan_activ(), so simplify mode the default values there and no need to re-apply them twice. Change-Id: I5c0137ba8bf1e057abdc1911716e3d1bf8c61ea3 --- M src/common/power_control.c M src/common/rsl.c 2 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/41795/1 diff --git a/src/common/power_control.c b/src/common/power_control.c index bf310c6..187c5da 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -145,6 +145,10 @@ * state->dpc_params = NULL (static mode). * state->skip_block_num = 0, so that 1st power input is taken into account. */ memset(state, 0, sizeof(*state)); + + state->max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); + /* XXX: should we use the maximum power level instead of 0 dBm? */ + state->current = state->max; } /* Shall we skip current block based on configured interval? */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 863167e..07d5e6d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1989,8 +1989,6 @@ } } - lchan_ms_pwr_ctrl_reset(lchan); - /* 9.3.6 Channel Mode */ if (type != RSL_ACT_OSMO_PDCH) { if (rsl_handle_chan_mod_ie(lchan, &tp, &cause) != 0) @@ -2050,11 +2048,12 @@ } /* 9.3.13 MS Power */ - if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) + lchan_ms_pwr_ctrl_reset(lchan); + if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) { lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F; - else /* XXX: should we use the maximum power level instead of 0 dBm? */ - lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); - lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; + /* XXX: should we use the maximum power level instead of 0 dBm? */ + lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; + } /* 9.3.24 Timing Advance */ if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1)) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41795?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c0137ba8bf1e057abdc1911716e3d1bf8c61ea3 Gerrit-Change-Number: 41795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: {bs,ms}_power_control: Reset state during lchan deactivation
by pespin 09 Jan '26

09 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41793?usp=email ) Change subject: {bs,ms}_power_control: Reset state during lchan deactivation ...................................................................... {bs,ms}_power_control: Reset state during lchan deactivation Change-Id: I0c247414d27d7ac636c6dbb294b0dd3bffc4ed97 --- M src/common/lchan.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/41793/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index 7123cee..b115e1e 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -326,6 +326,8 @@ lchan->pending_rel_ind_msg = NULL; msgb_free(lchan->pending_chan_activ); lchan->pending_chan_activ = NULL; + lchan_bs_pwr_ctrl_reset(lchan); + lchan_ms_pwr_ctrl_reset(lchan); lchan_ms_ta_ctrl_reset(lchan); /* fall through */ default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0c247414d27d7ac636c6dbb294b0dd3bffc4ed97 Gerrit-Change-Number: 41793 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: {bs,ms}_power_control: Add helper function to reset state
by pespin 09 Jan '26

09 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41792?usp=email ) Change subject: {bs,ms}_power_control: Add helper function to reset state ...................................................................... {bs,ms}_power_control: Add helper function to reset state This way we can better document and identify places where the state is reset. Change-Id: I3e010a4ed72ba2574ce6c1316b8460689fc1d482 --- M include/osmo-bts/power_control.h M src/common/power_control.c M src/common/rsl.c 3 files changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/41792/1 diff --git a/include/osmo-bts/power_control.h b/include/osmo-bts/power_control.h index 0764ba7..031d462 100644 --- a/include/osmo-bts/power_control.h +++ b/include/osmo-bts/power_control.h @@ -81,10 +81,12 @@ void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr); struct gsm_lchan; +void lchan_ms_pwr_ctrl_reset(struct gsm_lchan *lchan); int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, const uint8_t ms_power_lvl, const int8_t ul_rssi_dbm, const int16_t ul_lqual_cb); +void lchan_bs_pwr_ctrl_reset(struct gsm_lchan *lchan); int lchan_bs_pwr_ctrl(struct gsm_lchan *lchan, const struct gsm48_meas_res *mr); diff --git a/src/common/power_control.c b/src/common/power_control.c index 45d8969..0520ed8 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -137,6 +137,16 @@ return delta; } +void lchan_ms_pwr_ctrl_reset(struct gsm_lchan *lchan) +{ + struct lchan_power_ctrl_state *state = &lchan->ms_power_ctrl; + + /* This below implicitly sets: + * state->dpc_params = NULL (static mode). + * state->skip_block_num = 0, so that 1st power input is taken into account. */ + memset(state, 0, sizeof(*state)); +} + /* Shall we skip current block based on configured interval? */ static bool ctrl_interval_skip_block(const struct gsm_power_ctrl_params *params, struct lchan_power_ctrl_state *state) @@ -310,6 +320,16 @@ return 1; } +void lchan_bs_pwr_ctrl_reset(struct gsm_lchan *lchan) +{ + struct lchan_power_ctrl_state *state = &lchan->bs_power_ctrl; + + /* This below implicitly sets: + * state->dpc_params = NULL (static mode). + * state->skip_block_num = 0, so that 1st power input is taken into account. */ + memset(state, 0, sizeof(*state)); +} + /*! compute the new Downlink attenuation value for the given logical channel. * \param lchan logical channel for which to compute (and in which to store) new power value. * \param[in] mr pointer to a *valid* Measurement Report. diff --git a/src/common/rsl.c b/src/common/rsl.c index ba403bc..cb13977 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -58,6 +58,7 @@ #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/notification.h> #include <osmo-bts/asci.h> +#include <osmo-bts/power_control.h> #include <osmo-bts/ta_control.h> //#define FAKE_CIPH_MODE_COMPL @@ -1764,8 +1765,8 @@ lchan->tch_mode = 0; memset(&lchan->encr, 0, sizeof(lchan->encr)); memset(&lchan->ho, 0, sizeof(lchan->ho)); - memset(&lchan->ms_power_ctrl, 0, sizeof(lchan->ms_power_ctrl)); - memset(&lchan->bs_power_ctrl, 0, sizeof(lchan->bs_power_ctrl)); + lchan_bs_pwr_ctrl_reset(lchan); + lchan_ms_pwr_ctrl_reset(lchan); lchan_ms_ta_ctrl_reset(lchan); copy_sacch_si_to_lchan(lchan); memset(&lchan->tch, 0, sizeof(lchan->tch)); @@ -1989,8 +1990,8 @@ } /* Initialize MS/BS Power Control state */ - memset(&lchan->ms_power_ctrl, 0, sizeof(lchan->ms_power_ctrl)); - memset(&lchan->bs_power_ctrl, 0, sizeof(lchan->bs_power_ctrl)); + lchan_bs_pwr_ctrl_reset(lchan); + lchan_ms_pwr_ctrl_reset(lchan); /* 9.3.6 Channel Mode */ if (type != RSL_ACT_OSMO_PDCH) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e010a4ed72ba2574ce6c1316b8460689fc1d482 Gerrit-Change-Number: 41792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: ta_control: Fix skip_block_num not reset when switching TS to PDCH
by pespin 09 Jan '26

09 Jan '26

Attention is currently required from: fixeria, jolly, laforge. Hello fixeria, jolly, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email to look at the new patch set (#2). Change subject: ta_control: Fix skip_block_num not reset when switching TS to PDCH ...................................................................... ta_control: Fix skip_block_num not reset when switching TS to PDCH Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d --- M include/osmo-bts/ta_control.h M src/common/rsl.c M src/common/ta_control.c 3 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/41790/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d Gerrit-Change-Number: 41790 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-bts[master]: ta_control: Fix skip_block_num not reset when switching TS to PDCH
by pespin 09 Jan '26

09 Jan '26

Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email ) Change subject: ta_control: Fix skip_block_num not reset when switching TS to PDCH ...................................................................... Patch Set 1: (1 comment) File src/common/ta_control.c: https://gerrit.osmocom.org/c/osmo-bts/+/41790/comment/04d08fd7_c2883c90?usp… : PS1, Line 52: lchan->ta_ctrl.skip_block_num = lchan->ts->trx->ta_ctrl_interval * 2 - 1; We may actually want to do "lchan->ta_ctrl.skip_block_num = 0" here, so that the first TA input after lchan creation is taken into account. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41790?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3e81ebec04042dd7d8e4805762e3e518790706d Gerrit-Change-Number: 41790 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Jan 2026 11:21:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026