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

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by dexter

Attention is currently required from: osmith, laforge, fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/32532 to look at the new patch set (#16). Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) In cmd2 relase 2.0.0 the constructor of Settable adds a settable_object parameter, which apparantly was optional at first, but then became mandatory. Older versions must not have the settable_object parameter but versions from 2.0.0 on require it. Let's add a version check so that we stay compatible to cmd2 versions below and above 2.0.0. See also: https://github.com/python-cmd2/cmd2 Commit 486734e85988d0d0160147b0b44a37759c833e8a Author: Eric Lin <anselor(a)gmail.com> Date: 2020-08-19 20:01:50 and Commit 8f981f37eddcccc919329245b85fd44d5975a6a7 Author: Eric Lin <anselor(a)gmail.com> Date: 2021-03-16 17:25:34 This commit is based on pySim gerrit change: Ifce40410587c85ae932774144b9548b154ee8ad0 Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff --- M README.md M pySim-shell.py M requirements.txt M setup.py 4 files changed, 50 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/32532/16 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 16 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by dexter

Attention is currently required from: osmith, laforge, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32532 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... Patch Set 16: (2 comments) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/32532/comment/f10bfcf6_b0a664ef PS14, Line 26: packaging > You're using this package, but not adding it as a dependency to `requirements.txt` and `setup.py`. […] Done https://gerrit.osmocom.org/c/pysim/+/32532/comment/a119a6fa_cb74861e PS14, Line 154: \ > You don't really need to put these `\`, but not critical. (hopefully pylint does not need them.) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 16 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 May 2023 14:30:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: WIP: apply pylinth on cmd2 1.5 and later versions seperately

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/32719 to look at the new patch set (#2). Change subject: WIP: apply pylinth on cmd2 1.5 and later versions seperately ...................................................................... WIP: apply pylinth on cmd2 1.5 and later versions seperately Change-Id: I129b8c90ac80d75e125c81f5d5028fae3e295e6d --- M contrib/jenkins.sh 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/19/32719/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I129b8c90ac80d75e125c81f5d5028fae3e295e6d Gerrit-Change-Number: 32719 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: README.md: add missing pycryptodome to dependency list

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/32718 to look at the new patch set (#2). Change subject: README.md: add missing pycryptodome to dependency list ...................................................................... README.md: add missing pycryptodome to dependency list Change-Id: Ib3cf13a1ad38749ac82d1b36fa32d9c5aba29e1a --- M README.md 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/32718/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib3cf13a1ad38749ac82d1b36fa32d9c5aba29e1a Gerrit-Change-Number: 32718 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: README.md: add missing pycryptodome to dependency list

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32718 ) Change subject: README.md: add missing pycryptodome to dependency list ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib3cf13a1ad38749ac82d1b36fa32d9c5aba29e1a Gerrit-Change-Number: 32718 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 May 2023 14:28:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: setup: add missing pyyaml to setup.py and README.md

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32717 ) Change subject: setup: add missing pyyaml to setup.py and README.md ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/32717/comment/3f4edc1f_45856f2a PS1, Line 7: and README.md ... but this file is unchanged? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d35f38b17a315dd58e8dd91a27bfa6c2c85905d Gerrit-Change-Number: 32717 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 May 2023 14:27:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: Fix Unbound integer operand of unary increment operator.

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32720 ) Change subject: pcu: Fix Unbound integer operand of unary increment operator. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0779feea8e6305b2d8daee68786eee1f8d8f4f29 Gerrit-Change-Number: 32720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 May 2023 14:24:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: Fix Unbound integer operand of unary increment operator.

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32720 ) Change subject: pcu: Fix Unbound integer operand of unary increment operator. ...................................................................... pcu: Fix Unbound integer operand of unary increment operator. Change-Id: I0779feea8e6305b2d8daee68786eee1f8d8f4f29 --- M pcu/GPRS_Components.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/32720/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 37dcc97..a3e8c94 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -1205,7 +1205,7 @@ integer max_dummy := -1, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return uint32_t { - var integer i; + var integer i := 0; var uint32_t dl_fn; while (true) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0779feea8e6305b2d8daee68786eee1f8d8f4f29 Gerrit-Change-Number: 32720 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: pass pco & qos from apn

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32643 ) Change subject: layer23: modem: pass pco & qos from apn ...................................................................... layer23: modem: pass pco & qos from apn Change-Id: I4088e3e96a58bd667627023f144a05137415dd32 --- M src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/src/common/apn.c M src/host/layer23/src/modem/sm.c 3 files changed, 25 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/apn.h b/src/host/layer23/include/osmocom/bb/common/apn.h index c449530..7378221 100644 --- a/src/host/layer23/include/osmocom/bb/common/apn.h +++ b/src/host/layer23/include/osmocom/bb/common/apn.h @@ -20,6 +20,9 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> #include <osmocom/core/tun.h> + +#include <osmocom/gprs/sm/sm.h> + #include <osmocom/bb/common/apn_fsm.h> struct osmocom_ms; @@ -31,6 +34,10 @@ struct osmobb_pdp_ctx { uint8_t nsapi; uint8_t llc_sapi; + uint8_t qos[OSMO_GPRS_SM_QOS_MAXLEN]; + uint8_t qos_len; + uint8_t pco[OSMO_GPRS_SM_PCO_MAXLEN]; + uint8_t pco_len; }; struct osmobb_apn { diff --git a/src/host/layer23/src/common/apn.c b/src/host/layer23/src/common/apn.c index 4ea5d3a..f69014a 100644 --- a/src/host/layer23/src/common/apn.c +++ b/src/host/layer23/src/common/apn.c @@ -54,6 +54,11 @@ /* FIXME: may want to configure or pick free one in the future: */ apn->pdp.nsapi = 6; apn->pdp.llc_sapi = OSMO_GPRS_SM_LLC_SAPI_SAPI3; + + /* QoS zeroed to 14 bytes is a valid QoS seen sent by some phones. Use + * that as default for now. */ + apn->pdp.qos_len = 14; + llist_add_tail(&apn->list, &ms->gprs.apn_list); return apn; diff --git a/src/host/layer23/src/modem/sm.c b/src/host/layer23/src/modem/sm.c index 63f922a..e4b8de6 100644 --- a/src/host/layer23/src/modem/sm.c +++ b/src/host/layer23/src/modem/sm.c @@ -233,8 +233,6 @@ const struct gsm_subscriber *subscr = &ms->subscr; enum osmo_gprs_sm_pdp_addr_ietf_type pdp_addr_ietf_type; struct osmo_sockaddr pdp_addr_any = {0}; - uint8_t qos[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; - uint8_t pco[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; int rc; if (apn->cfg.apn_type_mask & APN_TYPE_IPv4v6) { @@ -254,10 +252,10 @@ sm_prim->smreg.pdp_act_req.pdp_addr_ietf_type = pdp_addr_ietf_type; sm_prim->smreg.pdp_act_req.pdp_addr_v4 = pdp_addr_any; sm_prim->smreg.pdp_act_req.pdp_addr_v6 = pdp_addr_any; - memcpy(sm_prim->smreg.pdp_act_req.qos, qos, sizeof(qos)); - sm_prim->smreg.pdp_act_req.qos_len = 1; - memcpy(sm_prim->smreg.pdp_act_req.pco, pco, sizeof(pco)); - sm_prim->smreg.pdp_act_req.pco_len = 1; + memcpy(sm_prim->smreg.pdp_act_req.qos, apn->pdp.qos, apn->pdp.qos_len); + sm_prim->smreg.pdp_act_req.qos_len = apn->pdp.qos_len; + memcpy(sm_prim->smreg.pdp_act_req.pco, apn->pdp.pco, apn->pdp.pco_len); + sm_prim->smreg.pdp_act_req.pco_len = apn->pdp.pco_len; OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.apn, apn->cfg.name); sm_prim->smreg.pdp_act_req.gmm.ptmsi = subscr->ptmsi; OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imsi, subscr->imsi); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4088e3e96a58bd667627023f144a05137415dd32 Gerrit-Change-Number: 32643 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Use in SN SAP the TLLI retrieved from GMM and SM

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32637 ) Change subject: layer23: modem: Use in SN SAP the TLLI retrieved from GMM and SM ...................................................................... layer23: modem: Use in SN SAP the TLLI retrieved from GMM and SM Depends: libosmo-gprs.git Change-Id I7b1b8ac414474652b438f15b7f07961032a0f56d Change-Id: Icac16626a6b89489b7f1ee2ab8ffbaca04e8bacc --- M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/src/common/ms.c M src/host/layer23/src/modem/gmm.c M src/host/layer23/src/modem/sm.c M src/host/layer23/src/modem/sndcp.c 5 files changed, 37 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index d9c6255..bfbf879 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -24,6 +24,7 @@ uint8_t ac_ref_nr; uint8_t key_seq; uint8_t rand[16]; + uint32_t tlli; }; struct osmosap_entity { diff --git a/src/host/layer23/src/common/ms.c b/src/host/layer23/src/common/ms.c index 4b1440e..f03427c 100644 --- a/src/host/layer23/src/common/ms.c +++ b/src/host/layer23/src/common/ms.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. * */ +#include <osmocom/gsm/gsm48.h> #include <osmocom/bb/common/ms.h> @@ -54,6 +55,8 @@ ms->l2_wq.bfd.fd = -1; ms->sap_wq.bfd.fd = -1; + ms->gmmlayer.tlli = GSM_RESERVED_TMSI; + /* Register a new MS */ llist_add_tail(&ms->entity, &ms_list); diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index b95f15a..b283192 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -62,6 +62,7 @@ LOGP(DGMM, LOGL_NOTICE, "%s(): Rx %s: Attach success P-TMSI=0x%08x\n", __func__, pdu_name, gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi); ms->subscr.ptmsi = gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi; + ms->gmmlayer.tlli = gmm_prim->gmmreg.attach_cnf.acc.allocated_tlli; app_data.modem_state = MODEM_ST_ATTACHED; /* Activate APN if not yet already: */ llist_for_each_entry(apn, &ms->gprs.apn_list, list) { diff --git a/src/host/layer23/src/modem/sm.c b/src/host/layer23/src/modem/sm.c index 03982c6..63f922a 100644 --- a/src/host/layer23/src/modem/sm.c +++ b/src/host/layer23/src/modem/sm.c @@ -76,6 +76,9 @@ return 0; } + ms->subscr.ptmsi = sm_prim->smreg.pdp_act_cnf.acc.gmm.allocated_ptmsi; + ms->gmmlayer.tlli = sm_prim->smreg.pdp_act_cnf.acc.gmm.allocated_tlli; + netdev = osmo_tundev_get_netdev(apn->tun); switch (sm_prim->smreg.pdp_act_cnf.acc.pdp_addr_ietf_type) { case OSMO_GPRS_SM_PDP_ADDR_IETF_IPV4: diff --git a/src/host/layer23/src/modem/sndcp.c b/src/host/layer23/src/modem/sndcp.c index 7814e50..34b85af 100644 --- a/src/host/layer23/src/modem/sndcp.c +++ b/src/host/layer23/src/modem/sndcp.c @@ -75,7 +75,7 @@ static int modem_sndcp_prim_up_cb(struct osmo_gprs_sndcp_prim *sndcp_prim, void *user_data) { struct osmocom_ms *ms = user_data; - struct osmobb_apn *apn; + struct osmobb_apn *apn = NULL, *apn_it; const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); int rc = 0; @@ -84,8 +84,17 @@ OSMO_ASSERT(0); } - /* TODO: properly retrieve APN/PDP based on TLLI/SAPI/NSAPI: */ - apn = llist_first_entry_or_null(&ms->gprs.apn_list, struct osmobb_apn, list); + if (ms->gmmlayer.tlli != sndcp_prim->sn.tlli) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s: MS has no TLLI=0x%08x\n", __func__, npdu_name, sndcp_prim->sn.tlli); + return -ENOENT; + } + + llist_for_each_entry(apn_it, &ms->gprs.apn_list, list) { + if (apn_it->pdp.nsapi != sndcp_prim->sn.unitdata_ind.nsapi) + continue; + apn = apn_it; + break; + } if (!apn) { LOGP(DSNDCP, LOGL_NOTICE, "Unable to find destination APN: Rx %s\n", npdu_name); return -ENODEV; @@ -179,10 +188,9 @@ struct osmocom_ms *ms = apn->ms; struct gprs_settings *set = &ms->gprs; - /* TODO: look up PDP context IDs from ms once we have GMM layer. */ - uint32_t tlli = 0xe1c5d364; - - sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(tlli, apn->pdp.llc_sapi, apn->pdp.nsapi); + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(ms->gmmlayer.tlli, + apn->pdp.llc_sapi, + apn->pdp.nsapi); OSMO_ASSERT(sndcp_prim); sndcp_prim->sn.xid_req.pcomp_rfc1144.active = set->pcomp_rfc1144.active; sndcp_prim->sn.xid_req.pcomp_rfc1144.s01 = set->pcomp_rfc1144.s01; @@ -199,10 +207,10 @@ struct osmo_gprs_sndcp_prim *sndcp_prim; int rc; - /* TODO: look up PDP context IDs from apn->ms once we have GMM layer. */ - uint32_t tlli = 0xe1c5d364; - - sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(tlli, apn->pdp.llc_sapi, apn->pdp.nsapi, npdu, npdu_len); + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(apn->ms->gmmlayer.tlli, + apn->pdp.llc_sapi, + apn->pdp.nsapi, + npdu, npdu_len); OSMO_ASSERT(sndcp_prim); rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icac16626a6b89489b7f1ee2ab8ffbaca04e8bacc Gerrit-Change-Number: 32637 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023