July 2022 - gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: Refactor {cbsp,sbcap}_cbc_accept_cb

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28712 ) Change subject: Refactor {cbsp,sbcap}_cbc_accept_cb ...................................................................... Refactor {cbsp,sbcap}_cbc_accept_cb Delay allocating the structures until really needed. First do checks agains the opened connection, and if an issue is detected simply close the fd. Next, fetch or allocate the related peer. Finally, create the link from the fd. This makes it easier to add early extra checks later when peers will contain info on link_mode (client|server|disabled) later on. Change-Id: Id4f83ec6b0b14e556b1caa9c80e7f68d062fec57 --- M src/cbsp_link.c M src/sbcap_link.c 2 files changed, 110 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/12/28712/1 diff --git a/src/cbsp_link.c b/src/cbsp_link.c index bc421f2..cc7f703 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -19,6 +19,7 @@ */ #include <errno.h> +#include <unistd.h> #include <sys/types.h> #include <sys/socket.h> @@ -37,6 +38,26 @@ #include <osmocom/cbc/cbsp_link_fsm.h> #include <osmocom/cbc/cbc_peer.h> +static struct cbc_cbsp_link *cbc_cbsp_link_alloc(struct cbc_cbsp_mgr *cbc, struct cbc_peer *peer) +{ + struct cbc_cbsp_link *link; + + link = talloc_zero(cbc, struct cbc_cbsp_link); + OSMO_ASSERT(link); + + link->peer = peer; + + link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); + if (!link->fi) { + LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); + talloc_free(link); + return NULL; + } + + llist_add_tail(&link->list, &cbc->links); + return link; +} + const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link) { OSMO_ASSERT(link); @@ -112,10 +133,10 @@ static int cbsp_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd) { struct cbc_cbsp_mgr *cbc = osmo_stream_srv_link_get_data(srv_link); - struct cbc_cbsp_link *link = talloc_zero(cbc, struct cbc_cbsp_link); + struct cbc_peer *peer; + struct cbc_cbsp_link *link; char remote_ip[INET6_ADDRSTRLEN], portbuf[6]; int remote_port; - OSMO_ASSERT(link); remote_ip[0] = '\0'; portbuf[0] = '\0'; @@ -124,44 +145,41 @@ LOGP(DCBSP, LOGL_NOTICE, "New CBSP link connection from %s:%u\n", remote_ip, remote_port); - link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, cbsp_cbc_read_cb, cbsp_cbc_closed_cb, link); - if (!link->conn) { - LOGP(DCBSP, LOGL_ERROR, "Unable to create stream server for %s:%d\n", - remote_ip, remote_port); - talloc_free(link); - return -1; - } - link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); - if (!link->fi) { - LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); - cbc_cbsp_link_close(link); - talloc_free(link); - return -1; - } - llist_add_tail(&link->list, &cbc->links); - /* Match link to peer */ - link->peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_CBSP); - if (!link->peer) { - if (g_cbc->config.permit_unknown_peers) { - LOGPCC(link, LOGL_NOTICE, "Accepting unknown CBSP peer %s:%d\n", - remote_ip, remote_port); - link->peer = cbc_peer_create(NULL, CBC_PEER_PROTO_CBSP); - OSMO_ASSERT(link->peer); - link->peer->unknown_dynamic_peer = true; - } else { - LOGPCC(link, LOGL_NOTICE, "Rejecting unknown CBSP peer %s:%d (not permitted)\n", - remote_ip, remote_port); - cbc_cbsp_link_close(link); + peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_CBSP); + if (!peer) { + if (!g_cbc->config.permit_unknown_peers) { + LOGP(DCBSP, LOGL_NOTICE, + "Rejecting unknown CBSP peer %s:%d (not permitted)\n", + remote_ip, remote_port); + close(fd); return -1; } - } else { - if (link->peer->link.cbsp) { - LOGPCC(link, LOGL_ERROR, "We already have a connection for peer %s\n", - link->peer->name); - /* FIXME */ - } - link->peer->link.cbsp = link; + LOGP(DCBSP, LOGL_NOTICE, "Accepting unknown CBSP peer %s:%d\n", + remote_ip, remote_port); + peer = cbc_peer_create(NULL, CBC_PEER_PROTO_CBSP); + OSMO_ASSERT(peer); + peer->unknown_dynamic_peer = true; + } + if (peer->link.cbsp) { + LOGPCC(peer->link.cbsp, LOGL_ERROR, + "We already have a connection for peer %s, closing it\n", + peer->name); + cbc_cbsp_link_close(peer->link.cbsp); + } + link = cbc_cbsp_link_alloc(cbc, peer); + OSMO_ASSERT(link); + peer->link.cbsp = link; + + link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, + cbsp_cbc_read_cb, cbsp_cbc_closed_cb, + link); + if (!link->conn) { + LOGPCC(link, LOGL_ERROR, + "Unable to create stream server for %s:%u\n", + remote_ip, remote_port); + talloc_free(link); + return -1; } osmo_fsm_inst_dispatch(link->fi, CBSP_LINK_E_CMD_RESET, NULL); diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 4656f6d..208b806 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -19,6 +19,7 @@ */ #include <errno.h> +#include <unistd.h> #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> @@ -41,6 +42,26 @@ #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/debug.h> +static struct cbc_sbcap_link *cbc_sbcap_link_alloc(struct cbc_sbcap_mgr *cbc, struct cbc_peer *peer) +{ + struct cbc_sbcap_link *link; + + link = talloc_zero(cbc, struct cbc_sbcap_link); + OSMO_ASSERT(link); + + link->peer = peer; + + link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); + if (!link->fi) { + LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); + talloc_free(link); + return NULL; + } + + llist_add_tail(&link->list, &cbc->links); + return link; +} + const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link) { struct osmo_fd *ofd; @@ -140,10 +161,10 @@ static int sbcap_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd) { struct cbc_sbcap_mgr *cbc = osmo_stream_srv_link_get_data(srv_link); - struct cbc_sbcap_link *link = talloc_zero(cbc, struct cbc_sbcap_link); + struct cbc_peer *peer; + struct cbc_sbcap_link *link; char remote_ip[INET6_ADDRSTRLEN], portbuf[6]; int remote_port; - OSMO_ASSERT(link); remote_ip[0] = '\0'; portbuf[0] = '\0'; @@ -152,44 +173,41 @@ LOGP(DSBcAP, LOGL_NOTICE, "New SBc-AP link connection from %s:%u\n", remote_ip, remote_port); - link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, sbcap_cbc_read_cb, sbcap_cbc_closed_cb, link); - if (!link->conn) { - LOGP(DSBcAP, LOGL_ERROR, "Unable to create stream server for %s:%d\n", - remote_ip, remote_port); - talloc_free(link); - return -1; - } - link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); - if (!link->fi) { - LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); - cbc_sbcap_link_close(link); - talloc_free(link); - return -1; - } - llist_add_tail(&link->list, &cbc->links); - /* Match link to peer */ - link->peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_SBcAP); - if (!link->peer) { - if (g_cbc->config.permit_unknown_peers) { - LOGPSBCAPC(link, LOGL_NOTICE, "Accepting unknown SBc-AP peer %s:%d\n", - remote_ip, remote_port); - link->peer = cbc_peer_create(NULL, CBC_PEER_PROTO_SBcAP); - OSMO_ASSERT(link->peer); - link->peer->unknown_dynamic_peer = true; - } else { - LOGPSBCAPC(link, LOGL_NOTICE, "Rejecting unknown SBc-AP peer %s:%d (not permitted)\n", - remote_ip, remote_port); - cbc_sbcap_link_close(link); + peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_SBcAP); + if (!peer) { + if (!g_cbc->config.permit_unknown_peers) { + LOGP(DSBcAP, LOGL_NOTICE, + "Rejecting unknown SBc-AP peer %s:%d (not permitted)\n", + remote_ip, remote_port); + close(fd); return -1; } - } else { - if (link->peer->link.sbcap) { - LOGPSBCAPC(link, LOGL_ERROR, "We already have a connection for peer %s\n", - link->peer->name); - /* FIXME */ - } - link->peer->link.sbcap = link; + LOGP(DSBcAP, LOGL_NOTICE, "Accepting unknown SBc-AP peer %s:%d\n", + remote_ip, remote_port); + peer = cbc_peer_create(NULL, CBC_PEER_PROTO_SBcAP); + OSMO_ASSERT(peer); + peer->unknown_dynamic_peer = true; + } + if (peer->link.sbcap) { + LOGPSBCAPC(peer->link.sbcap, LOGL_ERROR, + "We already have a connection for peer %s, closing it\n", + peer->name); + cbc_sbcap_link_close(peer->link.sbcap); + } + link = cbc_sbcap_link_alloc(cbc, peer); + OSMO_ASSERT(link); + peer->link.sbcap = link; + + link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, + sbcap_cbc_read_cb, sbcap_cbc_closed_cb, + link); + if (!link->conn) { + LOGPSBCAPC(link, LOGL_ERROR, + "Unable to create stream server for %s:%u\n", + remote_ip, remote_port); + talloc_free(link); + return -1; } osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_CMD_RESET, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id4f83ec6b0b14e556b1caa9c80e7f68d062fec57 Gerrit-Change-Number: 28712 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix trx_if_close(): delete TRXC timer if it's pending

