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

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email ) Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields This also makes sure it doesn't compile against older libosmogsm gsup versions which would break ABI. Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Related: OS#6091 Depends: libosmocore.git Change-Id 70be3560659c58f24b8db529c4fc85da4bb0ec04 --- M TODO-RELEASE M include/osmocom/sgsn/gprs_subscriber.h M src/sgsn/gprs_subscriber.c M src/sgsn/sgsn_vty.c M tests/sgsn/sgsn_test.c 5 files changed, 35 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 1c5d61f..df983c1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +1,2 @@ #component what description / commit summary line +libosmocore > 1.9.0 gsup.h: Using new fields in struct osmo_gsup_pdp_info (ABI break) \ No newline at end of file diff --git a/include/osmocom/sgsn/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h index 78de64a..0d4a594 100644 --- a/include/osmocom/sgsn/gprs_subscriber.h +++ b/include/osmocom/sgsn/gprs_subscriber.h @@ -4,7 +4,9 @@ #include <stdint.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/core/socket.h> #include <osmocom/gsm/protocol/gsm_23_003.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/sgsn/apn.h> @@ -54,7 +56,9 @@ struct llist_head list; unsigned int context_id; - uint16_t pdp_type; + enum gsm48_pdp_type_org pdp_type_org; + enum gsm48_pdp_type_nr pdp_type_nr; + struct osmo_sockaddr pdp_address[2]; char apn_str[GSM_APN_LENGTH]; uint8_t qos_subscribed[20]; size_t qos_subscribed_len; diff --git a/src/sgsn/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c index 460450c..a52abe8 100644 --- a/src/sgsn/gprs_subscriber.c +++ b/src/sgsn/gprs_subscriber.c @@ -376,7 +376,8 @@ } OSMO_ASSERT(pdp_data != NULL); - pdp_data->pdp_type = pdp_info->pdp_type; + pdp_data->pdp_type_org = pdp_info->pdp_type_org; + pdp_data->pdp_type_nr = pdp_info->pdp_type_nr; osmo_apn_to_str(pdp_data->apn_str, pdp_info->apn_enc, pdp_info->apn_enc_len); diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 4c04368..29f9cd6 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -990,8 +990,17 @@ } llist_for_each_entry(pdp, &gsub->sgsn_data->pdp_list, list) { - vty_out(vty, " PDP info: Id: %d, Type: 0x%04x, APN: '%s'", - pdp->context_id, pdp->pdp_type, pdp->apn_str); + char ip_str[INET6_ADDRSTRLEN] = { 0 }; + + vty_out(vty, " PDP info: Id: %d, Addr(Org: 0x%02x Type: 0x%02x", + pdp->context_id, pdp->pdp_type_org, pdp->pdp_type_nr); + + if (pdp->pdp_address[0].u.sa.sa_family != AF_UNSPEC) + vty_out(vty, " Addr[0]: %s", osmo_sockaddr_ntop(&pdp->pdp_address[0].u.sa, ip_str)); + if (pdp->pdp_address[0].u.sa.sa_family != AF_UNSPEC) + vty_out(vty, " Addr[1]: %s", osmo_sockaddr_ntop(&pdp->pdp_address[1].u.sa, ip_str)); + + vty_out(vty, ") APN: '%s'", pdp->apn_str); if (pdp->qos_subscribed_len) vty_out(vty, " QoS: %s", osmo_hexdump(pdp->qos_subscribed, pdp->qos_subscribed_len)); diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index f821165..a149b8e 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -1489,7 +1489,8 @@ pdp_data = sgsn_subscriber_pdp_data_alloc(s1->sgsn_data); pdp_data->context_id = 1; - pdp_data->pdp_type = 0x0121; + pdp_data->pdp_type_org = PDP_TYPE_ORG_IETF; + pdp_data->pdp_type_nr = PDP_TYPE_N_IETF_IPv4; osmo_strlcpy(pdp_data->apn_str, "*", sizeof(pdp_data->apn_str)); /* Resolve GGSNs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by fixeria

Attention is currently required from: lynxis lazus, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email ) Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 30 Jan 2024 09:33:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: disable TCH/F14.4 (not implemented)

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email ) Change subject: mobile: disable TCH/F14.4 (not implemented) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Gerrit-Change-Number: 35738 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Jan 2024 09:29:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in libosmocore[master]: gsup: add support for IPV4/IPV6 in PDP info

by lynxis lazus

lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35237?usp=email ) Change subject: gsup: add support for IPV4/IPV6 in PDP info ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I17ccbe8b78e92e2f03c18e4e42e8b62f0a7bcbd1 Gerrit-Change-Number: 35237 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early

by Hoernchen

