- gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: cosmetic: context_map.h: Document parameters of all map_sccp_fsm_even...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40174?usp=email ) Change subject: cosmetic: context_map.h: Document parameters of all map_sccp_fsm_event values ...................................................................... cosmetic: context_map.h: Document parameters of all map_sccp_fsm_event values Change-Id: I53603ade5157ddbccb49864a2edab09376fe8979 --- M include/osmocom/hnbgw/context_map.h 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/40174/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 7e288d7..9791954 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -54,13 +54,14 @@ * MAP_SCCP_EV_TX_DATA_REQUEST, MAP_SCCP_EV_RAN_DISC. */ enum map_sccp_fsm_event { - /* Receiving an SCCP CC from CN. */ + /* Receiving an SCCP CC from CN. + * Parameter: struct msgb *ranap_msg */ MAP_SCCP_EV_RX_CONNECTION_CONFIRM, /* Receiving some data from CN via SCCP, to forward via RUA to HNB. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg, may be NULL or empty. */ MAP_SCCP_EV_RX_DATA_INDICATION, /* RUA has received some data from HNB to forward via SCCP to CN. - * Parameter: struct msgb *ranap_msg */ + * Parameter: struct msgb *ranap_msg. */ MAP_SCCP_EV_TX_DATA_REQUEST, /* 3GPP TS 25.468 9.1.5: The RAN side received a RUA Disconnect. * - Under normal conditions (cause=Normal) the RUA Disconnect contains a RANAP Iu-ReleaseComplete. @@ -75,15 +76,19 @@ * happened under error or normal conditions, as per the above. */ MAP_SCCP_EV_RAN_DISC, - /* The RAN released ungracefully. We will directly disconnect the SCCP connection, too. */ + /* The RAN released ungracefully. We will directly disconnect the SCCP connection, too. + * Parameter: no parameter, NULL. */ MAP_SCCP_EV_RAN_LINK_LOST, - /* Receiving an SCCP RLSD from CN, or libosmo-sigtran tells us about SCCP connection timeout. All done. */ + /* Receiving an SCCP RLSD from CN, or libosmo-sigtran tells us about SCCP connection timeout. All done. + * Parameter: struct msgb *ranap_msg, may be NULL or empty. */ MAP_SCCP_EV_RX_RELEASED, /* The human admin asks to drop the current SCCP connection, by telnet VTY 'apply sccp' in presence of SCCP - * config changes. */ + * config changes. + * Parameter: no parameter, NULL. */ MAP_SCCP_EV_USER_ABORT, /* The CN link can no longer work, for example a RANAP RESET was received from the cnlink that hosts this - * context map. */ + * context map. + * Parameter: no parameter, NULL. */ MAP_SCCP_EV_CN_LINK_LOST, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40174?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I53603ade5157ddbccb49864a2edab09376fe8979 Gerrit-Change-Number: 40174 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: context_map_sccp: Queue RUA->SCCP RANAP msgs while in SCCP WAIT_CC state

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40176?usp=email ) Change subject: context_map_sccp: Queue RUA->SCCP RANAP msgs while in SCCP WAIT_CC state ...................................................................... context_map_sccp: Queue RUA->SCCP RANAP msgs while in SCCP WAIT_CC state HNB transmits the first RANAP PDU over a RUA Connect msg, which creates the session without need for any confirmation from HNBGW. As a result, HNB is allowed to transmit more RANAP PDUs after that. On the other side HNBGW, SCCP conn establishment towards CN consists of a CREQ msg and then wait until CC (or CREF) is received. HNBGW is unable to transmit any more data during that time, only the one appended to the CREQ SCCP msg. If the RAN transmits any more RANAP PDU over RUA while SCCP side is still waiting for CC, we were discarding the message. Instead, queue it and transmit it once finally the CC is received from the peer. Related: SYS#7453 Change-Id: I307ded905901421f8228fab720b3989a2f94412b --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map_sccp.c 2 files changed, 32 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/76/40176/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 469323a..7dd9a1a 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -164,6 +164,12 @@ uint32_t scu_conn_id; /* FSM handling the SCCP state for scu_conn_id. */ struct osmo_fsm_inst *sccp_fi; + /* State context related to field sccp_fi above: */ + struct { + /* List of cached packets received from RUA and to be forwarded + once SCCP CReq is CC'ed and move to CONNECTED state. */ + struct llist_head wait_cc_tx_msg_list; + } sccp_fi_ctx; /* False for CS, true for PS */ bool is_ps; diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index cf57c82..d317e0f 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -79,7 +79,7 @@ OSMO_ASSERT(map->sccp_fi == NULL); map->sccp_fi = fi; - + INIT_LLIST_HEAD(&map->sccp_fi_ctx.wait_cc_tx_msg_list); /* trigger the timeout */ map_sccp_fsm_state_chg(MAP_SCCP_ST_INIT); } @@ -193,6 +193,19 @@ return hnbgw_ranap_rx_data_dl(map, ranap_msg); } +static void wait_cc_tx_msg_list_enqueue(struct hnbgw_context_map *map, struct msgb *ranap_msg) +{ + talloc_steal(map, ranap_msg); + msgb_enqueue(&map->sccp_fi_ctx.wait_cc_tx_msg_list, ranap_msg); +} +static struct msgb *wait_cc_tx_msg_list_dequeue(struct hnbgw_context_map *map) +{ + struct msgb *ranap_msg = msgb_dequeue(&map->sccp_fi_ctx.wait_cc_tx_msg_list); + if (ranap_msg) + talloc_steal(OTC_SELECT, ranap_msg); + return ranap_msg; +} + static void map_sccp_init_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct msgb *ranap_msg = NULL; @@ -245,8 +258,9 @@ return; case MAP_SCCP_EV_TX_DATA_REQUEST: - /* ranap_msg = data; */ - LOGPFSML(fi, LOGL_ERROR, "Connection not yet confirmed, cannot forward RANAP to CN\n"); + ranap_msg = data; + LOGPFSML(fi, LOGL_INFO, "Caching RANAP msg from RUA while waiting for SCCP CC\n"); + wait_cc_tx_msg_list_enqueue(map, ranap_msg); return; case MAP_SCCP_EV_RAN_LINK_LOST: @@ -277,9 +291,15 @@ static void map_sccp_connected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct hnbgw_context_map *map = fi->priv; + struct msgb *ranap_msg; + + /* Now that SCCP conn is confirmed, forward pending msgs received from RUA side: */ + while ((ranap_msg = wait_cc_tx_msg_list_dequeue(map))) + tx_sccp_df1(fi, ranap_msg); + if (map->please_disconnect) { - /* SCCP has already been asked to disconnect, so disconnect now that the CC has been received. Send RLSD - * to SCCP (without RANAP data) */ + /* SCCP has already been asked to disconnect, so disconnect now that the + * CC has been received. Send RLSD to SCCP (without RANAP data) */ tx_sccp_rlsd(fi); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); } @@ -465,6 +485,7 @@ { struct hnbgw_context_map *map = fi->priv; map->sccp_fi = NULL; + msgb_queue_free(&map->sccp_fi_ctx.wait_cc_tx_msg_list); } #define S(x) (1 << (x)) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40176?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I307ded905901421f8228fab720b3989a2f94412b Gerrit-Change-Number: 40176 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: context_map_sccp: Drop unused MAP_SCCP_EV_CN_LINK_LOST

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40175?usp=email ) Change subject: context_map_sccp: Drop unused MAP_SCCP_EV_CN_LINK_LOST ...................................................................... context_map_sccp: Drop unused MAP_SCCP_EV_CN_LINK_LOST This event is never called. Furthermore, this kind of "SCCP link went down" should already be handled by libosmo-sigtran's sccp SAP internally, and we should simply recieve an N-DISCONNECT.ind when that happens which dispatches event MAP_SCCP_EV_RX_RELEASED. When doing so, it becomes easier to find out that some code paths in the map_sccp_fsm handle events which don't expect any kind of ranap_msg as parameter, so simplify those. Related: OS#6085 Change-Id: I3a37522da16d9a06764f58c2da9579b397d8a7f2 --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map_sccp.c 2 files changed, 0 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/75/40175/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 9791954..469323a 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -86,10 +86,6 @@ * config changes. * Parameter: no parameter, NULL. */ MAP_SCCP_EV_USER_ABORT, - /* The CN link can no longer work, for example a RANAP RESET was received from the cnlink that hosts this - * context map. - * Parameter: no parameter, NULL. */ - MAP_SCCP_EV_CN_LINK_LOST, }; /* For context_map_get_state(), to combine the RUA and SCCP states, for VTY reporting only. */ diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 42a0e49..cf57c82 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -48,7 +48,6 @@ OSMO_VALUE_STRING(MAP_SCCP_EV_RAN_LINK_LOST), OSMO_VALUE_STRING(MAP_SCCP_EV_RX_RELEASED), OSMO_VALUE_STRING(MAP_SCCP_EV_USER_ABORT), - OSMO_VALUE_STRING(MAP_SCCP_EV_CN_LINK_LOST), {} }; @@ -196,7 +195,6 @@ static void map_sccp_init_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct hnbgw_context_map *map = fi->priv; struct msgb *ranap_msg = NULL; switch (event) { @@ -211,11 +209,6 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_USER_ABORT: - case MAP_SCCP_EV_CN_LINK_LOST: - ranap_msg = data; - /* No CR has been sent yet, just go to disconnected state. */ - if (msg_has_l2_data(ranap_msg)) - LOG_MAP(map, DLSCCP, LOGL_ERROR, "SCCP not connected, cannot dispatch RANAP message\n"); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); return; @@ -258,11 +251,6 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_USER_ABORT: - case MAP_SCCP_EV_CN_LINK_LOST: - ranap_msg = data; - /* RUA connection was terminated. First wait for the CC before releasing the SCCP conn. */ - if (msg_has_l2_data(ranap_msg)) - LOGPFSML(fi, LOGL_ERROR, "Connection not yet confirmed, cannot forward RANAP to CN\n"); map->please_disconnect = true; return; @@ -340,13 +328,7 @@ * Disconnect on the SCCP layer, ungracefully. */ case MAP_SCCP_EV_USER_ABORT: /* The user is asking for disconnection, so there is no Iu Release in progress. Disconnect now. */ - case MAP_SCCP_EV_CN_LINK_LOST: - ranap_msg = data; /* The CN peer has sent a RANAP RESET, so the old link that this map ran on is lost */ - - /* There won't be any ranap_msg, but if a caller wants to dispatch a msg, forward it before - * disconnecting. */ - tx_sccp_df1(fi, ranap_msg); tx_sccp_rlsd(fi); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); return; @@ -418,7 +400,6 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_USER_ABORT: - case MAP_SCCP_EV_CN_LINK_LOST: case MAP_SCCP_EV_RAN_DISC: /* Stop waiting for RLSD, send RLSD now. */ tx_sccp_rlsd(fi); @@ -497,7 +478,6 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_USER_ABORT) - | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_INIT) @@ -515,7 +495,6 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_USER_ABORT) - | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_CONNECTED) @@ -533,7 +512,6 @@ | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_RX_CONNECTION_CONFIRM) | S(MAP_SCCP_EV_USER_ABORT) - | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_WAIT_RLSD) @@ -552,7 +530,6 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_CONNECTION_CONFIRM) | S(MAP_SCCP_EV_USER_ABORT) - | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_DISCONNECTED) @@ -567,7 +544,6 @@ | S(MAP_SCCP_EV_RAN_DISC) | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_USER_ABORT) - | S(MAP_SCCP_EV_CN_LINK_LOST) , .onenter = map_sccp_disconnected_onenter, .action = map_sccp_disconnected_action, -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40175?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3a37522da16d9a06764f58c2da9579b397d8a7f2 Gerrit-Change-Number: 40175 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in osmo-gsm-manuals[master]: bibliography: Add ETS TS 102 671 (MFF2)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/40173?usp=email ) Change subject: bibliography: Add ETS TS 102 671 (MFF2) ...................................................................... bibliography: Add ETS TS 102 671 (MFF2) This adds a reference to the SIM/UICC form-factor MFF2 Change-Id: I500276c01d79a549601773b6baed39e4cdf76252 --- M common/chapters/bibliography.adoc 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/40173/1 diff --git a/common/chapters/bibliography.adoc b/common/chapters/bibliography.adoc index bebad30..385c094 100644 --- a/common/chapters/bibliography.adoc +++ b/common/chapters/bibliography.adoc @@ -169,6 +169,9 @@ - [[[etsi-ts101220]]] ETSI TS 101 220: Smart Cards; ETSI numbering system for telecommunication application providers https://www.etsi.org/deliver/etsi_ts/101200_101299/101220/12.00.00_60/ts_10… +- [[[etsi-ts102671]]] ETSI TS 102 671: Smart Cards; Machine to Machine UICC; + Physical and logical characteristics + https://www.etsi.org/deliver/etsi_ts/102600_102699/102671/18.01.00_60/ts_10… - [[[ieee-802.1q]]] IEEE 802.1Q: Bridges and Bridged Networks https://ieeexplore.ieee.org/document/6991462 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/40173?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I500276c01d79a549601773b6baed39e4cdf76252 Gerrit-Change-Number: 40173 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

