- gerrit-log - lists.osmocom.org

Change in osmo-bsc[pespin/1-8-0]: Disable C/I based MS Power Control Loop by default

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26869 ) Change subject: Disable C/I based MS Power Control Loop by default ...................................................................... Disable C/I based MS Power Control Loop by default osmo-trx-uhd with a B200 has proven to provide bad (lower than usually considered good) C/I values due to high noise (even with band filters in place). Hence, default thresholds (gathered from literature on the topic) are too high and end up in bad algorithm output decisions. Furthermore, most users of Osmocom don't use it in densely populated areas, hence RXLEV based algorithm used when C/I based one is disabled is good enough. Let's disable C/I based one by default, and let advanced users which specific needs to enable and confiure thresholds specifically for their needs (hardware, cell surrounding conditions, etc.). Related: SYS#4917 Change-Id: If1a73c60695379bcfcd0f44c6ec6dd659563e279 --- M src/osmo-bsc/gsm_data.c M tests/power_ctrl.vty 2 files changed, 38 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/26869/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 988d70e..38d8a7c 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1200,7 +1200,7 @@ * above the target. */ .ci_fr_meas = { /* FR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ - .enabled = true, + .enabled = false, .lower_thresh = 13, .upper_thresh = 17, @@ -1222,7 +1222,7 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, .ci_hr_meas = { /* HR: Target C/I = 18 dB, Soft blocking threshold = 13 dB */ - .enabled = true, + .enabled = false, .lower_thresh = 16, .upper_thresh = 21, @@ -1244,7 +1244,7 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, .ci_amr_fr_meas = { /* AMR-FR: Target C/I = 9 dB, Soft blocking threshold = 4 dB */ - .enabled = true, + .enabled = false, .lower_thresh = 7, .upper_thresh = 11, @@ -1266,7 +1266,7 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, .ci_amr_hr_meas = { /* AMR-HR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ - .enabled = true, + .enabled = false, .lower_thresh = 13, .upper_thresh = 17, @@ -1288,7 +1288,7 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, .ci_sdcch_meas = { /* SDCCH: Target C/I = 14 dB, Soft blocking threshold = 9 dB */ - .enabled = true, + .enabled = false, .lower_thresh = 12, .upper_thresh = 16, @@ -1310,7 +1310,7 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, .ci_gprs_meas = { /* GPRS: Target C/I = 20 dB, Soft blocking threshold = 15 dB */ - .enabled = true, + .enabled = false, .lower_thresh = 18, .upper_thresh = 24, diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty index 374002d..f0ef46e 100644 --- a/tests/power_ctrl.vty +++ b/tests/power_ctrl.vty @@ -143,22 +143,22 @@ rxlev-thresh-comp lower 10 12 upper 19 20 rxqual-thresh lower 3 upper 0 rxqual-thresh-comp lower 5 7 upper 15 18 - ci-thresh fr-efr enable + ci-thresh fr-efr disable ci-thresh fr-efr lower 13 upper 17 ci-thresh-comp fr-efr lower 5 7 upper 15 18 - ci-thresh hr enable + ci-thresh hr disable ci-thresh hr lower 16 upper 21 ci-thresh-comp hr lower 5 7 upper 15 18 - ci-thresh amr-fr enable + ci-thresh amr-fr disable ci-thresh amr-fr lower 7 upper 11 ci-thresh-comp amr-fr lower 5 7 upper 15 18 - ci-thresh amr-hr enable + ci-thresh amr-hr disable ci-thresh amr-hr lower 13 upper 17 ci-thresh-comp amr-hr lower 5 7 upper 15 18 - ci-thresh sdcch enable + ci-thresh sdcch disable ci-thresh sdcch lower 12 upper 16 ci-thresh-comp sdcch lower 5 7 upper 15 18 - ci-thresh gprs enable + ci-thresh gprs disable ci-thresh gprs lower 18 upper 24 ci-thresh-comp gprs lower 5 7 upper 15 18 ... @@ -304,12 +304,37 @@ rxqual-thresh-comp lower 5 7 upper 15 18 ... -OsmoBSC(config-net-bts)# ### Check 'ci-thresh-comp disable all' works properly: +OsmoBSC(config-net-bts)# ### Check 'ci-thresh-comp (enable|disable) all' works properly: OsmoBSC(config-net-bts)# ms-power-control OsmoBSC(config-ms-power-ctrl)# show running-config ... ms-power-control ... + ci-thresh fr-efr disable + ci-thresh fr-efr lower 13 upper 17 + ci-thresh-comp fr-efr lower 5 7 upper 15 18 + ci-thresh hr disable + ci-thresh hr lower 16 upper 21 + ci-thresh-comp hr lower 5 7 upper 15 18 + ci-thresh amr-fr disable + ci-thresh amr-fr lower 7 upper 11 + ci-thresh-comp amr-fr lower 5 7 upper 15 18 + ci-thresh amr-hr disable + ci-thresh amr-hr lower 13 upper 17 + ci-thresh-comp amr-hr lower 5 7 upper 15 18 + ci-thresh sdcch disable + ci-thresh sdcch lower 12 upper 16 + ci-thresh-comp sdcch lower 5 7 upper 15 18 + ci-thresh gprs disable + ci-thresh gprs lower 18 upper 24 + ci-thresh-comp gprs lower 5 7 upper 15 18 +... + +OsmoBSC(config-ms-power-ctrl)# ci-thresh all enable +OsmoBSC(config-ms-power-ctrl)# show running-config +... + ms-power-control +... ci-thresh fr-efr enable ci-thresh fr-efr lower 13 upper 17 ci-thresh-comp fr-efr lower 5 7 upper 15 18 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: If1a73c60695379bcfcd0f44c6ec6dd659563e279 Gerrit-Change-Number: 26869 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-bsc[pespin/1-8-0]: fix chreq:* counters: typos in chreq:successful_* constants

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26870 ) Change subject: fix chreq:* counters: typos in chreq:successful_* constants ...................................................................... fix chreq:* counters: typos in chreq:successful_* constants Related: SYS#4878 Related: I17a7702b151ac03fd9f7ecd6927ef42133aad953 (osmo-ttcn3-hacks) Change-Id: I1fde77d5d5920093ab037184eb3518876804353d --- M src/osmo-bsc/abis_rsl.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/26870/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 52008a5..81ec980 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2220,25 +2220,25 @@ rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL)); switch (lchan->activate.info.chreq_reason) { case GSM_CHREQ_REASON_EMERG: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_EMERG)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_EMERG)); break; case GSM_CHREQ_REASON_CALL: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_CALL)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_CALL)); break; case GSM_CHREQ_REASON_LOCATION_UPD: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_LOCATION_UPD)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_LOCATION_UPD)); break; case GSM_CHREQ_REASON_PAG: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_PAG)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_PAG)); break; case GSM_CHREQ_REASON_PDCH: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_PDCH)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_PDCH)); break; case GSM_CHREQ_REASON_OTHER: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_OTHER)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_OTHER)); break; default: - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_ATTEMPTED_UNKNOWN)); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_SUCCESSFUL_UNKNOWN)); break; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: I1fde77d5d5920093ab037184eb3518876804353d Gerrit-Change-Number: 26870 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-bsc[pespin/1-8-0]: fix assignment success counters: count *before* cleanup of fsm state

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26871 ) Change subject: fix assignment success counters: count *before* cleanup of fsm state ...................................................................... fix assignment success counters: count *before* cleanup of fsm state Counting the Assignment success after osmo_fsm_inst_term() meant that we were counting a cleared out channel mode, which always yielded signalling mode. Count the Assignment success *before* terminating, so that we correctly count the successful assignment as speech mode. Related: SYS#4878 Related: Icb1386ec2ccd70eb3c026301b9b08ad7177278f7 (osmo-ttcn3-hacks) Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/26871/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 656bd3e..cb3d754 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -287,10 +287,10 @@ conn->user_plane.msc_assigned_rtp_port = conn->assignment.req.msc_rtp_port; } + assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + LOG_ASSIGNMENT(conn, LOGL_DEBUG, "Assignment successful\n"); osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); - - assignment_count_result(CTR_ASSIGNMENT_COMPLETED); } static void assignment_fsm_update_id(struct gsm_subscriber_connection *conn) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 Gerrit-Change-Number: 26871 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-bsc[pespin/1-8-0]: bsc_subscr_conn_fsm: fix crash if !conn

