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

[S] Change in osmo-bts[master]: csd_v110: clarify field names in csd_v110_lchan_desc[]

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38816?usp=email ) Change subject: csd_v110: clarify field names in csd_v110_lchan_desc[] ...................................................................... csd_v110: clarify field names in csd_v110_lchan_desc[] A radio-interface block in GSM carries several modified 36-bit or 60-bit V.110 frames. Let's rename the fields to avoid confusion. Change-Id: If97787a64e30ff9b39c26749ba32aed09d3d7983 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c 2 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/16/38816/1 diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index d2a27b3..62058f4 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -6,15 +6,15 @@ struct gsm_lchan; struct csd_v110_lchan_desc { - uint16_t num_blocks; - uint16_t num_bits; - uint8_t ra2_ir; /* intermediate rate (8 or 16 kbit/s) for RA2 step */ + uint16_t num_frames; /* number of V.110 frames in a radio block */ + uint16_t num_frame_bits; /* number of bits in each V.110 frame */ + uint8_t ra2_ir; /* intermediate rate (8 or 16 kbit/s) for RA2 step */ }; extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; #define CSD_V110_NUM_BITS(desc) \ - ((desc)->num_blocks * (desc)->num_bits) + ((desc)->num_frames * (desc)->num_frame_bits) int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len, diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 4d7ee4f..f578d52 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -39,27 +39,27 @@ #if 0 [GSM48_CMODE_DATA_14k5] = { /* TCH/F14.4: 290 bits every 20 ms (14.5 kbit/s) */ - .num_blocks = 1, - .num_bits = 290, + .num_frames = 1, + .num_frame_bits = 290, .ra2_ir = 16, }, #endif [GSM48_CMODE_DATA_12k0] = { /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ - .num_blocks = 4, - .num_bits = 60, + .num_frames = 4, + .num_frame_bits = 60, .ra2_ir = 16, }, [GSM48_CMODE_DATA_6k0] = { /* TCH/[FH]4.8: 2 * 60 bits every 20 ms (6.0 kbit/s) */ - .num_blocks = 2, - .num_bits = 60, + .num_frames = 2, + .num_frame_bits = 60, .ra2_ir = 8, }, [GSM48_CMODE_DATA_3k6] = { /* TCH/[FH]2.4: 2 * 36 bits every 20 ms (3.6 kbit/s) */ - .num_blocks = 2, - .num_bits = 36, + .num_frames = 2, + .num_frame_bits = 36, .ra2_ir = 8, }, }; @@ -88,26 +88,26 @@ OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); desc = &csd_v110_lchan_desc[lchan->tch_mode]; - if (OSMO_UNLIKELY(desc->num_blocks == 0)) + if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; /* handle empty/incomplete Uplink frames gracefully */ if (OSMO_UNLIKELY(data_len < CSD_V110_NUM_BITS(desc))) { /* encode N idle frames as per 3GPP TS 44.021, section 8.1.6 */ memset(&ra_bits[0], 0x01, sizeof(ra_bits)); - for (unsigned int i = 0; i < desc->num_blocks; i++) + for (unsigned int i = 0; i < desc->num_frames; i++) memset(&ra_bits[i * 80], 0x00, 8); /* alignment pattern */ goto ra1_ra2; } /* RA1'/RA1: convert from radio rate to an intermediate data rate */ - for (unsigned int i = 0; i < desc->num_blocks; i++) { + for (unsigned int i = 0; i < desc->num_frames; i++) { struct osmo_v110_decoded_frame df; /* convert a V.110 36-/60-bit frame to a V.110 80-bit frame */ - if (desc->num_bits == 60) + if (desc->num_frame_bits == 60) osmo_csd_12k_6k_decode_frame(&df, &data[i * 60], 60); - else /* desc->num_bits == 36 */ + else /* desc->num_frame_bits == 36 */ osmo_csd_3k6_decode_frame(&df, &data[i * 36], 36); /* E1 .. E3 must set by out-of-band knowledge */ @@ -116,7 +116,7 @@ /* E1: as per 15.1.2, shall be set to 0 (for BSS-MSC) */ df.e_bits[0] = 0; /* E2: 0 for Q1/Q2, 1 for Q3/Q4 */ - if (desc->num_blocks == 4) + if (desc->num_frames == 4) df.e_bits[1] = (i >> 1) & 0x01; else df.e_bits[1] = nt48_half_num; @@ -165,7 +165,7 @@ OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); desc = &csd_v110_lchan_desc[lchan->tch_mode]; - if (OSMO_UNLIKELY(desc->num_blocks == 0)) + if (OSMO_UNLIKELY(desc->num_frames == 0)) return -ENOTSUP; if (OSMO_UNLIKELY(rtp_len != RFC4040_RTP_PLEN)) @@ -178,7 +178,7 @@ osmo_csd_ra2_8k_unpack(&ra_bits[0], &rtp[0], RFC4040_RTP_PLEN); /* RA1'/RA1: convert from an intermediate rate to radio rate */ - for (unsigned int i = 0; i < desc->num_blocks; i++) { + for (unsigned int i = 0; i < desc->num_frames; i++) { struct osmo_v110_decoded_frame df; /* We require our RTP input to consist of aligned V.110 @@ -188,9 +188,9 @@ return -EINVAL; /* convert a V.110 80-bit frame to a V.110 36-/60-bit frame */ osmo_v110_decode_frame(&df, &ra_bits[i * 80], 80); - if (desc->num_bits == 60) + if (desc->num_frame_bits == 60) osmo_csd_12k_6k_encode_frame(&data[i * 60], 60, &df); - else /* desc->num_bits == 36 */ + else /* desc->num_frame_bits == 36 */ osmo_csd_3k6_encode_frame(&data[i * 36], 36, &df); /* save bits E2 & E3 that may be needed for RLP alignment */ align_accum <<= 2; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If97787a64e30ff9b39c26749ba32aed09d3d7983 Gerrit-Change-Number: 38816 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: clarify lchan description for TCH/F14.4

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email ) Change subject: csd_v110: clarify lchan description for TCH/F14.4 ...................................................................... csd_v110: clarify lchan description for TCH/F14.4 According to 3GPP TS 44.021, section 10.3.2, a radio-interface data block for a TCH/F14.4 channel consists of eight 36-bit data frames and two M-bits (290 bits total). Let's fix our definition. Change-Id: I4f11eda98420587efa339484b62f46bf19f78809 Related: OS#6167 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/38817/1 diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index 62058f4..1621c00 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -8,13 +8,14 @@ struct csd_v110_lchan_desc { uint16_t num_frames; /* number of V.110 frames in a radio block */ uint16_t num_frame_bits; /* number of bits in each V.110 frame */ + uint16_t num_other_bits; /* number of other bits (e.g. M-bits for TCH/F14.4) */ uint8_t ra2_ir; /* intermediate rate (8 or 16 kbit/s) for RA2 step */ }; extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; #define CSD_V110_NUM_BITS(desc) \ - ((desc)->num_frames * (desc)->num_frame_bits) + ((desc)->num_frames * (desc)->num_frame_bits + (desc)->num_other_bits) int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len, diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index f578d52..9bbc5fe 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -38,9 +38,10 @@ const struct csd_v110_lchan_desc csd_v110_lchan_desc[256] = { #if 0 [GSM48_CMODE_DATA_14k5] = { - /* TCH/F14.4: 290 bits every 20 ms (14.5 kbit/s) */ - .num_frames = 1, - .num_frame_bits = 290, + /* TCH/F14.4: 8 * 36 + 2 bits every 20 ms (14.5 kbit/s) */ + .num_frames = 8, + .num_frame_bits = 36, /* D-bits */ + .num_other_bits = 2, /* M-bits */ .ra2_ir = 16, }, #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f11eda98420587efa339484b62f46bf19f78809 Gerrit-Change-Number: 38817 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: ipaccess: Replace ipa_msg_push_header() with libosmocore ipa_prepend_...

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38814?usp=email ) Change subject: ipaccess: Replace ipa_msg_push_header() with libosmocore ipa_prepend_header() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Wait, this is public API that is used by some projects like osmo-hlr... Ah I didn't think about that, thanks for noticing. I thought it was a private API. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I59b216c8a5e5a8744d337773ccf6f8d674b9513d Gerrit-Change-Number: 38814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Nov 2024 20:07:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Simplify code after early return if block

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38806?usp=email ) Change subject: ipaccess: Simplify code after early return if block ...................................................................... ipaccess: Simplify code after early return if block Change-Id: I406b4f4e973c9b75b102aea3d6fe6aab73d91185 --- M src/input/ipaccess.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index f89db15..cab812c 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -967,11 +967,12 @@ } msgb_free(msg); return ret; - } else if (link->port == IPA_TCP_PORT_OML) + } + + if (link->port == IPA_TCP_PORT_OML) e1i_ts = e1inp_line_ipa_oml_ts(link->line); else if (link->port == IPA_TCP_PORT_RSL) e1i_ts = e1inp_line_ipa_rsl_ts(link->line, link->ofd->priv_nr - E1INP_SIGN_RSL); - OSMO_ASSERT(e1i_ts != NULL); if (e1i_ts->type == E1INP_TS_TYPE_NONE) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38806?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I406b4f4e973c9b75b102aea3d6fe6aab73d91185 Gerrit-Change-Number: 38806 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: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Fix wrong pointer passed in sign_link_up user callback

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38805?usp=email ) Change subject: ipaccess: Fix wrong pointer passed in sign_link_up user callback ...................................................................... ipaccess: Fix wrong pointer passed in sign_link_up user callback This bug was introduced in Jun 2011, 13 years ago, so probably this code path is not (usually) used at all. The commit introducing the regression changed sign_link_up() first param from msgb to struct ipaccess_unit, but compiler didn't catch it because it's being passed as a void pointer. Fixes: c9c4fd39055ab02c0af59d5519e62edc456e3d0b Related: OS#3622 Change-Id: I8e514360d5ed1c311af97f8fa728a2ff0a027522 --- M src/input/ipaccess.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index da2f04d..f89db15 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -955,9 +955,9 @@ if (ret == 1 && hh->proto == IPAC_PROTO_IPACCESS) { if (msg_type == IPAC_MSGT_ID_GET) { - sign_link = link->line->ops->sign_link_up(msg, - link->line, - link->ofd->priv_nr); + sign_link = link->line->ops->sign_link_up(link->line->ops->cfg.ipa.dev, + link->line, + link->ofd->priv_nr); if (sign_link == NULL) { LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38805?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8e514360d5ed1c311af97f8fa728a2ff0a027522 Gerrit-Change-Number: 38805 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: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email ) Change subject: ipaccess: Use libosmocore API ipa_ccm_send_id_ack() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 18 Nov 2024 20:06:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