2 months, 1 week

1
0
0 0

[S] Change in pysim[master]: Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/40120?usp=email ) Change subject: Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support ...................................................................... Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support The upstream construct.{Bytes,GreedyBytes} only support bytes/bytearray input data for the encoder, while the [newly-created] osmocom.construct.{Bytes,GreedyBytes} support alternatively hex-string input. This is important in the context of encoding construct-based types from JSON, where our osmocom.utils.JsonEncoder will automatically convert any bytes to hex-string, while re-encoding those hex-strings will fail prior to this patch. Change-Id: I1c8df6350c68aa408ec96ff6cd1e405ceb1a4fbb Closes: OS#6774 --- M pySim/apdu/__init__.py M pySim/apdu/ts_31_102.py M pySim/ara_m.py M pySim/cat.py M pySim/global_platform/http.py M pySim/global_platform/scp.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/ota.py M pySim/sms.py M pySim/sysmocom_sja2.py M pySim/ts_31_103.py M pySim/ts_31_103_shared.py M requirements.txt M setup.py 15 files changed, 22 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/pySim/apdu/__init__.py b/pySim/apdu/__init__.py index 4f08113..84ac83a 100644 --- a/pySim/apdu/__init__.py +++ b/pySim/apdu/__init__.py @@ -29,7 +29,7 @@ import typing from typing import List, Dict, Optional from termcolor import colored -from construct import Byte, GreedyBytes +from construct import Byte from construct import Optional as COptional from osmocom.construct import * from osmocom.utils import * diff --git a/pySim/apdu/ts_31_102.py b/pySim/apdu/ts_31_102.py index fea5038..692cdfd 100644 --- a/pySim/apdu/ts_31_102.py +++ b/pySim/apdu/ts_31_102.py @@ -9,7 +9,7 @@ """ from typing import Dict -from construct import BitStruct, Enum, BitsInteger, Int8ub, Bytes, this, Struct, If, Switch, Const +from construct import BitStruct, Enum, BitsInteger, Int8ub, this, Struct, If, Switch, Const from construct import Optional as COptional from osmocom.construct import * diff --git a/pySim/ara_m.py b/pySim/ara_m.py index e10ae10..9079a97 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -26,7 +26,7 @@ # -from construct import GreedyBytes, GreedyString, Struct, Enum, Int8ub, Int16ub +from construct import GreedyString, Struct, Enum, Int8ub, Int16ub from construct import Optional as COptional from osmocom.construct import * from osmocom.tlv import * diff --git a/pySim/cat.py b/pySim/cat.py index 448d874..ae4e06e 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -20,11 +20,11 @@ from typing import List from bidict import bidict -from construct import Int8ub, Int16ub, Byte, Bytes, BitsInteger +from construct import Int8ub, Int16ub, Byte, BitsInteger from construct import Struct, Enum, BitStruct, this -from construct import GreedyBytes, Switch, GreedyRange, FlagsEnum +from construct import Switch, GreedyRange, FlagsEnum from osmocom.tlv import TLV_IE, COMPR_TLV_IE, BER_TLV_IE, TLV_IE_Collection -from osmocom.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi, GsmString +from osmocom.construct import PlmnAdapter, BcdAdapter, HexAdapter, GsmStringAdapter, TonNpi, GsmString, Bytes, GreedyBytes from osmocom.utils import b2h from pySim.utils import dec_xplmn_w_act diff --git a/pySim/global_platform/http.py b/pySim/global_platform/http.py index dee196d..dbad9ac 100644 --- a/pySim/global_platform/http.py +++ b/pySim/global_platform/http.py @@ -17,9 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from construct import Struct, Int8ub, Int16ub, Bytes, GreedyBytes, GreedyString, BytesInteger +from construct import Struct, Int8ub, Int16ub, GreedyString, BytesInteger from construct import this, len_, Rebuild, Const from construct import Optional as COptional +from osmocom.construct import Bytes, GreedyBytes from osmocom.tlv import BER_TLV_IE from pySim import cat diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 72aed24..e674766 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -20,8 +20,9 @@ from typing import Optional from Cryptodome.Cipher import DES3, DES from Cryptodome.Util.strxor import strxor -from construct import Struct, Bytes, Int8ub, Int16ub, Const +from construct import Struct, Int8ub, Int16ub, Const from construct import Optional as COptional +from osmocom.construct import Bytes from osmocom.utils import b2h from osmocom.tlv import bertlv_parse_len, bertlv_encode_len from pySim.utils import parse_command_apdu diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index bc54c72..5798df7 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -26,7 +26,7 @@ from pySim.utils import * from struct import pack, unpack -from construct import Struct, Bytes, Int8ub, Int16ub, Int24ub, Int32ub, FlagsEnum +from construct import Struct, Int8ub, Int16ub, Int24ub, Int32ub, FlagsEnum from construct import Optional as COptional from osmocom.construct import * diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py index ae0c2c8..e9501aa 100644 --- a/pySim/iso7816_4.py +++ b/pySim/iso7816_4.py @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from construct import GreedyBytes, GreedyString +from construct import GreedyString from osmocom.tlv import * from osmocom.construct import * diff --git a/pySim/ota.py b/pySim/ota.py index 2d1c8d1..a6b563d 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -19,7 +19,7 @@ import abc import struct from typing import Optional, Tuple -from construct import Enum, Int8ub, Int16ub, Struct, Bytes, GreedyBytes, BitsInteger, BitStruct +from construct import Enum, Int8ub, Int16ub, Struct, BitsInteger, BitStruct from construct import Flag, Padding, Switch, this, PrefixedArray, GreedyRange from osmocom.construct import * from osmocom.utils import b2h diff --git a/pySim/sms.py b/pySim/sms.py index 7e5acf1..7c22c75 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -20,10 +20,10 @@ import typing import abc from bidict import bidict -from construct import Int8ub, Byte, Bytes, Bit, Flag, BitsInteger +from construct import Int8ub, Byte, Bit, Flag, BitsInteger from construct import Struct, Enum, Tell, BitStruct, this, Padding -from construct import Prefixed, GreedyRange, GreedyBytes -from osmocom.construct import HexAdapter, BcdAdapter, TonNpi +from construct import Prefixed, GreedyRange +from osmocom.construct import HexAdapter, BcdAdapter, TonNpi, Bytes, GreedyBytes from osmocom.utils import Hexstr, h2b, b2h from smpp.pdu import pdu_types, operations diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index c145f0f..438df23 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -18,7 +18,7 @@ """ from struct import unpack -from construct import FlagsEnum, Byte, Struct, Int8ub, Bytes, Mapping, Enum, Padding, BitsInteger +from construct import FlagsEnum, Byte, Struct, Int8ub, Mapping, Enum, Padding, BitsInteger from construct import Bit, this, Int32ub, Int16ub, Nibble, BytesInteger, GreedyRange, Const from construct import Optional as COptional from osmocom.utils import * diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index c0142bc..b281659 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -22,7 +22,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from construct import Struct, Switch, this, Bytes, GreedyString +from construct import Struct, Switch, this, GreedyString from osmocom.utils import * from osmocom.tlv import * from osmocom.construct import * diff --git a/pySim/ts_31_103_shared.py b/pySim/ts_31_103_shared.py index 25f3e97..8c56923 100644 --- a/pySim/ts_31_103_shared.py +++ b/pySim/ts_31_103_shared.py @@ -19,9 +19,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from construct import Struct, Switch, Bytes, GreedyString, GreedyBytes, Int8ub, Prefixed, Enum, Byte +from construct import Struct, Switch, GreedyString, Int8ub, Prefixed, Enum, Byte from osmocom.tlv import BER_TLV_IE, TLV_IE_Collection -from osmocom.construct import HexAdapter, Utf8Adapter +from osmocom.construct import Bytes, HexAdapter, Utf8Adapter, GreedyBytes from pySim.filesystem import * # TS 31.103 Section 4.2.16 diff --git a/requirements.txt b/requirements.txt index 11170da..9749d7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ jsonpath-ng construct>=2.10.70 bidict -pyosmocom>=0.0.8 +pyosmocom>=0.0.9 pyyaml>=5.1 termcolor colorlog diff --git a/setup.py b/setup.py index bf9299c..b33fb67 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ "jsonpath-ng", "construct >= 2.10.70", "bidict", - "pyosmocom >= 0.0.8", + "pyosmocom >= 0.0.9", "pyyaml >= 5.1", "termcolor", "colorlog", -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40120?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1c8df6350c68aa408ec96ff6cd1e405ceb1a4fbb Gerrit-Change-Number: 40120 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