Attention is currently required from: fixeria, jolly, laforge, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > It is still unresolved, whether we should round up always or only if the remaining time is < 1 ms. […] Rounding up is perfectly fine because scheduling granularity can be expected to be much higher anyway unless you apply sched_rr or other use other schedulers, but even in that case lower latencies imply a select loop that has nothing else to do, so the expected delay is "in general" not accurate anyway. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Jan 2024 09:23:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: disable TCH/F14.4 (not implemented)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email ) Change subject: mobile: disable TCH/F14.4 (not implemented) ...................................................................... mobile: disable TCH/F14.4 (not implemented) Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Related: OS#4396, OS#6346 --- M doc/examples/mobile/default.cfg M src/host/layer23/src/common/support.c 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/35738/1 diff --git a/doc/examples/mobile/default.cfg b/doc/examples/mobile/default.cfg index 3b46a85..676c76f 100644 --- a/doc/examples/mobile/default.cfg +++ b/doc/examples/mobile/default.cfg @@ -53,6 +53,12 @@ full-speech-v1 full-speech-v2 half-speech-v1 + no full-data-14400 + full-data-9600 + full-data-4800 + half-data-4800 + full-data-2400 + half-data-2400 min-rxlev -106 dsc-max 90 no skip-max-per-band diff --git a/src/host/layer23/src/common/support.c b/src/host/layer23/src/common/support.c index ed51465..a31b456 100644 --- a/src/host/layer23/src/common/support.c +++ b/src/host/layer23/src/common/support.c @@ -99,7 +99,7 @@ sup->half_v3 = 0; /* CSD modes */ - sup->csd_tch_f144 = 1; + sup->csd_tch_f144 = 0; sup->csd_tch_f96 = 1; sup->csd_tch_f48 = 1; sup->csd_tch_h48 = 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia8dff81d4b56c9d6599059f3a5a2964d3cd95829 Gerrit-Change-Number: 35738 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: set TRAFFIC.{ind,req} mode during call establishment

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email ) Change subject: mobile: set TRAFFIC.{ind,req} mode during call establishment ...................................................................... mobile: set TRAFFIC.{ind,req} mode during call establishment Now that we support data (CSD) calls in addition to voice calls, we can no longer initialize the TRAFFIC.{ind,req} routing mode in gsm48_rr_init(). We need to apply the appropriate TCH routing mode *during call establishment* based on its type and the configured I/O handler type. After this patch, one can have the following configuration: tch-voice io-handler l1phy tch-data io-handler unix-sock io-tch-format ti so that the io-handler setting for voice would not affect data calls. Before this patch, the L1 PHY (specifically, Calypso firmware) would not route TRAFFIC.{ind,req} during data calls at all. Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Related: OS#4396 --- M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/tch.c M src/host/layer23/src/mobile/tch_data.c M src/host/layer23/src/mobile/tch_voice.c 4 files changed, 58 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/35740/1 diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 4d879d6..83287c1 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -6996,20 +6996,7 @@ start_rr_t_meas(rr, 1, 0); rr->tch_loop_mode = L1CTL_TCH_LOOP_OPEN; - - /* Configure audio handling in the L1PHY */ - switch (ms->settings.tch_voice.io_handler) { - case TCH_VOICE_IOH_L1PHY: - rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; - break; - case TCH_VOICE_IOH_MNCC_SOCK: - case TCH_VOICE_IOH_LOOPBACK: - case TCH_VOICE_IOH_GAPK: - rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; - break; - case TCH_VOICE_IOH_NONE: - rr->audio_mode = 0x00; - } + rr->audio_mode = 0x00; /* set in tch_{voice,data}_state_init() */ /* List of notifications about ongoing ASCI calls */ INIT_LLIST_HEAD(&rr->vgcs.notif_list); @@ -7126,9 +7113,6 @@ struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; - if (ms->settings.tch_voice.io_handler != TCH_VOICE_IOH_NONE) - return 0; - LOGP(DRR, LOGL_INFO, "setting audio mode to %d\n", mode); rr->audio_mode = mode; diff --git a/src/host/layer23/src/mobile/tch.c b/src/host/layer23/src/mobile/tch.c index d5dda2e..5b59b79 100644 --- a/src/host/layer23/src/mobile/tch.c +++ b/src/host/layer23/src/mobile/tch.c @@ -122,8 +122,9 @@ static void tch_trans_cstate_active_cb(struct gsm_trans *trans) { struct osmocom_ms *ms = trans->ms; + const struct gsm48_rrlayer *rr = &ms->rrlayer; + const struct gsm48_rr_cd *cd = &rr->cd_now; struct tch_state *state; - enum gsm48_chan_mode ch_mode; if (ms->tch_state != NULL) return; /* TODO: handle modify? */ @@ -132,8 +133,7 @@ OSMO_ASSERT(state != NULL); ms->tch_state = state; - ch_mode = ms->rrlayer.cd_now.mode; - switch (ch_mode) { + switch (cd->mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: case GSM48_CMODE_SPEECH_AMR: @@ -154,12 +154,15 @@ case GSM48_CMODE_SIGN: default: LOGP(DL1C, LOGL_ERROR, "Unhandled channel mode %s\n", - get_value_string(gsm48_chan_mode_names, ch_mode)); + get_value_string(gsm48_chan_mode_names, cd->mode)); exit_free: talloc_free(state); ms->tch_state = NULL; return; } + + /* rr->audio_mode has been set by tch_{voice,data}_state_init(), apply it */ + gsm48_rr_audio_mode(ms, rr->audio_mode); } static void tch_trans_free_cb(struct gsm_trans *trans) @@ -173,6 +176,7 @@ tch_voice_state_free(&state->voice); else tch_data_state_free(&state->data); + ms->rrlayer.audio_mode = 0x00; talloc_free(state); ms->tch_state = NULL; diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c index c93c828..6e7eb0e 100644 --- a/src/host/layer23/src/mobile/tch_data.c +++ b/src/host/layer23/src/mobile/tch_data.c @@ -36,6 +36,8 @@ #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/tch.h> +#include <l1ctl_proto.h> + struct csd_v110_frame_desc { uint16_t num_blocks; uint16_t num_bits; @@ -495,6 +497,7 @@ struct tch_data_state *state) { struct osmocom_ms *ms = trans->ms; + struct gsm48_rrlayer *rr = &ms->rrlayer; const struct gsm_mncc_bearer_cap *bcap = trans->cc.bcap; int rc; @@ -506,13 +509,13 @@ state->sock = tch_csd_sock_init(ms); if (state->sock == NULL) return -ENOMEM; + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; case TCH_DATA_IOH_LOOPBACK: case TCH_DATA_IOH_NONE: + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; /* we don't need V.110 TA / soft-UART */ return 0; - default: - break; } if (bcap->data.async) { diff --git a/src/host/layer23/src/mobile/tch_voice.c b/src/host/layer23/src/mobile/tch_voice.c index f4bbcfa..a85d7dc 100644 --- a/src/host/layer23/src/mobile/tch_voice.c +++ b/src/host/layer23/src/mobile/tch_voice.c @@ -34,6 +34,8 @@ #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/tch.h> +#include <l1ctl_proto.h> + /* Forward a Downlink voice frame to the external MNCC handler */ static int tch_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) { @@ -119,11 +121,19 @@ int tch_voice_state_init(struct gsm_trans *trans, struct tch_voice_state *state) { -#ifdef WITH_GAPK_IO struct osmocom_ms *ms = trans->ms; - const struct gsm48_rr_cd *cd = &ms->rrlayer.cd_now; + struct gsm48_rrlayer *rr = &ms->rrlayer; + const struct gsm48_rr_cd *cd = &rr->cd_now; switch (state->handler) { + case TCH_VOICE_IOH_L1PHY: + rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; + break; + case TCH_VOICE_IOH_MNCC_SOCK: + case TCH_VOICE_IOH_LOOPBACK: + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; + break; +#ifdef WITH_GAPK_IO case TCH_VOICE_IOH_GAPK: if ((cd->chan_nr & RSL_CHAN_NR_MASK) == RSL_CHAN_Bm_ACCHs) state->gapk_io = gapk_io_state_alloc_mode_rate(ms, cd->mode, true); @@ -131,11 +141,13 @@ state->gapk_io = gapk_io_state_alloc_mode_rate(ms, cd->mode, false); if (state->gapk_io == NULL) return -1; + rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; - default: +#endif + case TCH_VOICE_IOH_NONE: + rr->audio_mode = 0x00; break; } -#endif return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Gerrit-Change-Number: 35740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... mobile: init TCH state earlier (on receipt of CC ALERTING) The MS would usually start receiving traffic indications with dial tone or some music even before the call gets CONNECTed. Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Related: OS#4396 --- M src/host/layer23/src/mobile/tch.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/35739/1 diff --git a/src/host/layer23/src/mobile/tch.c b/src/host/layer23/src/mobile/tch.c index 70c9163..d5dda2e 100644 --- a/src/host/layer23/src/mobile/tch.c +++ b/src/host/layer23/src/mobile/tch.c @@ -181,7 +181,9 @@ static void tch_trans_state_chg_cb(struct gsm_trans *trans) { switch (trans->cc.state) { - case GSM_CSTATE_ACTIVE: + case GSM_CSTATE_CALL_DELIVERED: /* MO call: Rx CC ALERTING */ + case GSM_CSTATE_CALL_RECEIVED: /* MT call: Tx CC ALERTING */ + case GSM_CSTATE_ACTIVE: /* MO/MT call: Rx CC CONNECT */ tch_trans_cstate_active_cb(trans); break; case GSM_CSTATE_NULL: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release.sh: make it a bit more user friendly

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email ) Change subject: osmo-release.sh: make it a bit more user friendly ...................................................................... osmo-release.sh: make it a bit more user friendly Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc --- M osmo-release.sh 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 5f31c5f..e947fe4 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -235,7 +235,9 @@ if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then - echo "ERROR: Before releasing, please modify some of the libversions: $LIBVERS" + echo "ERROR: Before releasing, please modify some of the libversions:" + for l in $LIBVERS; do echo " $l"; done + echo "After making changes, add modified file(s) to the index using git-add." echo "You should NOT be doing this unless you've read and understood following article:" echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info…" exit 1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc Gerrit-Change-Number: 35725 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: tests/Makefile.am: do not add files to EXTRA_DIST conditionally

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email ) Change subject: tests/Makefile.am: do not add files to EXTRA_DIST conditionally ...................................................................... tests/Makefile.am: do not add files to EXTRA_DIST conditionally These files must be present in the release tarballs regardless of the configure options (ENABLE_LIBSCTP, ENABLE_SCTP_TESTS). Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Related: OS#6349 --- M tests/Makefile.am 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/Makefile.am b/tests/Makefile.am index 5042b3c..7c109a1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -504,11 +504,11 @@ osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \ soft_uart/soft_uart_test.ok \ rlp/rlp_test.ok \ + socket/socket_sctp_test.ok socket/socket_sctp_test.err \ $(NULL) if ENABLE_LIBSCTP if ENABLE_SCTP_TESTS -EXTRA_DIST += socket/socket_sctp_test.ok socket/socket_sctp_test.err check_PROGRAMS += socket/socket_sctp_test socket_socket_sctp_test_SOURCES = socket/socket_sctp_test.c endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Gerrit-Change-Number: 35728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in ...osmo-epdg[master]: UE-initiated detach: Do STR+STA ePDG<->AAA-Server

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35737?usp=email ) Change subject: UE-initiated detach: Do STR+STA ePDG<->AAA-Server ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I6f7554e24b26bfe191b28b56904bc8432690625d Gerrit-Change-Number: 35737 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:13:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in ...osmo-epdg[master]: Make Auth Compl procedure more similar to specs

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35698?usp=email ) Change subject: Make Auth Compl procedure more similar to specs ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I480c110deeb04abf1ff19147a70e10be9cbafae8 Gerrit-Change-Number: 35698 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:13:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35736?usp=email ) Change subject: epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface ...................................................................... epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface The AAA-Server informs the HSS when the session is created at the PGW. Change-Id: I1b81f1a2225f54d0f8f679e53d87f342feb495be --- M epdg/EPDG_Tests.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 0e9cbed..de5e7a8 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -392,6 +392,10 @@ S6b.send(ts_DIA_S6b_AAR(g_pars.imsi, int2oct(DIA_TS29_373_MIP6_Feature_Vector_GTPv2_SUPPORTED, 8), g_pars.apn, hbh_id := hbh_id, ete_id := ete_id)); + + /* AAR in S6b in AAA-Server triggers Service-Assignment Request/Answer towards HSS: */ + as_DIA_SWx_SA_success(); + alt { [] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {} [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35736?usp=email 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: I1b81f1a2225f54d0f8f679e53d87f342feb495be Gerrit-Change-Number: 35736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35736?usp=email ) Change subject: epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35736?usp=email 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: I1b81f1a2225f54d0f8f679e53d87f342feb495be Gerrit-Change-Number: 35736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:12:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release.sh: make it a bit more user friendly

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email ) Change subject: osmo-release.sh: make it a bit more user friendly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc Gerrit-Change-Number: 35725 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:12:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: tests/Makefile.am: do not add files to EXTRA_DIST conditionally

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email ) Change subject: tests/Makefile.am: do not add files to EXTRA_DIST conditionally ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Gerrit-Change-Number: 35728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:12:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by laforge