by pespin

Hello osmith, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/26867 to review the following change. Change subject: bsc_subscr_conn_fsm: fix crash if !conn ...................................................................... bsc_subscr_conn_fsm: fix crash if !conn Do not crash in gscon_ensure_mgw_endpoint() if conn is NULL. Related: SYS#5728 Change-Id: Id579243cc9ebbe8f315cd11754166970329dc9cf --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/26867/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index c18079f..2140c9b 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -521,6 +521,11 @@ const char *epname; struct mgcp_client *mgcp_client = NULL; + if (!conn) { + LOG_LCHAN(for_lchan, LOGL_ERROR, "no conn!\n"); + return NULL; + } + if (conn->user_plane.mgw_endpoint) return conn->user_plane.mgw_endpoint; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: Id579243cc9ebbe8f315cd11754166970329dc9cf Gerrit-Change-Number: 26867 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-bsc[pespin/1-8-0]: hodec2: fix segv for inter-BSC ho target

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26868 ) Change subject: hodec2: fix segv for inter-BSC ho target ...................................................................... hodec2: fix segv for inter-BSC ho target Related: OS#5324 SYS#5259 Change-Id: I5a3345ab0005a73597f5c27207480912a2f5aae6 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 30 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/26868/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 6730f26..14bc2d4 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -1027,27 +1027,39 @@ break; } - chan_counts_for_bts(&bts_counts, c->target.bts); - c->target.free_tchf = bts_counts.val[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; - c->target.min_free_tchf = ho_get_hodec2_tchf_min_slots(c->target.bts->ho); - c->target.free_tchh = bts_counts.val[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H]; - c->target.min_free_tchh = ho_get_hodec2_tchh_min_slots(c->target.bts->ho); + /* For inter-BSC handover, the target BTS is in a different BSC and hence NULL here. */ + if (c->target.bts) { + chan_counts_for_bts(&bts_counts, c->target.bts); + c->target.free_tchf = bts_counts.val[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; + c->target.min_free_tchf = ho_get_hodec2_tchf_min_slots(c->target.bts->ho); + c->target.free_tchh = bts_counts.val[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H]; + c->target.min_free_tchh = ho_get_hodec2_tchh_min_slots(c->target.bts->ho); - /* Would the next TCH/F lchan occupy a dynamic timeslot that currently counts for free TCH/H timeslots? */ - next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_F, false); - if (next_lchan && next_lchan->ts->pchan_on_init == GSM_PCHAN_OSMO_DYN) - c->target.next_tchf_reduces_tchh = 2; - else - c->target.next_tchf_reduces_tchh = 0; + /* Would the next TCH/F lchan occupy a dynamic timeslot that currently counts for free TCH/H timeslots? + */ + next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_F, false); + if (next_lchan && next_lchan->ts->pchan_on_init == GSM_PCHAN_OSMO_DYN) + c->target.next_tchf_reduces_tchh = 2; + else + c->target.next_tchf_reduces_tchh = 0; - /* Would the next TCH/H lchan occupy a dynamic timeslot that currently counts for free TCH/F timeslots? - * Note that a dyn TS already in TCH/H mode (half occupied) would not reduce free TCH/F. */ - next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_H, false); - if (next_lchan && next_lchan->ts->pchan_on_init == GSM_PCHAN_OSMO_DYN - && next_lchan->ts->pchan_is != GSM_PCHAN_TCH_H) - c->target.next_tchh_reduces_tchf = 1; - else + /* Would the next TCH/H lchan occupy a dynamic timeslot that currently counts for free TCH/F timeslots? + * Note that a dyn TS already in TCH/H mode (half occupied) would not reduce free TCH/F. */ + next_lchan = lchan_avail_by_type(c->target.bts, GSM_LCHAN_TCH_H, false); + if (next_lchan && next_lchan->ts->pchan_on_init == GSM_PCHAN_OSMO_DYN + && next_lchan->ts->pchan_is != GSM_PCHAN_TCH_H) + c->target.next_tchh_reduces_tchf = 1; + else + c->target.next_tchh_reduces_tchf = 0; + } else { + + c->target.free_tchf = 0; + c->target.min_free_tchf = 0; c->target.next_tchh_reduces_tchf = 0; + c->target.free_tchh = 0; + c->target.min_free_tchh = 0; + c->target.next_tchf_reduces_tchh = 0; + } } /* add candidate for re-assignment within the current cell */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1-8-0 Gerrit-Change-Id: I5a3345ab0005a73597f5c27207480912a2f5aae6 Gerrit-Change-Number: 26868 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in osmo-iuh[master]: iu_helpers: add function ranap_transp_layer_addr_decode2

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26857 ) Change subject: iu_helpers: add function ranap_transp_layer_addr_decode2 ...................................................................... iu_helpers: add function ranap_transp_layer_addr_decode2 Add ranap_transp_layer_addr_decode2 as AF agnostic version of ranap_transp_layer_addr_decode. Change-Id: Ia60e0ab671fc4185815a880377ab88fcf1b30ac9 --- M include/osmocom/ranap/iu_helpers.h M src/iu_helpers.c M src/tests/test-helpers.c M src/tests/test-helpers.ok 4 files changed, 122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/57/26857/1 diff --git a/include/osmocom/ranap/iu_helpers.h b/include/osmocom/ranap/iu_helpers.h index d824646..bf2a580 100644 --- a/include/osmocom/ranap/iu_helpers.h +++ b/include/osmocom/ranap/iu_helpers.h @@ -15,6 +15,8 @@ int ranap_transp_assoc_decode(uint16_t *port, const RANAP_IuTransportAssociation_t *transp_assoc); int ranap_transp_layer_addr_decode(char *addr, unsigned int addr_len, const RANAP_TransportLayerAddress_t *trasp_layer_addr); +int ranap_transp_layer_addr_decode2(struct osmo_sockaddr *addr, bool *uses_x213_nsap, + const RANAP_TransportLayerAddress_t *trasp_layer_addr); RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap); RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei, bool use_x213_nsap); diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 62f5c22..3e73d87 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -126,6 +126,56 @@ return 0; } +/* (same as ranap_transp_layer_addr_decode, but AF agnostic) */ +int ranap_transp_layer_addr_decode2(struct osmo_sockaddr *addr, bool *uses_x213_nsap, + const RANAP_TransportLayerAddress_t * trasp_layer_addr) +{ + unsigned char *buf; + int len; + bool x213_nsap = false; + uint16_t icp; + + buf = trasp_layer_addr->buf; + len = trasp_layer_addr->size; + + memset(addr, 0, sizeof(*addr)); + + if (len == 20 && buf[0] == 0x35) { + /* For an X.213 NSAP encoded address we expect a buffer of ecactly 20 bytes (3 bytes IDP + 17 bytes + * DSP). we also expect AFI = 0x35, which means that two byte IDI and an IP address follows. (see also + * comments in function new_transp_layer_addr below) */ + x213_nsap = true; + icp = osmo_load16be(&buf[1]); + switch (icp) { + case 0x0000: + addr->u.sa.sa_family = AF_INET6; + memcpy(addr->u.sin6.sin6_addr.s6_addr, buf + 3, sizeof(addr->u.sin6.sin6_addr.s6_addr)); + break; + case 0x0001: + addr->u.sa.sa_family = AF_INET; + memcpy((uint8_t *) & addr->u.sin.sin_addr.s_addr, buf + 3, sizeof(addr->u.sin.sin_addr.s_addr)); + break; + default: + return -EINVAL; + } + } else if (len == 4) { + /* A non X.213 NSAP encoded IPv4 address is 4 bytes long */ + addr->u.sa.sa_family = AF_INET; + memcpy((uint8_t *) & addr->u.sin.sin_addr.s_addr, buf, sizeof(addr->u.sin.sin_addr.s_addr)); + } else if (len == 16) { + /* A non X.213 NSAP encoded IPv6 address is 16 bytes long */ + addr->u.sa.sa_family = AF_INET6; + memcpy(addr->u.sin6.sin6_addr.s6_addr, buf + 3, sizeof(addr->u.sin6.sin6_addr.s6_addr)); + } else + return -EINVAL; + + /* In case the caller is interested in the encoding method that was used */ + if (uses_x213_nsap) + *uses_x213_nsap = x213_nsap; + + return 0; +} + static int new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap) { uint8_t *buf; diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index 4ca7334..0715014 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -29,6 +29,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/socket.h> +#include <osmocom/core/sockaddr_str.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/ranap/RANAP_LAI.h> @@ -347,6 +348,65 @@ OSMO_ASSERT(rc == 0); } +void test_ranap_transp_layer_addr_decode2(void) +{ + int rc; + struct osmo_sockaddr addr; + struct osmo_sockaddr_str sockaddr_str; + bool uses_x213_nsap; + RANAP_TransportLayerAddress_t trasp_layer_addr = { 0 }; + uint8_t encoded_ipv4_addr_x213_nsap[] = + { 0x35, 0x00, 0x01, 0x01, 0x02, 0x03, 0x04, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; + uint8_t encoded_ipv4_addr[] = { 0x01, 0x02, 0x03, 0x04 }; + uint8_t encoded_ipv6_addr_x213_nsap[] = + { 0x35, 0x00, 0x00, 0xf1, 0x1f, 0xf2, 0x2f, 0xf3, + 0x3f, 0xf4, 0x4f, 0xf5, 0x5f, 0xf6, 0x6f, 0xf7, + 0x7f, 0xf8, 0x8f, 0x00 }; + uint8_t encoded_ipv6_addr[] = + { 0xf1, 0x1f, 0xf2, 0x2f, 0xf3, 0x3f, 0xf4, 0x4f, + 0xf5, 0x5f, 0xf6, 0x6f, 0xf7, 0x7f, 0xf8, 0x8f }; + + printf("Testing function ranap_transp_layer_addr_decode2()\n"); + + printf(" ipv4, x213_nsap\n"); + trasp_layer_addr.buf = encoded_ipv4_addr_x213_nsap; + trasp_layer_addr.size = sizeof(encoded_ipv4_addr_x213_nsap); + rc = ranap_transp_layer_addr_decode2(&addr, &uses_x213_nsap, &trasp_layer_addr); + OSMO_ASSERT(rc == 0); + memset(&sockaddr_str, 0, sizeof(sockaddr_str)); + osmo_sockaddr_str_from_sockaddr_in(&sockaddr_str, &addr.u.sin); + printf(" addr=%s, af=%i, x213_nsap=%u\n", sockaddr_str.ip, sockaddr_str.af, uses_x213_nsap); + + printf(" ipv4\n"); + trasp_layer_addr.buf = encoded_ipv4_addr; + trasp_layer_addr.size = sizeof(encoded_ipv4_addr); + rc = ranap_transp_layer_addr_decode2(&addr, &uses_x213_nsap, &trasp_layer_addr); + OSMO_ASSERT(rc == 0); + memset(&sockaddr_str, 0, sizeof(sockaddr_str)); + osmo_sockaddr_str_from_sockaddr_in(&sockaddr_str, &addr.u.sin); + printf(" addr=%s, af=%i, x213_nsap=%u\n", sockaddr_str.ip, sockaddr_str.af, uses_x213_nsap); + + printf(" ipv6, x213_nsap\n"); + trasp_layer_addr.buf = encoded_ipv6_addr_x213_nsap; + trasp_layer_addr.size = sizeof(encoded_ipv6_addr_x213_nsap); + rc = ranap_transp_layer_addr_decode2(&addr, &uses_x213_nsap, &trasp_layer_addr); + OSMO_ASSERT(rc == 0); + memset(&sockaddr_str, 0, sizeof(sockaddr_str)); + osmo_sockaddr_str_from_sockaddr_in6(&sockaddr_str, &addr.u.sin6); + printf(" addr=%s, af=%i, x213_nsap=%u\n", sockaddr_str.ip, sockaddr_str.af, uses_x213_nsap); + + printf(" ipv6\n"); + trasp_layer_addr.buf = encoded_ipv6_addr; + trasp_layer_addr.size = sizeof(encoded_ipv6_addr); + rc = ranap_transp_layer_addr_decode2(&addr, &uses_x213_nsap, &trasp_layer_addr); + OSMO_ASSERT(rc == 0); + memset(&sockaddr_str, 0, sizeof(sockaddr_str)); + osmo_sockaddr_str_from_sockaddr_in6(&sockaddr_str, &addr.u.sin6); + printf(" addr=%s, af=%i, x213_nsap=%u\n", sockaddr_str.ip, sockaddr_str.af, uses_x213_nsap); +} + int main(int argc, char **argv) { asn1_xer_print = 0; @@ -360,6 +420,7 @@ test_ranap_new_transp_info_gtp(); test_ranap_new_transp_info_rtp(); test_ranap_transp_layer_addr_decode(); + test_ranap_transp_layer_addr_decode2(); test_common_cleanup(); return 0; diff --git a/src/tests/test-helpers.ok b/src/tests/test-helpers.ok index fe08287..1a6a132 100644 --- a/src/tests/test-helpers.ok +++ b/src/tests/test-helpers.ok @@ -56,3 +56,12 @@ addr=1.2.3.4 ipv4 addr=1.2.3.4 +Testing function ranap_transp_layer_addr_decode2() + ipv4, x213_nsap + addr=1.2.3.4, af=2, x213_nsap=1 + ipv4 + addr=1.2.3.4, af=2, x213_nsap=0 + ipv6, x213_nsap + addr=f11f:f22f:f33f:f44f:f55f:f66f:f77f:f88f, af=10, x213_nsap=1 + ipv6 + addr=2ff3:3ff4:4ff5:5ff6:6ff7:7ff8:8f35:1, af=10, x213_nsap=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia60e0ab671fc4185815a880377ab88fcf1b30ac9 Gerrit-Change-Number: 26857 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
9
0 0

Change in osmo-iuh[master]: add unittest for ranap_transp_layer_addr_decode()

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26856 ) Change subject: add unittest for ranap_transp_layer_addr_decode() ...................................................................... add unittest for ranap_transp_layer_addr_decode() The function ranap_transp_layer_addr_decode() lacks a unit test. Lets add one. Change-Id: I6d7427dc07c858a8dd76c1fb536ec3df3d96f1b1 --- M src/tests/test-helpers.c M src/tests/test-helpers.ok 2 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/26856/1 diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index 96540dc..4ca7334 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -319,6 +319,34 @@ OSMO_ASSERT(tli == NULL); } +void test_ranap_transp_layer_addr_decode(void) +{ + int rc; + char addr[100]; + RANAP_TransportLayerAddress_t trasp_layer_addr = { 0 }; + uint8_t encoded_addr_x213_nsap[] = + { 0x35, 0x00, 0x01, 0x01, 0x02, 0x03, 0x04, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; + uint8_t encoded_addr[] = { 0x01, 0x02, 0x03, 0x04 }; + + printf("Testing function ranap_transp_layer_addr_decode()\n"); + + printf(" ipv4, x213_nsap\n"); + trasp_layer_addr.buf = encoded_addr_x213_nsap; + trasp_layer_addr.size = sizeof(encoded_addr_x213_nsap); + rc = ranap_transp_layer_addr_decode(addr, sizeof(addr), &trasp_layer_addr); + printf(" addr=%s\n", addr); + OSMO_ASSERT(rc == 0); + + printf(" ipv4\n"); + trasp_layer_addr.buf = encoded_addr; + trasp_layer_addr.size = sizeof(encoded_addr); + rc = ranap_transp_layer_addr_decode(addr, sizeof(addr), &trasp_layer_addr); + printf(" addr=%s\n", addr); + OSMO_ASSERT(rc == 0); +} + int main(int argc, char **argv) { asn1_xer_print = 0; @@ -331,6 +359,7 @@ test_ranap_common(); test_ranap_new_transp_info_gtp(); test_ranap_new_transp_info_rtp(); + test_ranap_transp_layer_addr_decode(); test_common_cleanup(); return 0; diff --git a/src/tests/test-helpers.ok b/src/tests/test-helpers.ok index 049fbb4..fe08287 100644 --- a/src/tests/test-helpers.ok +++ b/src/tests/test-helpers.ok @@ -51,3 +51,8 @@ transportLayerAddress = f11ff22ff33ff44ff55ff66ff77ff88f bindingID = 11220000 unsupported address family +Testing function ranap_transp_layer_addr_decode() + ipv4, x213_nsap + addr=1.2.3.4 + ipv4 + addr=1.2.3.4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d7427dc07c858a8dd76c1fb536ec3df3d96f1b1 Gerrit-Change-Number: 26856 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
5
0 0

Change in osmo-iuh[master]: jenkins.sh: osmo-iuh no longer has doc/manuals/ make target

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26866 ) Change subject: jenkins.sh: osmo-iuh no longer has doc/manuals/ make target ...................................................................... jenkins.sh: osmo-iuh no longer has doc/manuals/ make target the doc/manuals directory was dropped together with osmo-hnbgw binary when it was moved to a separate repository recently. Change-Id: Iceefc4e477ab516c5dc08e6c5b859c48d92a1b61 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/66/26866/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a3a3d4a..9ee073d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -62,9 +62,5 @@ $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/doc/manuals" publish -fi - $MAKE $PARALLEL_MAKE maintainer-clean osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iceefc4e477ab516c5dc08e6c5b859c48d92a1b61 Gerrit-Change-Number: 26866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in simtrace2[master]: firmware: add definition for main osc bypass when using external osc

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26861 ) Change subject: firmware: add definition for main osc bypass when using external osc ...................................................................... firmware: add definition for main osc bypass when using external osc Add new board.h definition BOARD_MAINOSC_BYPASS to configure the clock module to use an external oscillator rather than a crystal. The qmod board is one such board. Change-Id: If62f55cd4c8b0cf758534f09d25a9bcb028814a7 --- M firmware/libboard/common/source/board_lowlevel.c M firmware/libboard/qmod/include/board.h 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/61/26861/1 diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index 1ddbcba..a04ce10 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.c @@ -147,7 +147,7 @@ } */ -#ifndef qmod +#ifndef BOARD_MAINOSC_BYPASS /* Initialize main oscillator */ if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) ) { @@ -165,11 +165,11 @@ timeout = 0; while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT)); #else - /* QMOD has external 12MHz clock source */ + /* Board has external clock, not a crystal oscillator */ PIOB->PIO_PDR = (1 << 9); PIOB->PIO_PUDR = (1 << 9); PIOB->PIO_PPDDR = (1 << 9); - PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL; + PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY | CKGR_MOR_MOSCSEL; #endif /* disable the red LED after main clock initialization */ diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index 6d7d4ff..7ea5bd7 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -25,6 +25,8 @@ #define BOARD_MAINOSC 12000000 /** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ #define BOARD_MCK 58000000 // 18.432 * 29 / 6 +/** board has external clock, not crystal */ +#define BOARD_MAINOSC_BYPASS /** MCU pin connected to red LED */ #define PIO_LED_RED PIO_PA17 @@ -35,7 +37,7 @@ /** green LED pin definition */ #define PIN_LED_GREEN {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} /** LEDs pin definition */ -#define PINS_LEDS PIN_LED_RED, PIN_LED_GREEN +#define PINS_LEDS PIN_LED_RED, PIN_LED_GREEN /** index for red LED in LEDs pin definition array */ #define LED_NUM_RED 0 /** index for green LED in LEDs pin definition array */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If62f55cd4c8b0cf758534f09d25a9bcb028814a7 Gerrit-Change-Number: 26861 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in simtrace2[master]: simtrace2-tool: add "modem sim-card (insert|remove)" command

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26863 ) Change subject: simtrace2-tool: add "modem sim-card (insert|remove)" command ...................................................................... simtrace2-tool: add "modem sim-card (insert|remove)" command Add a new command to request that the simtrace2 firmware manipulate the card detect signal, causing the downstream cellular modem to believe that the SIM card has been inserted or removed, respectfully. Change-Id: I8c79eb29379a789d9d0d21495e30d66ddbdfb022 --- M host/src/simtrace2-tool.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/63/26863/1 diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d92638f..eb61ee2 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -65,6 +65,7 @@ printf( "Commands:\n" "\tmodem reset (enable|disable|cycle)\n" "\tmodem sim-switch (local|remote)\n" + "\tmodem sim-card (insert|remove)\n" "\n"); } @@ -167,6 +168,29 @@ return 0; } +/* emulate SIM card insertion / removal from modem */ +static int do_modem_sim_card(int argc, char **argv) +{ + char *command; + if (argc < 1) + return -EINVAL; + command = argv[0]; + argc--; + argv++; + + if (!strcmp(command, "insert")) { + printf("Setting SIM=INSERTED; Modem reset recommended\n"); + return osmo_st2_cardem_request_card_insert(ci, 1); + } else if (!strcmp(command, "remove")) { + printf("Setting SIM=REMOVED; Modem reset recommended\n"); + return osmo_st2_cardem_request_card_insert(ci, 0); + } else { + fprintf(stderr, "Unsupported modem sim-card command: '%s'\n", command); + return -EINVAL; + } + return 0; +} + static int do_subsys_modem(int argc, char **argv) { char *command; @@ -182,6 +206,8 @@ rc = do_modem_reset(argc, argv); } else if (!strcmp(command, "sim-switch")) { rc = do_modem_sim_switch(argc, argv); + } else if (!strcmp(command, "sim-card")) { + rc = do_modem_sim_card(argc, argv); } else { fprintf(stderr, "Unsupported command for subsystem modem: '%s'\n", command); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8c79eb29379a789d9d0d21495e30d66ddbdfb022 Gerrit-Change-Number: 26863 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

2025

2024

2023

2022

gerrit-log