- gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: fixup: mobile: always check return value of tlv_parse()
by fixeria 16 Jan '24

16 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35602?usp=email ) Change subject: fixup: mobile: always check return value of tlv_parse() ...................................................................... fixup: mobile: always check return value of tlv_parse() Fix a regression: check if Location Area Information IE fits. Change-Id: I51e2ae1be1c51a6359f8b0faad56f654251f1413 Fixes: bb0ac02e "mobile: always check return value of tlv_parse()" Fixes: CID#341618 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/02/35602/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index ee457ad..fad475e 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -2613,7 +2613,7 @@ struct tlv_parsed tp; struct msgb *nmsg; - if (payload_len < 0) { + if (payload_len < sizeof(*lai)) { short_read: LOGP(DMM, LOGL_ERROR, "Short read of LOCATION UPDATING ACCEPT message\n"); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35602?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: I51e2ae1be1c51a6359f8b0faad56f654251f1413 Gerrit-Change-Number: 35602 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: mobile: gsm48_mm_data_ind(): check if struct gsm48_hdr fits
by fixeria 16 Jan '24

16 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35601?usp=email ) Change subject: mobile: gsm48_mm_data_ind(): check if struct gsm48_hdr fits ...................................................................... mobile: gsm48_mm_data_ind(): check if struct gsm48_hdr fits A similar check was recently added to gsm48_cc_data_ind(). Change-Id: Ibc5153df41e2c6365a3c65b1906d440a1074514b Related: 273d412a "mobile: gsm48_cc_data_ind(): check if struct gsm48_hdr fits" --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/01/35601/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 16a9b07..ee457ad 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4731,13 +4731,21 @@ struct gsm48_mmlayer *mm = &ms->mmlayer; struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data; uint8_t sapi = rrh->sapi; - struct gsm48_hdr *gh = msgb_l3(msg); - uint8_t pdisc = gh->proto_discr & 0x0f; - uint8_t msg_type = gh->msg_type & 0xbf; + const struct gsm48_hdr *gh = msgb_l3(msg); + uint8_t pdisc, msg_type; int msg_supported = 0; /* determine, if message is supported at all */ uint8_t skip_ind; int i, rc; + if (msgb_l3len(msg) < sizeof(*gh)) { + LOGP(DMM, LOGL_INFO, "%s(): short read of msgb: %s\n", + __func__, msgb_hexdump(msg)); + return -EINVAL; + } + + pdisc = gh->proto_discr & 0x0f; + msg_type = gh->msg_type & 0xbf; + /* 9.2.19 */ if (msg_type == GSM48_MT_MM_NULL) { msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35601?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: Ibc5153df41e2c6365a3c65b1906d440a1074514b Gerrit-Change-Number: 35601 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-e1d[master]: Add command and client function to change transmitted Sa bits
by jolly 16 Jan '24

16 Jan '24

Attention is currently required from: tnt. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/35562?usp=email ) Change subject: Add command and client function to change transmitted Sa bits ...................................................................... Patch Set 3: (1 comment) File src/proto_clnt.c: https://gerrit.osmocom.org/c/osmo-e1d/+/35562/comment/7d08c952_cda276f1 PS3, Line 420: if (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_line_info)) > This looks like a cut and paste error. […] Yes, this is a mess. I will do patches first and do tests before I can provide fixes for that. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35562?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I2608af7bbb8092fddd68d4f3bb36b10a1100ce0f Gerrit-Change-Number: 35562 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 16 Jan 2024 21:00:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 0

[L] Change in osmocom-bb[master]: mobile: init/deinit GAPK I/O based on CC transaction events
by fixeria 16 Jan '24

16 Jan '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35579?usp=email ) Change subject: mobile: init/deinit GAPK I/O based on CC transaction events ...................................................................... Patch Set 2: (1 comment) File src/host/layer23/src/mobile/gapk_io.c: https://gerrit.osmocom.org/c/osmocom-bb/+/35579/comment/195c631e_62570078 PS2, Line 170: static int prepare_audio_source(struct gapk_io_state *state, > this look unrelated, you are simply changing the name of the variable here. […] https://gerrit.osmocom.org/c/osmocom-bb/+/35600 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35579?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: I28f87f6a6de673611aa02a24e8985aee23d4498b Gerrit-Change-Number: 35579 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Jan 2024 20:43:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in osmocom-bb[master]: mobile: init/deinit GAPK I/O based on CC transaction events
by fixeria 16 Jan '24