Attention is currently required from: fixeria, lynxis lazus, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email ) Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:11:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: esim.saip: More type annotations

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35735?usp=email ) Change subject: esim.saip: More type annotations ...................................................................... esim.saip: More type annotations Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea --- M pySim/esim/saip/__init__.py 1 file changed, 20 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 251395f..7bb2172 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import abc -from typing import Tuple, List, Optional, Dict +from typing import Tuple, List, Optional, Dict, Union import asn1tools @@ -26,7 +26,7 @@ asn1 = compile_asn1_subdir('saip') class ProfileElement: - def _fixup_sqnInit_dec(self): + def _fixup_sqnInit_dec(self) -> None: """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around this.""" if self.type != 'akaParameter': @@ -39,7 +39,7 @@ # SEQUENCE (SIZE (32)) OF OCTET STRING (SIZE (6)) self.decoded['sqnInit'] = [b'\x00'*6] * 32 - def _fixup_sqnInit_enc(self): + def _fixup_sqnInit_enc(self) -> None: """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around this.""" if self.type != 'akaParameter': @@ -53,7 +53,7 @@ # none of the fields were initialized with a non-default (non-zero) value, so we can skip it del self.decoded['sqnInit'] - def parse_der(self, der: bytes): + def parse_der(self, der: bytes) -> None: """Parse a sequence of PE and store the result in instance attributes.""" self.type, self.decoded = asn1.decode('ProfileElement', der) # work around asn1tools bug regarding DEFAULT for a SEQUENCE OF @@ -72,7 +72,7 @@ self._fixup_sqnInit_enc() return asn1.encode('ProfileElement', (self.type, self.decoded)) - def __str__(self): + def __str__(self) -> str: return self.type @@ -102,7 +102,7 @@ assert len(l) == 1 return l[0] - def parse_der(self, der: bytes): + def parse_der(self, der: bytes) -> None: """Parse a sequence of PE and store the result in self.pe_list.""" self.pe_list = [] remainder = der @@ -111,11 +111,11 @@ self.pe_list.append(ProfileElement.from_der(first_tlv)) self._process_pelist() - def _process_pelist(self): + def _process_pelist(self) -> None: self._rebuild_pe_by_type() self._rebuild_pes_by_naa() - def _rebuild_pe_by_type(self): + def _rebuild_pe_by_type(self) -> None: self.pe_by_type = {} # build a dict {pe_type: [pe, pe, pe]} for pe in self.pe_list: @@ -124,7 +124,7 @@ else: self.pe_by_type[pe.type] = [pe] - def _rebuild_pes_by_naa(self): + def _rebuild_pes_by_naa(self) -> None: """rebuild the self.pes_by_naa dict {naa: [ [pe, pe, pe], [pe, pe] ]} form, which basically means for every NAA there's a lsit of instances, and each consists of a list of a list of PEs.""" @@ -165,8 +165,8 @@ out += pe.to_der() return out - def __repr__(self): + def __repr__(self) -> str: return "PESequence(%s)" % ', '.join([str(x) for x in self.pe_list]) - def __iter__(self): + def __iter__(self) -> str: yield from self.pe_list -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea Gerrit-Change-Number: 35735 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in pysim[master]: esim.saip: Move OID to separate sub-module

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35734?usp=email ) Change subject: esim.saip: Move OID to separate sub-module ...................................................................... esim.saip: Move OID to separate sub-module This helps us to prevent circular imports in follow-up code. Change-Id: I94f85f2257d4702376f4ba5eb995a544a2e53fd3 --- M pySim/esim/saip/__init__.py A pySim/esim/saip/oid.py 2 files changed, 84 insertions(+), 57 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 9b182e5..251395f 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -25,63 +25,6 @@ asn1 = compile_asn1_subdir('saip') -class oid: - class OID: - @staticmethod - def intlist_from_str(instr: str) -> List[int]: - return [int(x) for x in instr.split('.')] - - def __init__(self, initializer): - if type(initializer) == str: - self.intlist = self.intlist_from_str(initializer) - else: - self.intlist = initializer - - def __str__(self): - return '.'.join([str(x) for x in self.intlist]) - - def __repr__(self): - return 'OID(%s)' % (str(self)) - - - class eOID(OID): - """OID helper for TCA eUICC prefix""" - __prefix = [2,23,143,1] - def __init__(self, initializer): - if type(initializer) == str: - initializer = self.intlist_from_str(initializer) - super().__init__(self.__prefix + initializer) - - MF = eOID("2.1") - DF_CD = eOID("2.2") - DF_TELECOM = eOID("2.3") - DF_TELECOM_v2 = eOID("2.3.2") - ADF_USIM_by_default = eOID("2.4") - ADF_USIM_by_default_v2 = eOID("2.4.2") - ADF_USIM_not_by_default = eOID("2.5") - ADF_USIM_not_by_default_v2 = eOID("2.5.2") - ADF_USIM_not_by_default_v3 = eOID("2.5.3") - DF_PHONEBOOK_ADF_USIM = eOID("2.6") - DF_GSM_ACCESS_ADF_USIM = eOID("2.7") - ADF_ISIM_by_default = eOID("2.8") - ADF_ISIM_not_by_default = eOID("2.9") - ADF_ISIM_not_by_default_v2 = eOID("2.9.2") - ADF_CSIM_by_default = eOID("2.10") - ADF_CSIM_by_default_v2 = eOID("2.10.2") - ADF_CSIM_not_by_default = eOID("2.11") - ADF_CSIM_not_by_default_v2 = eOID("2.11.2") - DF_EAP = eOID("2.12") - DF_5GS = eOID("2.13") - DF_5GS_v2 = eOID("2.13.2") - DF_5GS_v3 = eOID("2.13.3") - DF_5GS_v4 = eOID("2.13.4") - DF_SAIP = eOID("2.14") - DF_SNPN = eOID("2.15") - DF_5GProSe = eOID("2.16") - IoT_default = eOID("2.17") - IoT_default = eOID("2.18") - - class ProfileElement: def _fixup_sqnInit_dec(self): """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around diff --git a/pySim/esim/saip/oid.py b/pySim/esim/saip/oid.py new file mode 100644 index 0000000..8b2870e --- /dev/null +++ b/pySim/esim/saip/oid.py @@ -0,0 +1,73 @@ +# Implementation of SimAlliance/TCA Interoperable Profile OIDs +# +# (C) 2023-2024 by Harald Welte <laforge(a)osmocom.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from typing import List, Union + +class OID: + @staticmethod + def intlist_from_str(instr: str) -> List[int]: + return [int(x) for x in instr.split('.')] + + def __init__(self, initializer: Union[List[int], str]): + if type(initializer) == str: + self.intlist = self.intlist_from_str(initializer) + else: + self.intlist = initializer + + def __str__(self) -> str: + return '.'.join([str(x) for x in self.intlist]) + + def __repr__(self) -> str: + return 'OID(%s)' % (str(self)) + + +class eOID(OID): + """OID helper for TCA eUICC prefix""" + __prefix = [2,23,143,1] + def __init__(self, initializer): + if type(initializer) == str: + initializer = self.intlist_from_str(initializer) + super().__init__(self.__prefix + initializer) + +MF = eOID("2.1") +DF_CD = eOID("2.2") +DF_TELECOM = eOID("2.3") +DF_TELECOM_v2 = eOID("2.3.2") +ADF_USIM_by_default = eOID("2.4") +ADF_USIM_by_default_v2 = eOID("2.4.2") +ADF_USIM_not_by_default = eOID("2.5") +ADF_USIM_not_by_default_v2 = eOID("2.5.2") +ADF_USIM_not_by_default_v3 = eOID("2.5.3") +DF_PHONEBOOK_ADF_USIM = eOID("2.6") +DF_GSM_ACCESS_ADF_USIM = eOID("2.7") +ADF_ISIM_by_default = eOID("2.8") +ADF_ISIM_not_by_default = eOID("2.9") +ADF_ISIM_not_by_default_v2 = eOID("2.9.2") +ADF_CSIM_by_default = eOID("2.10") +ADF_CSIM_by_default_v2 = eOID("2.10.2") +ADF_CSIM_not_by_default = eOID("2.11") +ADF_CSIM_not_by_default_v2 = eOID("2.11.2") +DF_EAP = eOID("2.12") +DF_5GS = eOID("2.13") +DF_5GS_v2 = eOID("2.13.2") +DF_5GS_v3 = eOID("2.13.3") +DF_5GS_v4 = eOID("2.13.4") +DF_SAIP = eOID("2.14") +DF_SNPN = eOID("2.15") +DF_5GProSe = eOID("2.16") +IoT_default = eOID("2.17") +IoT_default = eOID("2.18") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94f85f2257d4702376f4ba5eb995a544a2e53fd3 Gerrit-Change-Number: 35734 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: requirements.txt: Switch to osmocom fork of asn1tools

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35732?usp=email ) Change subject: requirements.txt: Switch to osmocom fork of asn1tools ...................................................................... requirements.txt: Switch to osmocom fork of asn1tools This is sadly required as the Interoperable Profile format must process elements of an ASN.1 sequence in order, which doesn't work if the parser puts the elements in a python dict. The osmocom fork of asn1tools hence uses OrderedDict to work around this problem. Change-Id: Id28fcf060f491bb3d76aa6d8026aa76058edb675 --- M requirements.txt 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/requirements.txt b/requirements.txt index 5b735f0..c12daf8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,6 @@ colorlog pycryptodomex cryptography -asn1tools +git+https://github.com/osmocom/asn1tools packaging git+https://github.com/hologram-io/smpp.pdu -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35732?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id28fcf060f491bb3d76aa6d8026aa76058edb675 Gerrit-Change-Number: 35732 Gerrit-PatchSet: 3 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

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: requirements.txt: Switch to osmocom fork of asn1tools

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35732?usp=email ) Change subject: requirements.txt: Switch to osmocom fork of asn1tools ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35732?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id28fcf060f491bb3d76aa6d8026aa76058edb675 Gerrit-Change-Number: 35732 Gerrit-PatchSet: 3 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-Comment-Date: Mon, 29 Jan 2024 20:11:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: esim.saip: More type annotations

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35735?usp=email ) Change subject: esim.saip: More type annotations ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea Gerrit-Change-Number: 35735 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:11:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in pysim[master]: esim.saip: Move OID to separate sub-module

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35734?usp=email ) Change subject: esim.saip: Move OID to separate sub-module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94f85f2257d4702376f4ba5eb995a544a2e53fd3 Gerrit-Change-Number: 35734 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 20:11:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in ...osmo-epdg[master]: Make Auth Compl procedure more similar to specs

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35698?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Make Auth Compl procedure more similar to specs ...................................................................... Make Auth Compl procedure more similar to specs Properly document our LU Request message matching the 2nd DER in usual 3GPP architecture, which should contain the Auth RES from the MS and be forwarded up to the AAA-Server. In our architecture, the auth is handled earlier, in strongswan (part of ePDG node), hence why our LU Request contains no Auth RES info, and it's only signalled by strongswan to osmo-epdg to signal the auth completed successfuly. Make the handling of LU Req and events triggered by it asynchronous and clean up a bit some related code paths and states. Change-Id: I480c110deeb04abf1ff19147a70e10be9cbafae8 --- M src/aaa_diameter_s6b_cb.erl M src/aaa_diameter_swm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 5 files changed, 109 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/98/35698/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I480c110deeb04abf1ff19147a70e10be9cbafae8 Gerrit-Change-Number: 35698 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[M] Change in ...osmo-epdg[master]: UE-initiated detach: Do STR+STA ePDG<->AAA-Server

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35737?usp=email ) Change subject: UE-initiated detach: Do STR+STA ePDG<->AAA-Server ...................................................................... UE-initiated detach: Do STR+STA ePDG<->AAA-Server Change-Id: I6f7554e24b26bfe191b28b56904bc8432690625d --- M src/aaa_diameter_swm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 3 files changed, 110 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/37/35737/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index f99ae91..a3e5132 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -14,7 +14,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_request/1, auth_compl_request/2]). +-export([auth_request/1, auth_compl_request/2, session_termination_request/1]). -define(SERVER, ?MODULE). @@ -32,6 +32,9 @@ auth_compl_request(Imsi, Apn) -> gen_server:cast(?SERVER, {epdg_auth_compl_req, Imsi, Apn}). +session_termination_request(Imsi) -> + gen_server:cast(?SERVER, {str, Imsi}). + handle_cast({epdg_auth_req, Imsi}, State) -> % request the diameter code for a tuple CKey = [], @@ -54,6 +57,10 @@ end, {noreply, State}; +handle_cast({str, Imsi}, State) -> + ok = epdg_diameter_swm:session_termination_answer(Imsi, 2001), + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 7c2043d..bfb8f2d 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -19,8 +19,8 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([auth_request/1, auth_compl_request/2]). --export([auth_response/2, auth_compl_response/2]). +-export([auth_request/1, auth_compl_request/2, session_termination_request/1]). +-export([auth_response/2, auth_compl_response/2, session_termination_answer/2]). -define(SERVER, ?MODULE). @@ -52,6 +52,15 @@ _ -> Result end. +% 3GPP TS 29.273 7.1.2.3 +session_termination_request(Imsi) -> + Result = gen_server:call(?SERVER, {str, Imsi}), + case Result of + {ok, _Mar} -> + epdg_ue_fsm:received_swm_session_terminate_answer(self(), Result), + ok; + _ -> Result + end. handle_call({epdg_auth_req, Imsi}, {Pid, _Tag} = _From, State0) -> % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: @@ -68,6 +77,17 @@ undefined -> Reply = {error,unknown_imsi} end, + {reply, Reply, State}; + +handle_call({str, Imsi}, _From, State) -> + % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + Reply = aaa_diameter_swm:session_termination_request(Imsi); + undefined -> + Reply = {error,unknown_imsi} + end, {reply, Reply, State}. handle_cast({epdg_auth_resp, Imsi, Result}, State) -> @@ -90,6 +110,16 @@ end, {noreply, State}; +handle_cast({sta, Imsi, Result}, State) -> + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + epdg_ue_fsm:received_swm_session_termination_answer(Sess#swm_session.pid, Result); + undefined -> + error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) + end, + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -116,6 +146,10 @@ auth_compl_response(Imsi, Result) -> ok = gen_server:cast(?SERVER, {epdg_auth_compl_resp, Imsi, Result}). +% Rx SWm Diameter STA: +session_termination_answer(Imsi, Result) -> + ok = gen_server:cast(?SERVER, {sta, Imsi, Result}). + %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 1d934c5..3e9d1be 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -40,13 +40,15 @@ -export([start_link/1]). -export([init/1,callback_mode/0,terminate/3]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). --export([received_swm_auth_response/2, received_swm_auth_compl_response/2]). +-export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2]). --export([state_new/3, state_wait_auth_resp/3, state_authenticating/3, state_authenticated/3, state_wait_delete_session_resp/3]). +-export([state_new/3, state_wait_auth_resp/3, state_authenticating/3, state_authenticated/3, + state_wait_delete_session_resp/3, state_wait_swm_session_termination_answer/3]). -record(ue_fsm_data, { imsi, - apn = "internet" :: string() + apn = "internet" :: string(), + tear_down_gsup_cause = 0 :: integer() }). start_link(Imsi) -> @@ -108,6 +110,15 @@ {error, Err} end. +received_swm_session_termination_answer(Pid, Result) -> + lager:info("ue_fsm received_swm_session_termination_answer ~p~n", [Result]), + try + gen_statem:call(Pid, {received_swm_sta, Result}) + catch + exit:Err -> + {error, Err} + end. + received_gtpc_create_session_response(Pid, Msg) -> lager:info("ue_fsm received_gtpc_create_session_response ~p~n", [Msg]), try @@ -140,12 +151,15 @@ {ok, state_new, Data}. callback_mode() -> - state_functions. + [state_functions, state_enter]. terminate(Reason, State, Data) -> lager:info("terminating ~p with reason ~p state=~p, ~p~n", [?MODULE, Reason, State, Data]), ok. +state_new(enter, _OldState, Data) -> + {keep_state, Data}; + state_new({call, From}, auth_request, Data) -> lager:info("ue_fsm state_new event=auth_request, ~p~n", [Data]), case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi) of @@ -157,6 +171,9 @@ lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), {stop_and_reply, purge_ms_request, Data, [{reply,From,ok}]}. +state_wait_auth_resp(enter, _OldState, Data) -> + {keep_state, Data}; + state_wait_auth_resp({call, From}, {received_swm_auth_response, Auth}, Data) -> lager:info("ue_fsm state_wait_auth_resp event=received_swm_auth_response, ~p~n", [Data]), gsup_server:auth_response(Data#ue_fsm_data.imsi, Auth), @@ -169,6 +186,9 @@ {next_state, state_new, Data, [{reply,From,{error,unknown}}]} end. +state_authenticating(enter, _OldState, Data) -> + {keep_state, Data}; + state_authenticating({call, From}, lu_request, Data) -> lager:info("ue_fsm state_authenticating event=lu_request, ~p~n", [Data]), % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": @@ -191,6 +211,9 @@ gsup_server:lu_response(Data#ue_fsm_data.imsi, Ret), {next_state, state_authenticated, Data, [{reply,From,Ret}]}. +state_authenticated(enter, _OldState, Data) -> + {keep_state, Data}; + state_authenticated({call, From}, tunnel_request, Data) -> lager:info("ue_fsm state_authenticated event=tunnel_request, ~p~n", [Data]), epdg_gtpc_s2b:create_session_req(Data#ue_fsm_data.imsi), @@ -216,6 +239,9 @@ lager:error("ue_fsm state_authenticated: Unexpected cast event, ~p~n", [Data]), {keep_state, Data}. +state_wait_delete_session_resp(enter, _OldState, Data) -> + {keep_state, Data}; + state_wait_delete_session_resp({call, From}, {received_gtpc_delete_session_response, _Resp = #gtp{version = v2, type = delete_session_response, ie = IEs}}, Data) -> lager:info("ue_fsm state_wait_delete_session_resp event=received_gtpc_delete_session_response, ~p~n", [Data]), #{{v2_cause,0} := CauseIE} = IEs, @@ -223,11 +249,35 @@ GsupCause = conv:cause_gtp2gsup(GtpCause), lager:debug("Cause: GTP_atom=~p -> GTP_int=~p -> GSUP_int=~p~n", [CauseIE#v2_cause.v2_cause, GtpCause, GsupCause]), case GsupCause of - 0 -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); - _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, GsupCause}) + 0 -> Data1 = Data; + _ -> Data1 = Data#ue_fsm_data{tear_down_gsup_cause = GsupCause} + end, + {next_state, state_wait_swm_session_termination_answer, Data1, [{reply,From,ok}]}; + +state_wait_delete_session_resp({call, From}, Event, Data) -> + lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), + {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. + +state_wait_swm_session_termination_answer(enter, _OldState, Data) -> + % TODO: Send STR towards AAA-Server + % % 3GPP TS 29.273 7.1.2.3 + lager:info("ue_fsm state_wait_swm_session_termination_answer event=enter, ~p~n", [Data]), + case epdg_diameter_swm:session_termination_request(Data#ue_fsm_data.imsi) of + ok -> {keep_state, Data}; + {error, _Err} -> + gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}), + {keep_state, Data} + end; + +state_wait_swm_session_termination_answer({call, From}, {received_swm_sta, DiaResultCode}, Data) -> + lager:info("ue_fsm state_wait_swm_session_termination_answer event=received_swm_sta, ~p~n", [Data]), + case {DiaResultCode, Data#ue_fsm_data.tear_down_gsup_cause} of + {2001, 0} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, ok); + {2001, _} -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, Data#ue_fsm_data.tear_down_gsup_cause}); + _ -> gsup_server:purge_ms_response(Data#ue_fsm_data.imsi, {error, ?GSUP_CAUSE_NET_FAIL}) end, {keep_state, Data, [{reply,From,ok}]}; -state_wait_delete_session_resp({call, From}, Event, Data) -> +state_wait_swm_session_termination_answer({call, From}, Event, Data) -> lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I6f7554e24b26bfe191b28b56904bc8432690625d Gerrit-Change-Number: 35737 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[M] Change in ...osmo-epdg[master]: Make Auth Compl procedure more similar to specs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35698?usp=email ) Change subject: Make Auth Compl procedure more similar to specs ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I480c110deeb04abf1ff19147a70e10be9cbafae8 Gerrit-Change-Number: 35698 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 29 Jan 2024 11:24:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35736?usp=email ) Change subject: epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface ...................................................................... epdg: expect AAA_server tx SAR against HSS upon AA on s6B interface The AAA-Server informs the HSS when the session is created at the PGW. Change-Id: I1b81f1a2225f54d0f8f679e53d87f342feb495be --- M epdg/EPDG_Tests.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/35736/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 0e9cbed..de5e7a8 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -392,6 +392,10 @@ S6b.send(ts_DIA_S6b_AAR(g_pars.imsi, int2oct(DIA_TS29_373_MIP6_Feature_Vector_GTPv2_SUPPORTED, 8), g_pars.apn, hbh_id := hbh_id, ete_id := ete_id)); + + /* AAR in S6b in AAA-Server triggers Service-Assignment Request/Answer towards HSS: */ + as_DIA_SWx_SA_success(); + alt { [] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {} [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35736?usp=email 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: I1b81f1a2225f54d0f8f679e53d87f342feb495be Gerrit-Change-Number: 35736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: tests/Makefile.am: do not add files to EXTRA_DIST conditionally

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email ) Change subject: tests/Makefile.am: do not add files to EXTRA_DIST conditionally ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > unrelated: maybe it's even possible to add all those files using wildcard expansion like *. […] I don't think so: https://www.gnu.org/software/automake/manual/html_node/Wildcards.html. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Gerrit-Change-Number: 35728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 29 Jan 2024 11:10:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email ) Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > doesn't this need some TODO-RELEASE comment, if we're now depending on some new ABI in libosmo*? Ack, I updated TODO-RELEASE. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 29 Jan 2024 10:07:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus, neels, pespin. Hello Jenkins Builder, fixeria, laforge, lynxis lazus, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields This also makes sure it doesn't compile against older libosmogsm gsup versions which would break ABI. Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Related: OS#6091 Depends: libosmocore.git Change-Id 70be3560659c58f24b8db529c4fc85da4bb0ec04 --- M TODO-RELEASE M include/osmocom/sgsn/gprs_subscriber.h M src/sgsn/gprs_subscriber.c M src/sgsn/sgsn_vty.c M tests/sgsn/sgsn_test.c 5 files changed, 35 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/32/35632/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by laforge

Attention is currently required from: lynxis lazus, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email ) Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: doesn't this need some TODO-RELEASE comment, if we're now depending on some new ABI in libosmo*? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 29 Jan 2024 09:58:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-sgsn[master]: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields

by pespin

Attention is currently required from: laforge, lynxis lazus, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email ) Change subject: gsup: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: ping. More than one week without getting votes to merge. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0d03d368e73ab62ec631420769f6af91f2ff9987 Gerrit-Change-Number: 35632 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 29 Jan 2024 09:41:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: esim.saip: More type annotations

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/+/35735?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: esim.saip: More type annotations ...................................................................... esim.saip: More type annotations Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea --- M pySim/esim/saip/__init__.py 1 file changed, 20 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/35735/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib549817ee137bab610aea9c89a5ab86c2a7592ea Gerrit-Change-Number: 35735 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[L] Change in pysim[master]: add SAIP template handling + v3.1 definitions

by laforge

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: add SAIP template handling + v3.1 definitions ...................................................................... add SAIP template handling + v3.1 definitions This adds classes for describing profile templates as well as derived classes defining the profile templates of the "Profile Interoperability Technical Specification", specifically it's "ANNEX A (Normative): File Structure Templates Definition" We need a machine-readable definition of those templates, so we can fully interpret an unprotected profile package (UPP), as the UPP usually only contains the increment/difference to a given teplate. Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 --- M pySim/esim/saip/oid.py A pySim/esim/saip/templates.py 2 files changed, 699 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/31/35731/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 Gerrit-Change-Number: 35731 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Convert README to README.md and expand like in other projects Let's align with structure and content of README.md in other osmo-* projects. Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c --- M Makefile.am D README A README.md M contrib/osmo-mgw.spec.in 4 files changed, 116 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index e524271..045e74d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = \ .version \ - README \ + README.md \ contrib/osmo-mgw.spec.in \ debian \ git-version-gen \ diff --git a/README b/README deleted file mode 100644 index 29883b8..0000000 --- a/README +++ /dev/null @@ -1,24 +0,0 @@ -About OsmoMGW -============= - -OsmoMGW originated from the OpenBSC project, which started as a minimalistic -all-in-one implementation of the GSM Network. In 2017, OpenBSC had reached -maturity and diversity (including M3UA SIGTRAN and 3G support in the form of -IuCS and IuPS interfaces) that naturally lead to a separation of the all-in-one -approach to fully independent separate programs as in typical GSM networks. - -OsmoMGW was one of the parts split off from the old openbsc.git. It originated -as a solution to merely navigate RTP streams through a NAT, but has since -matured to a Media Gateway implementation that is capable of streaming RTP for -2G (AoIP) and 3G (IuCS) GSM networks as well as (still not implemented at time -of writing) transcoding between TRAU, various RTP payloads and IuUP. - -The OsmoMGW program exposes an MGCP interface towards clients like OsmoMSC and -OsmoBSC, and receives and sends RTP streams as configured via MGCP. - -The libosmo-mgcp-client library exposes utilities used by e.g. OsmoMSC (found -in osmo-msc.git) to instruct OsmoMGW via its MGCP service. - -Find OsmoMGW issue tracker and wiki online at -https://osmocom.org/projects/osmo-mgw -https://osmocom.org/projects/osmo-mgw/wiki diff --git a/README.md b/README.md new file mode 100644 index 0000000..98408c8 --- /dev/null +++ b/README.md @@ -0,0 +1,102 @@ +osmo-mgw - Osmocom MGW (Media GateWay) Implementation +===================================================== + +This repository contains a C-language implementation of an MGW (Media +GateWay) for use [not only] within the 2G (GSM) and/or 3G (UMTS) +Cellular Network built using Osmocom CNI (Cellular Network +Infrastructure) software. + +The OsmoMGW program provides an MGCP interface towards an MGCP call agent +(client) like OsmoMSC and OsmoBSC, and receives and sends RTP streams as +configured via the MGCP control plane. + +This Media Gateway implementation is capable of + +* streaming RTP for 2G (3GPP AoIP and Abis-over-IP) +* streaming RTP for 3G (IuCS including the IuFP protocol) +* TDM (E1/T1) based Abis interface with TRAU frames on 16k sub-slots +* basic support for LCLS (Local Call, Local Switch) related features +* various built-in translation capabilities + * between Abis TRAU frames and RTP formats + * between 2G AMR/RTP and 3G AMR/IuFP/RTP + * between bandwidth-efficient and octet-aligned AMR + * between different standards for encapsulating GSM HR codec frames in RTP + +osmo-mgw is typically co-located with + + * osmo-bsc (GSM BSC) + * osmo-msc (GSM/UMTS MSC) + * osmo-hnbgw (UMTS HNBGW); osmo-mgw implements RTP relay between Iuh + and IuCS interfaces + +The libosmo-mgcp-client library exposes utilities used by e.g. OsmoMSC +(found in osmo-msc.git) to instruct OsmoMGW via its MGCP service. + +Homepage +-------- + +You can find the OsmoMGW issue tracker and wiki online at +<https://osmocom.org/projects/osmo-mgw> and <https://osmocom.org/projects/osmo-mgw/wiki>. + + +GIT Repository +-------------- + +You can clone from the official osmo-mgw.git repository using + + git clone https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw + +There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw> + + +Documentation +------------- + +User Manuals and VTY reference manuals are [optionally] built in PDF form +as part of the build process. + +Pre-rendered PDF version of the current "master" can be found at +[User Manual](https://ftp.osmocom.org/docs/latest/osmomgw-usermanual.pdf) +as well as the [VTY Reference Manual](https://ftp.osmocom.org/docs/latest/osmomgw-vty-reference.pdf) + + +Mailing List +------------ + +Discussions related to osmo-mgw are happening on the +openbsc(a)lists.osmocom.org mailing list, please see +<https://lists.osmocom.org/mailman/listinfo/openbsc> for subscription +options and the list archive. + +Please observe the [Osmocom Mailing List +Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules) +when posting. + + +Contributing +------------ + +Our coding standards are described at +<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards> + +We use a gerrit based patch submission/review process for managing +contributions. Please see +<https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> for +more details + +The current patch queue for osmo-mgw can be seen at +<https://gerrit.osmocom.org/#/q/project:osmo-mgw+status:open> + + +History +------- + +OsmoMGW originated from the OpenBSC project, which started as a minimalistic +all-in-one implementation of the GSM Network. In 2017, OpenBSC had reached +maturity and diversity (including M3UA SIGTRAN and 3G support in the form of +IuCS and IuPS interfaces) that naturally lead to a separation of the all-in-one +approach to fully independent separate programs as in typical GSM networks. + +OsmoMGW was one of the parts split off from the old openbsc.git. It originated +as a solution to merely navigate RTP streams through a NAT, but has since +matured. diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in index fa08acd..a7963a3 100644 --- a/contrib/osmo-mgw.spec.in +++ b/contrib/osmo-mgw.spec.in @@ -99,7 +99,7 @@ %files %license COPYING -%doc AUTHORS README +%doc AUTHORS README.md %dir %{_docdir}/%{name}/examples %dir %{_docdir}/%{name}/examples/osmo-mgw %{_docdir}/%{name}/examples/osmo-mgw/osmo-mgw.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by fixeria

Attention is currently required from: daniel, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:29:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Bump version: 1.5.0.5-aa34 → 1.5.1 Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 --- M debian/changelog M src/Makefile.am 2 files changed, 26 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index bddca01..37f214f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libosmo-abis (1.5.1) unstable; urgency=medium + + [ Harald Welte ] + * dahdi: Log context (e1inpt_ts name) when opening timeslot devices + * dahdi: Fix compilation with ancient DAHDI + + [ Keith ] + * DAHDI: Log hexdump of TX at level DEBUG, not ERROR + + [ Vadim Yanitskiy ] + * trau/osmo_ortp: support building without OrtpMemoryFunctions API + * build: include git-version-gen into the release tarball + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Sun, 28 Jan 2024 18:04:12 +0700 + libosmo-abis (1.5.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/src/Makefile.am b/src/Makefile.am index 67f4383..927d63f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # 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=13:0:0 -TRAU_LIBVERSION=9:0:7 +ABIS_LIBVERSION=13:1:0 +TRAU_LIBVERSION=9:1:7 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by laforge

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 3: (1 comment) File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/f823e5fd_b1b244de PS2, Line 9: MGPC > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:17:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by laforge

Attention is currently required from: daniel, fixeria, pespin. Hello Jenkins Builder, daniel, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email to look at the new patch set (#4). Change subject: Convert README to README.md and expand like in other projects ...................................................................... Convert README to README.md and expand like in other projects Let's align with structure and content of README.md in other osmo-* projects. Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c --- M Makefile.am D README A README.md M contrib/osmo-mgw.spec.in 4 files changed, 116 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/35718/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by laforge

Attention is currently required from: daniel, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 2: (1 comment) File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/23aa6840_99d45423 PS1, Line 9: The OsmoMGW program exposes an MGCP interface towards a MGPC call agent > Ack, I remember discussuing and looking at it previously with Daniel and it seems the sound is the o […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:16:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects

by laforge

Attention is currently required from: daniel, fixeria, laforge. Hello Jenkins Builder, daniel, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Convert README to README.md and expand like in other projects ...................................................................... Convert README to README.md and expand like in other projects Let's align with structure and content of README.md in other osmo-* projects. Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c --- M Makefile.am D README A README.md M contrib/osmo-mgw.spec.in 4 files changed, 116 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/35718/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: Bump version: 1.5.0.5-aa34 → 1.5.1

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35720 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:14:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: fix missing config files in release tarballs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... doc/examples: fix missing config files in release tarballs All config file examples must be listed in EXTRA_DIST unconditionally. Adding them conditionally results in incomplete release tarballs, containing only 'osmo-bts-virtual.cfg' and failing to build. Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Related: OS#6349 --- M doc/examples/Makefile.am 1 file changed, 30 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 25a2151..6a1ae95 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,16 +1,29 @@ -OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg +# all config examples must be listed here unconditionally, so that +# all of them end up in the release tarball (see OS#6349) +EXTRA_DIST = \ + trx/osmo-bts-trx.cfg \ + trx/osmo-bts-trx-calypso.cfg \ + octphy/osmo-bts-trx2dsp1.cfg \ + octphy/osmo-bts-octphy.cfg \ + oc2g/osmo-bts-oc2g.cfg \ + oc2g/oc2gbts-mgr.cfg \ + sysmo/sysmobts-mgr.cfg \ + sysmo/osmo-bts-sysmo.cfg \ + litecell15/osmo-bts-lc15.cfg \ + litecell15/lc15bts-mgr.cfg \ + virtual/osmo-bts-virtual.cfg \ + $(NULL) doc_virtualdir = $(docdir)/examples/osmo-bts-virtual doc_virtual_DATA = \ virtual/osmo-bts-virtual.cfg -EXTRA_DIST = $(doc_virtual_DATA) +OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg if ENABLE_SYSMOBTS doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo doc_sysmo_DATA = \ sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg -EXTRA_DIST += $(doc_sysmo_DATA) OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg sysmo/sysmobts-mgr.cfg endif @@ -19,7 +32,6 @@ doc_trx_DATA = \ trx/osmo-bts-trx.cfg \ trx/osmo-bts-trx-calypso.cfg -EXTRA_DIST += $(doc_trx_DATA) OSMOCONF_FILES += trx/osmo-bts-trx.cfg endif @@ -28,7 +40,6 @@ doc_octphy_DATA = \ octphy/osmo-bts-trx2dsp1.cfg \ octphy/osmo-bts-octphy.cfg -EXTRA_DIST += $(doc_octphy_DATA) OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg endif @@ -37,7 +48,6 @@ doc_lc15_DATA = \ litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg -EXTRA_DIST += $(doc_lc15_DATA) OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif @@ -46,7 +56,6 @@ doc_oc2g_DATA = \ oc2g/osmo-bts-oc2g.cfg \ oc2g/oc2gbts-mgr.cfg -EXTRA_DIST += $(doc_oc2g_DATA) OSMOCONF_FILES += oc2g/osmo-bts-oc2g.cfg oc2g/oc2gbts-mgr.cfg endif -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Gerrit-Change-Number: 35726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: doc/examples: fix missing config files in release tarballs

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Gerrit-Change-Number: 35726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:13:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: doc/examples: fix missing config files in release tarballs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... doc/examples: fix missing config files in release tarballs All config file examples must be listed in EXTRA_DIST unconditionally. Adding them conditionally results in incomplete release tarballs, containing only some '*.cfg' files and failing to build. Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Related: OS#6349 --- M doc/examples/Makefile.am 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 0b06130..ac87457 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,15 @@ +# all config examples must be listed here unconditionally, so that +# all of them end up in the release tarball (see OS#6349) +EXTRA_DIST = \ + osmo-trx-uhd/osmo-trx-limesdr.cfg \ + osmo-trx-uhd/osmo-trx-usrp_b200.cfg \ + osmo-trx-uhd/osmo-trx-uhd.cfg \ + osmo-trx-uhd/osmo-trx-umtrx.cfg \ + osmo-trx-lms/osmo-trx-limesdr.cfg \ + osmo-trx-lms/osmo-trx-lms.cfg \ + osmo-trx-ipc/osmo-trx-ipc.cfg \ + $(NULL) + OSMOCONF_FILES = osmoconfdir = $(sysconfdir)/osmocom @@ -19,7 +31,6 @@ endif osmoconf_DATA = $(OSMOCONF_FILES) -EXTRA_DIST = $(OSMOCONF_FILES) CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 35727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: doc/examples: fix missing config files in release tarballs

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email ) Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 35727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:13:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: tests/Makefile.am: do not add files to EXTRA_DIST conditionally

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email ) Change subject: tests/Makefile.am: do not add files to EXTRA_DIST conditionally ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: unrelated: maybe it's even possible to add all those files using wildcard expansion like *.ok ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f530d6157b00907dd1b438100bb0fb300dfcd22 Gerrit-Change-Number: 35728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:12:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in libosmocore[master]: osmo-release.sh: make it a bit more user friendly

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email ) Change subject: osmo-release.sh: make it a bit more user friendly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8574cb00de820ab477eb5c4abd05d8e546ca89cc Gerrit-Change-Number: 35725 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:11:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in pysim[master]: add SAIP template handling + v3.1 definitions

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35731?usp=email ) Change subject: add SAIP template handling + v3.1 definitions ...................................................................... Patch Set 1: (2 comments) File pySim/esim/saip/templates.py: https://gerrit.osmocom.org/c/pysim/+/35731/comment/340bdd2f_3d7eb992 PS1, Line 23: __init__ > cosmetic: too many params, may of which are optional. I would go for `**kw` here: […] i prefer if i can see the parameters in the method declaration and don't have to read through the body to see what kind of arguments are supported by a given method. https://gerrit.osmocom.org/c/pysim/+/35731/comment/7f39380d_b18f9491 PS1, Line 531: FilesUsimDf5GSv2 > duplicate definition yeah, actually the first definition above is the culprit, it should be FilesUsimDf5GS and this one remains v2. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I79bc0a480450ca2de4b687ba6f11d0a4ea4f14c8 Gerrit-Change-Number: 35731 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 Jan 2024 07:09:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in pysim[master]: esim.saip: Move OID to separate sub-module

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35734?usp=email ) Change subject: esim.saip: Move OID to separate sub-module ...................................................................... esim.saip: Move OID to separate sub-module This helps us to prevent circular imports in follow-up code. Change-Id: I94f85f2257d4702376f4ba5eb995a544a2e53fd3 --- M pySim/esim/saip/__init__.py A pySim/esim/saip/oid.py 2 files changed, 84 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/35734/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 9b182e5..251395f 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -25,63 +25,6 @@ asn1 = compile_asn1_subdir('saip') -class oid: - class OID: - @staticmethod - def intlist_from_str(instr: str) -> List[int]: - return [int(x) for x in instr.split('.')] - - def __init__(self, initializer): - if type(initializer) == str: - self.intlist = self.intlist_from_str(initializer) - else: - self.intlist = initializer - - def __str__(self): - return '.'.join([str(x) for x in self.intlist]) - - def __repr__(self): - return 'OID(%s)' % (str(self)) - - - class eOID(OID): - """OID helper for TCA eUICC prefix""" - __prefix = [2,23,143,1] - def __init__(self, initializer): - if type(initializer) == str: - initializer = self.intlist_from_str(initializer) - super().__init__(self.__prefix + initializer) - - MF = eOID("2.1") - DF_CD = eOID("2.2") - DF_TELECOM = eOID("2.3") - DF_TELECOM_v2 = eOID("2.3.2") - ADF_USIM_by_default = eOID("2.4") - ADF_USIM_by_default_v2 = eOID("2.4.2") - ADF_USIM_not_by_default = eOID("2.5") - ADF_USIM_not_by_default_v2 = eOID("2.5.2") - ADF_USIM_not_by_default_v3 = eOID("2.5.3") - DF_PHONEBOOK_ADF_USIM = eOID("2.6") - DF_GSM_ACCESS_ADF_USIM = eOID("2.7") - ADF_ISIM_by_default = eOID("2.8") - ADF_ISIM_not_by_default = eOID("2.9") - ADF_ISIM_not_by_default_v2 = eOID("2.9.2") - ADF_CSIM_by_default = eOID("2.10") - ADF_CSIM_by_default_v2 = eOID("2.10.2") - ADF_CSIM_not_by_default = eOID("2.11") - ADF_CSIM_not_by_default_v2 = eOID("2.11.2") - DF_EAP = eOID("2.12") - DF_5GS = eOID("2.13") - DF_5GS_v2 = eOID("2.13.2") - DF_5GS_v3 = eOID("2.13.3") - DF_5GS_v4 = eOID("2.13.4") - DF_SAIP = eOID("2.14") - DF_SNPN = eOID("2.15") - DF_5GProSe = eOID("2.16") - IoT_default = eOID("2.17") - IoT_default = eOID("2.18") - - class ProfileElement: def _fixup_sqnInit_dec(self): """asn1tools has a bug when working with SEQUENCE OF that have DEFAULT values. Let's work around diff --git a/pySim/esim/saip/oid.py b/pySim/esim/saip/oid.py new file mode 100644 index 0000000..8b2870e --- /dev/null +++ b/pySim/esim/saip/oid.py @@ -0,0 +1,73 @@ +# Implementation of SimAlliance/TCA Interoperable Profile OIDs +# +# (C) 2023-2024 by Harald Welte <laforge(a)osmocom.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from typing import List, Union + +class OID: + @staticmethod + def intlist_from_str(instr: str) -> List[int]: + return [int(x) for x in instr.split('.')] + + def __init__(self, initializer: Union[List[int], str]): + if type(initializer) == str: + self.intlist = self.intlist_from_str(initializer) + else: + self.intlist = initializer + + def __str__(self) -> str: + return '.'.join([str(x) for x in self.intlist]) + + def __repr__(self) -> str: + return 'OID(%s)' % (str(self)) + + +class eOID(OID): + """OID helper for TCA eUICC prefix""" + __prefix = [2,23,143,1] + def __init__(self, initializer): + if type(initializer) == str: + initializer = self.intlist_from_str(initializer) + super().__init__(self.__prefix + initializer) + +MF = eOID("2.1") +DF_CD = eOID("2.2") +DF_TELECOM = eOID("2.3") +DF_TELECOM_v2 = eOID("2.3.2") +ADF_USIM_by_default = eOID("2.4") +ADF_USIM_by_default_v2 = eOID("2.4.2") +ADF_USIM_not_by_default = eOID("2.5") +ADF_USIM_not_by_default_v2 = eOID("2.5.2") +ADF_USIM_not_by_default_v3 = eOID("2.5.3") +DF_PHONEBOOK_ADF_USIM = eOID("2.6") +DF_GSM_ACCESS_ADF_USIM = eOID("2.7") +ADF_ISIM_by_default = eOID("2.8") +ADF_ISIM_not_by_default = eOID("2.9") +ADF_ISIM_not_by_default_v2 = eOID("2.9.2") +ADF_CSIM_by_default = eOID("2.10") +ADF_CSIM_by_default_v2 = eOID("2.10.2") +ADF_CSIM_not_by_default = eOID("2.11") +ADF_CSIM_not_by_default_v2 = eOID("2.11.2") +DF_EAP = eOID("2.12") +DF_5GS = eOID("2.13") +DF_5GS_v2 = eOID("2.13.2") +DF_5GS_v3 = eOID("2.13.3") +DF_5GS_v4 = eOID("2.13.4") +DF_SAIP = eOID("2.14") +DF_SNPN = eOID("2.15") +DF_5GProSe = eOID("2.16") +IoT_default = eOID("2.17") +IoT_default = eOID("2.18") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94f85f2257d4702376f4ba5eb995a544a2e53fd3 Gerrit-Change-Number: 35734 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

2024

2023

2022

gerrit-log January 2024