by dexter

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28677 ) Change subject: trxcon: fix trx_if_close(): delete TRXC timer if it's pending ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I669355ec03f67de437df2d3b822ed0a728b405d5 Gerrit-Change-Number: 28677 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Jul 2022 14:23:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: Use Tuple for transparent file size

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28709 to look at the new patch set (#2). Change subject: filesystem: Use Tuple for transparent file size ...................................................................... filesystem: Use Tuple for transparent file size As the documentation strings say: The size should be a *tuple*. In reality we so far passed a set. The problem with the set is that ordering is not guaranteed, and hence we cannot assume the first and second item have meaning (minimum vs. default size). While at it, use a type annotation to catch such bugs easily. Change-Id: I553616f8c6c4aaa8f635b3d7d94e8e8f49ed5a56 --- M pySim/filesystem.py M pySim/gsm_r.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_102_telecom.py M pySim/ts_51_011.py 6 files changed, 71 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/28709/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I553616f8c6c4aaa8f635b3d7d94e8e8f49ed5a56 Gerrit-Change-Number: 28709 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: tlv: Make NotImplementedError more verbose

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28681 ) Change subject: tlv: Make NotImplementedError more verbose ...................................................................... tlv: Make NotImplementedError more verbose This helps to understand immediately _what_ is not implemented for which type. Change-Id: I017eb4828e9deee80338024c41c93c0f78db3f3b --- M pySim/tlv.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/tlv.py b/pySim/tlv.py index 4de5046..5acc781 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -100,7 +100,7 @@ # not an abstractmethod, as it is only required if no _construct exists def _to_bytes(self): - raise NotImplementedError + raise NotImplementedError('%s._to_bytes' % type(self).__name__) def from_bytes(self, do: bytes): """Convert from binary bytes to internal representation. Store the decoded result @@ -118,7 +118,7 @@ # not an abstractmethod, as it is only required if no _construct exists def _from_bytes(self, do: bytes): - raise NotImplementedError + raise NotImplementedError('%s._from_bytes' % type(self).__name__) class IE(Transcodable, metaclass=TlvMeta): 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I017eb4828e9deee80338024c41c93c0f78db3f3b Gerrit-Change-Number: 28681 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: EF.AD: Avoid NotImplementedErrror regarding network names

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28682 ) Change subject: EF.AD: Avoid NotImplementedErrror regarding network names ...................................................................... EF.AD: Avoid NotImplementedErrror regarding network names Even while we don't yet have a proper decoder, let's at least represent the network name as hex-string Change-Id: I4ed626699d1e4e484d4ffd04349676dadff626a0 --- M pySim/ts_51_011.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 0927c9f..7e7020b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -878,11 +878,13 @@ class EF_PNN(LinFixedEF): class FullNameForNetwork(BER_TLV_IE, tag=0x43): # TS 24.008 10.5.3.5a - pass + # TODO: proper decode + _construct = HexAdapter(GreedyBytes) class ShortNameForNetwork(BER_TLV_IE, tag=0x45): # TS 24.008 10.5.3.5a - pass + # TODO: proper decode + _construct = HexAdapter(GreedyBytes) class NetworkNameCollection(TLV_IE_Collection, nested=[FullNameForNetwork, ShortNameForNetwork]): pass 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4ed626699d1e4e484d4ffd04349676dadff626a0 Gerrit-Change-Number: 28682 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: Never use Bytes without any 'Adapter'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28683 ) Change subject: Never use Bytes without any 'Adapter' ...................................................................... Never use Bytes without any 'Adapter' Otherwise we have binary/bytes as values inside the dict, rather than a hexadecimal string. That's ugly when printing without json formatting. Change-Id: Ia3e7c4791d11bd4e3719a43d58e11e05ec986d1f --- M pySim/gsm_r.py M pySim/sysmocom_sja2.py M pySim/ts_31_102.py M pySim/ts_51_011.py 4 files changed, 34 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py index 3364b3d..b48469e 100644 --- a/pySim/gsm_r.py +++ b/pySim/gsm_r.py @@ -185,7 +185,7 @@ super().__init__(fid='6ff4', sfid=None, name='EF.Shunting', desc='Shunting', size={8, 8}) self._construct = Struct('common_gid'/Int8ub, - 'shunting_gid'/Bytes(7)) + 'shunting_gid'/HexAdapter(Bytes(7))) class EF_GsmrPLMN(LinFixedEF): diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index f87e45a..2edc916 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -142,13 +142,12 @@ 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) self._construct = Struct('cfg'/CfgByte, - 'key'/Bytes(16), - 'op' / - If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, Bytes( - 16)), + 'key'/HexAdapter(Bytes(16)), + 'op'/ If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))), 'opc' / - If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, Bytes( - 16)) + If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))) ) @@ -198,13 +197,13 @@ 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15)) self._construct = Struct('cfg'/CfgByte, - 'key'/Bytes(16), + 'key'/HexAdapter(Bytes(16)), 'op' / - If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, Bytes( - 16)), + If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))), 'opc' / - If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, Bytes( - 16)) + If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))) ) @@ -216,13 +215,13 @@ 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) self._construct = Struct('cfg'/CfgByte, - 'key'/Bytes(16), + 'key'/HexAdapter(Bytes(16)), 'op' / - If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, Bytes( - 16)), + If(this.cfg.algorithm == 'milenage' and not this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))), 'opc' / - If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, Bytes( - 16)) + If(this.cfg.algorithm == 'milenage' and this.cfg.use_opc_instead_of_op, + HexAdapter(Bytes(16))) ) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 314f3c2..066ee88 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -664,7 +664,7 @@ def __init__(self, fid='6f80', sfid=0x14, name='EF.ICI', rec_len={28, 48}, desc='Incoming Call Information', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('alpha_id'/Bytes(this._.total_len-28), + self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-28)), 'len_of_bcd_contents'/Int8ub, 'ton_npi'/Int8ub, 'call_number'/BcdAdapter(Bytes(10)), @@ -673,14 +673,14 @@ 'date_and_time'/BcdAdapter(Bytes(7)), 'duration'/Int24ub, 'status'/Byte, - 'link_to_phonebook'/Bytes(3)) + 'link_to_phonebook'/HexAdapter(Bytes(3))) # TS 31.102 Section 4.2.34 class EF_OCI(CyclicEF): def __init__(self, fid='6f81', sfid=0x15, name='EF.OCI', rec_len={27, 47}, desc='Outgoing Call Information', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('alpha_id'/Bytes(this._.total_len-27), + self._construct = Struct('alpha_id'/HexAdapter(Bytes(this._.total_len-27)), 'len_of_bcd_contents'/Int8ub, 'ton_npi'/Int8ub, 'call_number'/BcdAdapter(Bytes(10)), @@ -688,7 +688,7 @@ 'ext5_record_id'/Int8ub, 'date_and_time'/BcdAdapter(Bytes(7)), 'duration'/Int24ub, - 'link_to_phonebook'/Bytes(3)) + 'link_to_phonebook'/HexAdapter(Bytes(3))) # TS 31.102 Section 4.2.35 class EF_ICT(CyclicEF): @@ -727,7 +727,7 @@ def __init__(self, fid='6f57', sfid=None, name='EF.ACL', size={32, None}, desc='Access Point Name Control List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) - self._construct = Struct('num_of_apns'/Int8ub, 'tlvs'/GreedyBytes) + self._construct = Struct('num_of_apns'/Int8ub, 'tlvs'/HexAdapter(GreedyBytes)) # TS 31.102 Section 4.2.51 class EF_START_HFN(TransparentEF): @@ -771,7 +771,7 @@ def __init__(self, fid='6fd7', sfid=None, name='EF.MSK', desc='MBMS Service Key List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={20, None}, **kwargs) msk_ts_constr = Struct('msk_id'/Int32ub, 'timestamp_counter'/Int32ub) - self._construct = Struct('key_domain_id'/Bytes(3), + self._construct = Struct('key_domain_id'/HexAdapter(Bytes(3)), 'num_msk_id'/Int8ub, 'msk_ids'/msk_ts_constr[this.num_msk_id]) # TS 31.102 Section 4.2.81 @@ -865,7 +865,8 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) - self._construct = Struct('guti'/Bytes(12), 'last_visited_registered_tai'/Bytes(5), + self._construct = Struct('guti'/HexAdapter(Bytes(12)), + 'last_visited_registered_tai'/HexAdapter(Bytes(5)), 'eps_update_status'/upd_status_constr) # TS 31.102 Section 4.2.92 @@ -958,7 +959,8 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) upd_status_constr = Enum( Byte, updated=0, not_updated=1, roaming_not_allowed=2) - self._construct = Struct('5g_guti'/Bytes(13), 'last_visited_registered_tai_in_5gs'/Bytes(6), + self._construct = Struct('5g_guti'/HexAdapter(Bytes(13)), + 'last_visited_registered_tai_in_5gs'/HexAdapter(Bytes(6)), '5gs_update_status'/upd_status_constr) # TS 31.102 Section 4.4.11.7 @@ -974,7 +976,8 @@ class EF_OPL5G(LinFixedEF): def __init__(self, fid='6f08', sfid=0x08, name='EF.OPL5G', desc='5GS Operator PLMN List', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, rec_len={10, None}, **kwargs) - Tai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'tac_min'/Bytes(3), 'tac_max'/Bytes(3)) + Tai = Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'tac_min'/HexAdapter(Bytes(3)), + 'tac_max'/HexAdapter(Bytes(3))) self._construct = Struct('tai'/Tai, 'pnn_record_id'/Int8ub) # TS 31.102 Section 4.4.11.10 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 7e7020b..c6bb194 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -667,7 +667,7 @@ class EF_LOCI(TransparentEF): def __init__(self, fid='6f7e', sfid=None, name='EF.LOCI', desc='Location Information', size={11, 11}): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('tmsi'/Bytes(4), 'lai'/Bytes(5), 'tmsi_time'/Int8ub, + self._construct = Struct('tmsi'/HexAdapter(Bytes(4)), 'lai'/HexAdapter(Bytes(5)), 'tmsi_time'/Int8ub, 'lu_status'/Enum(Byte, updated=0, not_updated=1, plmn_not_allowed=2, location_area_not_allowed=3)) @@ -806,7 +806,7 @@ class EF_LOCIGPRS(TransparentEF): def __init__(self, fid='6f53', sfid=None, name='EF.LOCIGPRS', desc='GPRS Location Information', size={14, 14}): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) - self._construct = Struct('ptmsi'/Bytes(4), 'ptmsi_sig'/Int8ub, 'rai'/Bytes(6), + self._construct = Struct('ptmsi'/HexAdapter(Bytes(4)), 'ptmsi_sig'/Int8ub, 'rai'/HexAdapter(Bytes(6)), 'rau_status'/Enum(Byte, updated=0, not_updated=1, plmn_not_allowed=2, routing_area_not_allowed=3)) @@ -897,7 +897,8 @@ class EF_OPL(LinFixedEF): def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len={8, 8}, desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('lai'/Struct('mcc_mnc'/BcdAdapter(Bytes(3)), 'lac_min'/Bytes(2), 'lac_max'/Bytes(2)), 'pnn_record_id'/Int8ub) + self._construct = Struct('lai'/Struct('mcc_mnc'/BcdAdapter(Bytes(3)), + 'lac_min'/HexAdapter(Bytes(2)), 'lac_max'/HexAdapter(Bytes(2))), 'pnn_record_id'/Int8ub) # TS 51.011 Section 10.3.44 + TS 31.102 4.2.62 class EF_MBI(LinFixedEF): @@ -933,8 +934,8 @@ class EF_MMSN(LinFixedEF): def __init__(self, fid='6fce', sfid=None, name='EF.MMSN', rec_len={4, 20}, desc='MMS Notification', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) - self._construct = Struct('mms_status'/Bytes(2), 'mms_implementation'/Bytes(1), - 'mms_notification'/Bytes(this._.total_len-4), 'ext_record_nr'/Byte) + self._construct = Struct('mms_status'/HexAdapter(Bytes(2)), 'mms_implementation'/HexAdapter(Bytes(1)), + 'mms_notification'/HexAdapter(Bytes(this._.total_len-4)), 'ext_record_nr'/Byte) # TS 51.011 Annex K.1 class MMS_Implementation(BER_TLV_IE, tag=0x80): 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia3e7c4791d11bd4e3719a43d58e11e05ec986d1f Gerrit-Change-Number: 28683 Gerrit-PatchSet: 2 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: README: Mention the manual can also be built from the source

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28680 ) Change subject: README: Mention the manual can also be built from the source ...................................................................... README: Mention the manual can also be built from the source Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index 5e1937e..bb92afc 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Homepage and Manual ------------------- -Please visit the [official homepage](https://osmocom.org/projects/pysim/wiki) for usage instructions, manual and examples. +Please visit the [official homepage](https://osmocom.org/projects/pysim/wiki) for usage instructions, manual and examples. The user manual can also be built locally from this source code by ``cd docs && make html latexpdf`` for HTML and PDF format, respectively. Git Repository -------------- -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 Gerrit-Change-Number: 28680 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc_vty: Use value_string to define proto names used in vty

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28705 ) Change subject: cbc_vty: Use value_string to define proto names used in vty ...................................................................... cbc_vty: Use value_string to define proto names used in vty This will be used in other places in a follow up patch. Change-Id: I125c7e5ca1f86c2ef390a85975465330c3ae1eb0 --- M src/cbc_vty.c 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/cbc_vty.c b/src/cbc_vty.c index e27423e..7e70602 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -37,6 +37,13 @@ #include <osmocom/cbc/cbsp_link.h> #include <osmocom/cbc/sbcap_link.h> +static const struct value_string cbc_peer_proto_name_vty[] = { + { CBC_PEER_PROTO_CBSP, "cbsp" }, + { CBC_PEER_PROTO_SABP, "sabp" }, + { CBC_PEER_PROTO_SBcAP, "sbcap" }, + { 0, NULL } +}; + static void dump_one_cbc_peer(struct vty *vty, const struct cbc_peer *peer) { const char *state = "<disconnected>"; @@ -544,10 +551,7 @@ "Cell Broadcast Service Protocol (GSM)\n") { struct cbc_peer *peer = (struct cbc_peer *) vty->index; - if (strcmp(argv[0], "cbsp") == 0) - peer->proto = CBC_PEER_PROTO_CBSP; - else - peer->proto = CBC_PEER_PROTO_SBcAP; + peer->proto = get_string_value(cbc_peer_proto_name_vty, argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I125c7e5ca1f86c2ef390a85975465330c3ae1eb0 Gerrit-Change-Number: 28705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc_vty: print correct protocol when writing config

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28706 ) Change subject: cbc_vty: print correct protocol when writing config ...................................................................... cbc_vty: print correct protocol when writing config Change-Id: Id9fc0b42827f9a74ff1de4b35339de02aeeefee2 --- M src/cbc_vty.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 7e70602..ddf2891 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -638,7 +638,8 @@ { unsigned int i; vty_out(vty, " peer %s%s", peer->name, VTY_NEWLINE); - vty_out(vty, " protocol cbsp%s", VTY_NEWLINE); + vty_out(vty, " protocol %s%s", + get_value_string(cbc_peer_proto_name_vty, peer->proto), VTY_NEWLINE); if (peer->remote_port == -1) vty_out(vty, " no remote-port%s", VTY_NEWLINE); else -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id9fc0b42827f9a74ff1de4b35339de02aeeefee2 Gerrit-Change-Number: 28706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Use cbc_{cbsp,sbcap}_link_close when possible

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28704 ) Change subject: Use cbc_{cbsp,sbcap}_link_close when possible ...................................................................... Use cbc_{cbsp,sbcap}_link_close when possible This way we abstract whether the underlaying stream is a TCP/SCTP client or server. Change-Id: Ie020b9b5ee93ae8d0c9e7266177728185e8635f2 --- M src/cbsp_link.c M src/cbsp_link_fsm.c M src/sbcap_link.c M src/sbcap_link_fsm.c 4 files changed, 14 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 1aa8159..bc421f2 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -75,7 +75,7 @@ } /* destroy connection */ - osmo_stream_srv_destroy(conn); + cbc_cbsp_link_close(link); return -EBADF; } OSMO_ASSERT(msg); @@ -134,7 +134,7 @@ link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); if (!link->fi) { LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); - osmo_stream_srv_destroy(link->conn); + cbc_cbsp_link_close(link); talloc_free(link); return -1; } @@ -152,7 +152,7 @@ } else { LOGPCC(link, LOGL_NOTICE, "Rejecting unknown CBSP peer %s:%d (not permitted)\n", remote_ip, remote_port); - osmo_stream_srv_destroy(link->conn); + cbc_cbsp_link_close(link); return -1; } } else { @@ -194,7 +194,8 @@ void cbc_cbsp_link_close(struct cbc_cbsp_link *link) { - osmo_stream_srv_destroy(link->conn); + if (link->conn) + osmo_stream_srv_destroy(link->conn); } /* initialize the CBC-side CBSP server */ diff --git a/src/cbsp_link_fsm.c b/src/cbsp_link_fsm.c index 3526901..d46a83e 100644 --- a/src/cbsp_link_fsm.c +++ b/src/cbsp_link_fsm.c @@ -196,8 +196,7 @@ { struct cbc_cbsp_link *link = (struct cbc_cbsp_link *) fi->priv; - if (link->conn) - osmo_stream_srv_destroy(link->conn); + cbc_cbsp_link_close(link); llist_del(&link->list); link->fi = NULL; diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 19912f8..4656f6d 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -73,10 +73,10 @@ LOGPSBCAPC(link, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", __func__, rc, flags); if (rc < 0) { - osmo_stream_srv_destroy(conn); + cbc_sbcap_link_close(link); goto out; } else if (rc == 0) { - osmo_stream_srv_destroy(conn); + cbc_sbcap_link_close(link); } else { msgb_put(msg, rc); } @@ -87,7 +87,7 @@ osmo_sctp_sn_type_str(notif->sn_header.sn_type)); switch (notif->sn_header.sn_type) { case SCTP_SHUTDOWN_EVENT: - osmo_stream_srv_destroy(conn); + cbc_sbcap_link_close(link); break; case SCTP_ASSOC_CHANGE: LOGPSBCAPC(link, LOGL_DEBUG, "Rx sctp notif SCTP_ASSOC_CHANGE: %s\n", @@ -162,7 +162,7 @@ link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); if (!link->fi) { LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); - osmo_stream_srv_destroy(link->conn); + cbc_sbcap_link_close(link); talloc_free(link); return -1; } @@ -180,7 +180,7 @@ } else { LOGPSBCAPC(link, LOGL_NOTICE, "Rejecting unknown SBc-AP peer %s:%d (not permitted)\n", remote_ip, remote_port); - osmo_stream_srv_destroy(link->conn); + cbc_sbcap_link_close(link); return -1; } } else { @@ -223,7 +223,8 @@ void cbc_sbcap_link_close(struct cbc_sbcap_link *link) { - osmo_stream_srv_destroy(link->conn); + if (link->conn) + osmo_stream_srv_destroy(link->conn); } /* initialize the CBC-side SBc-AP server */ diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index f8d23cd..9447520 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -94,8 +94,7 @@ { struct cbc_sbcap_link *link = (struct cbc_sbcap_link *) fi->priv; - if (link->conn) - osmo_stream_srv_destroy(link->conn); + cbc_sbcap_link_close(link); llist_del(&link->list); link->fi = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie020b9b5ee93ae8d0c9e7266177728185e8635f2 Gerrit-Change-Number: 28704 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022