16 Jan '24

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/35579?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: mobile: init/deinit GAPK I/O based on CC transaction events ...................................................................... mobile: init/deinit GAPK I/O based on CC transaction events Change-Id: I28f87f6a6de673611aa02a24e8985aee23d4498b Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/include/osmocom/bb/mobile/gapk_io.h M src/host/layer23/include/osmocom/bb/mobile/tch.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/tch.c 7 files changed, 265 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/35579/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35579?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: I28f87f6a6de673611aa02a24e8985aee23d4498b Gerrit-Change-Number: 35579 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmocom-bb[master]: mobile: cosmetic: use consistent naming for gapk_io_state
by fixeria 16 Jan '24

16 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35600?usp=email ) Change subject: mobile: cosmetic: use consistent naming for gapk_io_state ...................................................................... mobile: cosmetic: use consistent naming for gapk_io_state Change-Id: I96a995bdf20c95a15271de68fbf434e101047313 Related: OS#4396 --- M src/host/layer23/src/mobile/gapk_io.c 1 file changed, 50 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/00/35600/1 diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c index d6b84a5..9a97639 100644 --- a/src/host/layer23/src/mobile/gapk_io.c +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -104,7 +104,7 @@ * outgoing frames to UL buffer... */ static int pq_queue_tch_fb(struct osmo_gapk_pq *pq, - struct gapk_io_state *io_state, + struct gapk_io_state *state, bool is_src) { struct osmo_gapk_pq_item *item; @@ -124,13 +124,13 @@ item->sub_name = "tch_fb"; /* I/O length */ - frame_len = io_state->phy_fmt_desc->frame_len; + frame_len = state->phy_fmt_desc->frame_len; item->len_in = is_src ? 0 : frame_len; item->len_out = is_src ? frame_len : 0; /* Handler and it's state */ item->proc = is_src ? &pq_queue_tch_fb_recv : &pq_queue_tch_fb_send; - item->state = io_state; + item->state = state; return 0; } @@ -167,7 +167,7 @@ * convert an encoder specific format * to a PHY specific format. */ -static int prepare_audio_source(struct gapk_io_state *gapk_io, +static int prepare_audio_source(struct gapk_io_state *state, const char *alsa_input_dev) { struct osmo_gapk_pq *pq; @@ -187,22 +187,22 @@ goto error; /* Frame encoder */ - rc = osmo_gapk_pq_queue_codec(pq, gapk_io->codec_desc, 1); + rc = osmo_gapk_pq_queue_codec(pq, state->codec_desc, 1); if (rc) goto error; /* Encoder specific format -> canonical */ - rc = pq_queue_codec_fmt_conv(pq, gapk_io->codec_desc, true); + rc = pq_queue_codec_fmt_conv(pq, state->codec_desc, true); if (rc) goto error; /* Canonical -> PHY specific format */ - rc = osmo_gapk_pq_queue_fmt_convert(pq, gapk_io->phy_fmt_desc, 1); + rc = osmo_gapk_pq_queue_fmt_convert(pq, state->phy_fmt_desc, 1); if (rc) goto error; /* TCH frame buffer sink */ - rc = pq_queue_tch_fb(pq, gapk_io, false); + rc = pq_queue_tch_fb(pq, state, false); if (rc) goto error; @@ -217,7 +217,7 @@ goto error; /* Save pointer within MS GAPK state */ - gapk_io->pq_source = pq; + state->pq_source = pq; /* Describe prepared chain */ pq_desc = osmo_gapk_pq_describe(pq); @@ -244,7 +244,7 @@ * A ECU (Error Concealment Unit) block is optionally * added if implemented for a given codec. */ -static int prepare_audio_sink(struct gapk_io_state *gapk_io, +static int prepare_audio_sink(struct gapk_io_state *state, const char *alsa_output_dev) { struct osmo_gapk_pq *pq; @@ -259,25 +259,25 @@ return -ENOMEM; /* TCH frame buffer source */ - rc = pq_queue_tch_fb(pq, gapk_io, true); + rc = pq_queue_tch_fb(pq, state, true); if (rc) goto error; /* PHY specific format -> canonical */ - rc = osmo_gapk_pq_queue_fmt_convert(pq, gapk_io->phy_fmt_desc, 0); + rc = osmo_gapk_pq_queue_fmt_convert(pq, state->phy_fmt_desc, 0); if (rc) goto error; /* Optional ECU (Error Concealment Unit) */ - osmo_gapk_pq_queue_ecu(pq, gapk_io->codec_desc); + osmo_gapk_pq_queue_ecu(pq, state->codec_desc); /* Canonical -> decoder specific format */ - rc = pq_queue_codec_fmt_conv(pq, gapk_io->codec_desc, false); + rc = pq_queue_codec_fmt_conv(pq, state->codec_desc, false); if (rc) goto error; /* Frame decoder */ - rc = osmo_gapk_pq_queue_codec(pq, gapk_io->codec_desc, 0); + rc = osmo_gapk_pq_queue_codec(pq, state->codec_desc, 0); if (rc) goto error; @@ -297,7 +297,7 @@ goto error; /* Save pointer within MS GAPK state */ - gapk_io->pq_sink = pq; + state->pq_sink = pq; /* Describe prepared chain */ pq_desc = osmo_gapk_pq_describe(pq); @@ -392,7 +392,7 @@ const struct osmo_gapk_codec_desc *codec_desc; struct gsm_settings *set = &ms->settings; enum osmo_gapk_format_type phy_fmt; - struct gapk_io_state *gapk_io; + struct gapk_io_state *state; int rc = 0; LOGP(DGAPK, LOGL_NOTICE, "Initialize GAPK I/O\n"); @@ -433,26 +433,26 @@ return -EINVAL; } - gapk_io = talloc_zero(ms, struct gapk_io_state); - if (gapk_io == NULL) { + state = talloc_zero(ms, struct gapk_io_state); + if (state == NULL) { LOGP(DGAPK, LOGL_ERROR, "Failed to allocate memory\n"); return -ENOMEM; } /* Init TCH frame I/O buffers */ - INIT_LLIST_HEAD(&gapk_io->tch_dl_fb); - INIT_LLIST_HEAD(&gapk_io->tch_ul_fb); + INIT_LLIST_HEAD(&state->tch_dl_fb); + INIT_LLIST_HEAD(&state->tch_ul_fb); /* Store the codec / format description */ - gapk_io->codec_desc = codec_desc; - gapk_io->phy_fmt_desc = phy_fmt_desc; + state->codec_desc = codec_desc; + state->phy_fmt_desc = phy_fmt_desc; /* Use gapk_io_state as talloc context for both chains */ - osmo_gapk_set_talloc_ctx(gapk_io); + osmo_gapk_set_talloc_ctx(state); /* Prepare both source and sink chains */ - rc |= prepare_audio_source(gapk_io, set->tch_voice.alsa_input_dev); - rc |= prepare_audio_sink(gapk_io, set->tch_voice.alsa_output_dev); + rc |= prepare_audio_source(state, set->tch_voice.alsa_input_dev); + rc |= prepare_audio_sink(state, set->tch_voice.alsa_output_dev); /* Fall back to ms instance */ osmo_gapk_set_talloc_ctx(ms); @@ -460,20 +460,20 @@ /* If at lease one chain constructor failed */ if (rc) { /* Destroy both audio I/O chains */ - if (gapk_io->pq_source) - osmo_gapk_pq_destroy(gapk_io->pq_source); - if (gapk_io->pq_sink) - osmo_gapk_pq_destroy(gapk_io->pq_sink); + if (state->pq_source) + osmo_gapk_pq_destroy(state->pq_source); + if (state->pq_sink) + osmo_gapk_pq_destroy(state->pq_sink); /* Release the memory and return */ - talloc_free(gapk_io); + talloc_free(state); LOGP(DGAPK, LOGL_ERROR, "Failed to initialize GAPK I/O\n"); return rc; } /* Init pointers */ - ms->gapk_io = gapk_io; + ms->gapk_io = state; LOGP(DGAPK, LOGL_NOTICE, "GAPK I/O initialized for MS '%s', codec '%s'\n", @@ -556,14 +556,14 @@ /* Serves both UL/DL TCH frame I/O buffers */ int gapk_io_serve_ms(struct osmocom_ms *ms) { - struct gapk_io_state *gapk_io = ms->gapk_io; + struct gapk_io_state *state = ms->gapk_io; int work = 0; /** * Make sure we have at least two DL frames * to prevent discontinuous playback. */ - if (gapk_io->tch_dl_fb_len < 2) + if (state->tch_dl_fb_len < 2) return 0; /** @@ -571,22 +571,22 @@ * in DL buffer, put silence frames using the upcoming * ECU (Error Concealment Unit) of libosmocodec. */ - while (!llist_empty(&gapk_io->tch_dl_fb)) { + while (!llist_empty(&state->tch_dl_fb)) { /* Decode and play a received DL TCH frame */ - osmo_gapk_pq_execute(gapk_io->pq_sink); + osmo_gapk_pq_execute(state->pq_sink); /* Record and encode an UL TCH frame back */ - osmo_gapk_pq_execute(gapk_io->pq_source); + osmo_gapk_pq_execute(state->pq_source); work |= 1; } - while (!llist_empty(&gapk_io->tch_ul_fb)) { + while (!llist_empty(&state->tch_ul_fb)) { struct msgb *tch_msg; /* Obtain one TCH frame from the UL buffer */ - tch_msg = msgb_dequeue_count(&gapk_io->tch_ul_fb, - &gapk_io->tch_ul_fb_len); + tch_msg = msgb_dequeue_count(&state->tch_ul_fb, + &state->tch_ul_fb_len); /* Push a voice frame to the lower layers */ tch_send_voice_msg(ms, tch_msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35600?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: I96a995bdf20c95a15271de68fbf434e101047313 Gerrit-Change-Number: 35600 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: isdn: add a lookup table with E1/E2/E3 bits from Table 5/V.110
by fixeria 16 Jan '24