7 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_server: add fetch_conn_list/0 for state introspection

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38791?usp=email ) Change subject: sctp_server: add fetch_conn_list/0 for state introspection ...................................................................... sctp_server: add fetch_conn_list/0 for state introspection This API will be used by the upcoming interactive VTY interface. Change-Id: Ia673d6d57bbc3decf2c8038c1ee9573937702520 --- M src/sctp_server.erl 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 68d1799..9b10bbe 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -42,6 +42,7 @@ terminate/2]). -export([start_link/4, send_data/2, + fetch_conn_list/0, shutdown/0]). -include_lib("kernel/include/logger.hrl"). @@ -54,6 +55,13 @@ -type addr_port() :: {inet:ip_address(), inet:port_number()}. +-type conn_info() :: #{pid => pid(), + aid => gen_sctp:assoc_id(), + addr => inet:ip_address(), + port => inet:port_number() + }. + + -record(server_state, {sock :: gen_sctp:sctp_socket(), clients :: dict:dict(), handler :: module(), @@ -80,6 +88,11 @@ gen_server:cast(?MODULE, {?FUNCTION_NAME, Aid, Data}). +-spec fetch_conn_list() -> [conn_info()]. +fetch_conn_list() -> + gen_server:call(?MODULE, ?FUNCTION_NAME). + + shutdown() -> gen_server:stop(?MODULE). @@ -107,6 +120,12 @@ priv = Priv}}. +handle_call(fetch_conn_list, _From, + #server_state{clients = Clients} = S) -> + Reply = lists:map(fun gen_conn_info/1, + dict:to_list(Clients)), + {reply, Reply, S}; + handle_call(Info, From, S) -> ?LOG_ERROR("unknown ~p() from ~p: ~p", [?FUNCTION_NAME, From, Info]), {reply, {error, not_implemented}, S}. @@ -268,4 +287,13 @@ close_conns(_Sock, _Handler, []) -> ok. + +-spec gen_conn_info(tuple()) -> conn_info(). +gen_conn_info({Aid, #client_state{pid = Pid, + addr_port = {Addr, Port}}}) -> + #{pid => Pid, + aid => Aid, + addr => Addr, + port => Port}. + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38791?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia673d6d57bbc3decf2c8038c1ee9573937702520 Gerrit-Change-Number: 38791 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: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: add all-state event handler

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38792?usp=email ) Change subject: sctp_proxy: add all-state event handler ...................................................................... sctp_proxy: add all-state event handler This patch prepares for a follow-up commit adding a request (fetch_info) that must be handled in any state. Change-Id: I7b6acba7dd367fa28db8922a38ac10c00bd479fe --- M src/sctp_proxy.erl 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index fc33f70..b23451f 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -144,8 +144,7 @@ {keep_state, S}; connecting(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% CONNECTED state @@ -198,12 +197,15 @@ [MmeAddr, MmePort, AncData, Data]), {keep_state, S}; -%% Catch-all handler for this state connected(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). +%% Event handler for all states +handle_event(State, Event, EventData, _S) -> + ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), + {keep_state_and_data}. + code_change(_Vsn, State, S, _Extra) -> {ok, State, S}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7b6acba7dd367fa28db8922a38ac10c00bd479fe Gerrit-Change-Number: 38792 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: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: sctp_proxy: add fetch_info/1 for state introspection

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38793?usp=email ) Change subject: sctp_proxy: add fetch_info/1 for state introspection ...................................................................... sctp_proxy: add fetch_info/1 for state introspection This API will be used by the upcoming interactive VTY interface. Change-Id: Ifd495c3b5e6f036fca1fbb2a06330f06ddfbbe61 --- M src/sctp_proxy.erl 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index b23451f..755d2a3 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -45,6 +45,7 @@ -export([start_link/2, start_link/3, send_data/2, + fetch_info/1, shutdown/1]). -include_lib("kernel/include/logger.hrl"). @@ -79,6 +80,11 @@ gen_statem:cast(Pid, {send_data, Data}). +-spec fetch_info(pid()) -> proplists:proplist(). +fetch_info(Pid) -> + gen_statem:call(Pid, ?FUNCTION_NAME). + + -spec shutdown(pid()) -> ok. shutdown(Pid) -> gen_statem:stop(Pid). @@ -202,6 +208,14 @@ %% Event handler for all states +handle_event(State, {call, From}, fetch_info, + #{handler := Pid} = S0) -> + ERABs = s1ap_proxy:fetch_erab_list(Pid), + S1 = maps:with([enb_aid, mme_aid, mme_addr, mme_port], S0), + S2 = S1#{state => State, erab_list => ERABs}, + Reply = proplists:from_map(S2), + {keep_state_and_data, {reply, From, Reply}}; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), {keep_state_and_data}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38793?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ifd495c3b5e6f036fca1fbb2a06330f06ddfbbe61 Gerrit-Change-Number: 38793 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: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: sctp_server: cosmetic: use ?FUNCTION_NAME in send_data/2

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38785?usp=email ) Change subject: sctp_server: cosmetic: use ?FUNCTION_NAME in send_data/2 ...................................................................... sctp_server: cosmetic: use ?FUNCTION_NAME in send_data/2 Change-Id: Ifd646ba1383840f656df5a798299a5ed116731ae --- M src/sctp_server.erl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sctp_server.erl b/src/sctp_server.erl index 9de56f1..0b741ad 100644 --- a/src/sctp_server.erl +++ b/src/sctp_server.erl @@ -75,7 +75,7 @@ send_data(Aid, Data) -> - gen_server:cast(?MODULE, {send_data, Aid, Data}). + gen_server:cast(?MODULE, {?FUNCTION_NAME, Aid, Data}). shutdown() -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ifd646ba1383840f656df5a798299a5ed116731ae Gerrit-Change-Number: 38785 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>

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024