2 months, 1 week

1
0
0 0

[S] Change in pysim[master]: Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/40120?usp=email ) Change subject: Use osmocom.construct.{Bytes,GreedyBytes} for hexstring input support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40120?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1c8df6350c68aa408ec96ff6cd1e405ceb1a4fbb Gerrit-Change-Number: 40120 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Apr 2025 15:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites: display load at start/end

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40167?usp=email ) Change subject: jobs/ttcn3-testsuites: display load at start/end ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40167?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f891ae5d9b501e2e111e61d3aaa55ae24cb663b Gerrit-Change-Number: 40167 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Apr 2025 15:08:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[rel-2.0.1]: Bump version: 2.0.0.1-20a9 → 2.0.1

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40172?usp=email ) Change subject: Bump version: 2.0.0.1-20a9 → 2.0.1 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Reminder: push tag after merged. https://gerrit.osmocom.org/plugins/gitiles/libosmo-abis/+/refs/tags/2.0.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40172?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: rel-2.0.1 Gerrit-Change-Id: Ib9f300745c86bd6421aa0cc7905bf5f545f9212b Gerrit-Change-Number: 40172 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Apr 2025 15:04:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[rel-2.0.1]: ipaccess: Reset pointer before calling stream_cli func triggering cal...

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40171?usp=email ) Change subject: ipaccess: Reset pointer before calling stream_cli func triggering callback ...................................................................... ipaccess: Reset pointer before calling stream_cli func triggering callback The osmo_stream_cli_destroy() may trigger the disconnect_cb, which we forward to the user through sign_link_down() callback. Hence, the user may call e1inp_ipa_bts_rsl_close_n() again (re-entrant, recursively) before we had time to nullify the pointer, calling osmo_stream_cli_destroy() again. Instead, make sure the pointer is reset bfore potentially calling the osmo_stream_cli_destroy() to make sure to catch this scenario. This issue was being triggered by BTS_Tests.TC_chopped_ipa_payload, which was hitting an assert due to incorrectly calling osmo_stream_cli_destroy() twice on a given stream_cli. Related: OS#6729 Change-Id: I2f1da24580effab5e3dfeacb6514c3b1e3a650c9 (cherry picked from commit 8076b58f5d7d22cb5dcc82843d1793adbc9ba4e4) --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 6a7d753..44ec719 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -1168,8 +1168,8 @@ cli = il->ipa_cli[1 + trx_nr]; if (cli != NULL) { - osmo_stream_cli_destroy(cli); il->ipa_cli[1 + trx_nr] = NULL; + osmo_stream_cli_destroy(cli); } return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40171?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: rel-2.0.1 Gerrit-Change-Id: I2f1da24580effab5e3dfeacb6514c3b1e3a650c9 Gerrit-Change-Number: 40171 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[rel-2.0.1]: Bump version: 2.0.0.1-20a9 → 2.0.1

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/40172?usp=email ) Change subject: Bump version: 2.0.0.1-20a9 → 2.0.1 ...................................................................... Bump version: 2.0.0.1-20a9 → 2.0.1 Change-Id: Ib9f300745c86bd6421aa0cc7905bf5f545f9212b --- M debian/changelog M src/Makefile.am 2 files changed, 8 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index d93e8b9..b0d1b66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmo-abis (2.0.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * ipaccess: Reset pointer before calling stream_cli func triggering callback + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Tue, 29 Apr 2025 21:39:20 +0700 + libosmo-abis (2.0.0) unstable; urgency=medium [ Mychaela N. Falconia ] diff --git a/src/Makefile.am b/src/Makefile.am index f25fb8b..195129b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=15:0:0 +ABIS_LIBVERSION=15:1:0 TRAU_LIBVERSION=11:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/40172?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: rel-2.0.1 Gerrit-Change-Id: Ib9f300745c86bd6421aa0cc7905bf5f545f9212b Gerrit-Change-Number: 40172 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log