16 Jan '24

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35587?usp=email ) Change subject: isdn: add a lookup table with E1/E2/E3 bits from Table 5/V.110 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Sounds a bit overkill taking into account they could be stored in 1 byte per entry instead of 3, and […] libosmoisdn's V.110 API operates on unpacked bits (each bit represented by a byte), so the new API is consistent with this concept. In osmocom-bb I am using it to initialize E1/E2/E3 bits in a `struct osmo_v110_decoded_frame`. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35587?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: I6d2f8e250df31c233a2741163113dc07515409ae Gerrit-Change-Number: 35587 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Jan 2024 20:03:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: isdn: add a lookup table with E1/E2/E3 bits from Table 5/V.110
by pespin 16 Jan '24

16 Jan '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35587?usp=email ) Change subject: isdn: add a lookup table with E1/E2/E3 bits from Table 5/V.110 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Sounds a bit overkill taking into account they could be stored in 1 byte per entry instead of 3, and the macros could do bitwise operations to compare and set. What do you think? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35587?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: I6d2f8e250df31c233a2741163113dc07515409ae Gerrit-Change-Number: 35587 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Jan 2024 19:50:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-epdg: Update renamed config fields
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35599?usp=email ) Change subject: ttcn3-epdg: Update renamed config fields ...................................................................... ttcn3-epdg: Update renamed config fields The config file fields have been renamed recently, update them. Depends: osmo-epdg.git Change-Id I63fe4c7acc7460575a921b254adf066134c0527f Change-Id: Ic9f2f33b8ffae7b4273e6fac8a42b6e9e1e38ed8 --- M ttcn3-epdg-test/osmo-epdg.config 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/99/35599/1 diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config index 8acdc4f..63a2f26 100644 --- a/ttcn3-epdg-test/osmo-epdg.config +++ b/ttcn3-epdg-test/osmo-epdg.config @@ -7,18 +7,18 @@ {gsup_local_ip, "172.18.10.20"}, {gsup_local_port, 4222}, % Diameter Connection parameters - {diameter_remote_ip, "172.18.10.103"}, - {diameter_remote_port, 3868}, - {diameter_proto, sctp}, - {diameter_connect_timer, 200}, - {diameter_watchdog_timer, 6000}, - {diameter_watchdog_config, + {dia_swx_remote_ip, "172.18.10.103"}, + {dia_swx_remote_port, 3868}, + {dia_swx_proto, sctp}, + {dia_swx_connect_timer, 200}, + {dia_swx_watchdog_timer, 6000}, + {dia_swx_watchdog_config, [{okay, 1}, {suspect, 1}]}, - {vendor_id, 0}, - {origin_host, "epdg.localdomain"}, - {origin_realm, "localdomain"}, - {context_id, "epdg@localdomain"}, + {dia_swx_vendor_id, 0}, + {dia_swx_origin_host, "epdg.localdomain"}, + {dia_swx_origin_realm, "localdomain"}, + {dia_swx_context_id, "epdg@localdomain"}, % Diameter s6b Connection parameters {dia_s6b_local_ip, "172.18.10.20"}, {dia_s6b_local_port, 3869}, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35599?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic9f2f33b8ffae7b4273e6fac8a42b6e9e1e38ed8 Gerrit-Change-Number: 35599 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: swx: Rename diameter related parameters
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35598?usp=email ) Change subject: swx: Rename diameter related parameters ...................................................................... swx: Rename diameter related parameters Change-Id: I63fe4c7acc7460575a921b254adf066134c0527f --- M config/sys.config M src/epdg_diameter_swx.erl 2 files changed, 28 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/98/35598/1 diff --git a/config/sys.config b/config/sys.config index b3ce69f..bffa289 100755 --- a/config/sys.config +++ b/config/sys.config @@ -6,18 +6,18 @@ {gsup_local_ip, "0.0.0.0"}, {gsup_local_port, 4222}, % Diameter SWx Connection parameters - {diameter_remote_ip, "127.0.0.1"}, - {diameter_remote_port, 3868}, - {diameter_proto, sctp}, - {diameter_connect_timer, 30000}, - {diameter_watchdog_timer, 30000}, - {diameter_watchdog_config, + {dia_swx_remote_ip, "127.0.0.1"}, + {dia_swx_remote_port, 3868}, + {dia_swx_proto, sctp}, + {dia_swx_connect_timer, 30000}, + {dia_swx_watchdog_timer, 30000}, + {dia_swx_watchdog_config, [{okay, 3}, {suspect, 1}]}, - {vendor_id, 0}, - {origin_host, "epdg.localdomain"}, - {origin_realm, "localdomain"}, - {context_id, "epdg@localdomain"}, + {dia_swx_vendor_id, 0}, + {dia_swx_origin_host, "epdg.localdomain"}, + {dia_swx_origin_realm, "localdomain"}, + {dia_swx_context_id, "epdg@localdomain"}, % Diameter s6b Connection parameters {dia_s6b_local_ip, "127.0.0.10"}, {dia_s6b_local_port, 3868}, diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index a2a040c..5c2ebca 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -79,9 +79,9 @@ %% supporting multiple Diameter applications may or may not want to %% configure a common callback module on all applications. -define(SERVICE, - [{'Origin-Host', application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)}, - {'Origin-Realm', application:get_env(?ENV_APP_NAME, origin_realm, ?ENV_DEFAULT_ORIG_REALM)}, - {'Vendor-Id', application:get_env(?ENV_APP_NAME, vendor_id, ?ENV_DEFAULT_VENDOR_ID)}, + [{'Origin-Host', application:get_env(?ENV_APP_NAME, dia_swx_origin_host, ?ENV_DEFAULT_ORIG_HOST)}, + {'Origin-Realm', application:get_env(?ENV_APP_NAME, dia_swx_origin_realm, ?ENV_DEFAULT_ORIG_REALM)}, + {'Vendor-Id', application:get_env(?ENV_APP_NAME, dia_swx_vendor_id, ?ENV_DEFAULT_VENDOR_ID)}, {'Vendor-Specific-Application-Id', [#'diameter_base_Vendor-Specific-Application-Id'{ 'Vendor-Id' = ?VENDOR_ID_3GPP, @@ -121,12 +121,12 @@ ok. init(State) -> - Proto = application:get_env(?ENV_APP_NAME, diameter_proto, ?ENV_DEFAULT_DIAMETER_PROTO), - Ip = application:get_env(?ENV_APP_NAME, diameter_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), - Port = application:get_env(?ENV_APP_NAME, diameter_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), - ConnectTimer = application:get_env(?ENV_APP_NAME, diameter_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS), - WatchdogTimer = application:get_env(?ENV_APP_NAME, diameter_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS), - WatchdogConfig = application:get_env(?ENV_APP_NAME, diameter_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG), + Proto = application:get_env(?ENV_APP_NAME, dia_swx_proto, ?ENV_DEFAULT_DIAMETER_PROTO), + Ip = application:get_env(?ENV_APP_NAME, dia_swx_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), + Port = application:get_env(?ENV_APP_NAME, dia_swx_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), + ConnectTimer = application:get_env(?ENV_APP_NAME, dia_swx_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS), + WatchdogTimer = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS), + WatchdogConfig = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG), ok = diameter:start_service(?MODULE, ?SERVICE), % lager:info("DiaServices is ~p~n", [DiaServ]), {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35598?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: I63fe4c7acc7460575a921b254adf066134c0527f Gerrit-Change-Number: 35598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log