- gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: gprs_ns2_sns: improve search for same NS-VC
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39015?usp=email ) Change subject: gprs_ns2_sns: improve search for same NS-VC ...................................................................... gprs_ns2_sns: improve search for same NS-VC Adding a second NS-VC with the same IP+UDP isn't possible, even when the weights are different, because the NS-ALIVE wouldn't work. Also a NS-VC is identified by IP+UDP and not by the weights. IPv6 did this already. Use the same logic for IPv4. Further relax the search of NS-VC when removing NS-VC. Only take care of IP+UDP and ignore signalling weight and data weights. Related: OS#6611 Change-Id: Ibbc1a794a9a9f0ce6e583fd9743e7f02d52a99cf --- M src/gb/gprs_ns2_sns.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/39015/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 6b92370..a17861b 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -501,7 +501,8 @@ { /* check for duplicates */ for (unsigned int i = 0; i < elems->num_ip4; i++) { - if (memcmp(&elems->ip4[i], ip4, sizeof(*ip4))) + if (elems->ip4[i].ip_addr != ip4->ip_addr || + elems->ip4[i].udp_port != ip4->udp_port) continue; return -1; } @@ -520,8 +521,10 @@ unsigned int i; for (i = 0; i < elems->num_ip4; i++) { - if (memcmp(&elems->ip4[i], ip4, sizeof(*ip4))) + if (elems->ip4[i].ip_addr != ip4->ip_addr || + elems->ip4[i].udp_port != ip4->udp_port) continue; + /* all array elements < i remain as they are; all > i are shifted left by one */ memmove(&elems->ip4[i], &elems->ip4[i+1], elems->num_ip4-i-1); elems->num_ip4 -= 1; @@ -574,7 +577,8 @@ unsigned int i; for (i = 0; i < elems->num_ip6; i++) { - if (memcmp(&elems->ip6[i], ip6, sizeof(*ip6))) + if (memcmp(&elems->ip6[i].ip_addr, &ip6->ip_addr, sizeof(ip6->ip_addr)) || + elems->ip6[i].udp_port != ip6->udp_port) continue; /* all array elements < i remain as they are; all > i are shifted left by one */ memmove(&elems->ip6[i], &elems->ip6[i+1], elems->num_ip6-i-1); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39015?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbc1a794a9a9f0ce6e583fd9743e7f02d52a99cf Gerrit-Change-Number: 39015 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmocore[master]: gprs_ns2_sns: fix error cases of SNS_ADD
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39016?usp=email ) Change subject: gprs_ns2_sns: fix error cases of SNS_ADD ...................................................................... gprs_ns2_sns: fix error cases of SNS_ADD When adding a NS-VC fails, the SNS-ACK with failure code should follow, but no second SNS-ACK. Related: OS#6611 Change-Id: I06bc2622f89256d9675e29b49acc7a3e0647eeae --- M src/gb/gprs_ns2_sns.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/39016/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index a17861b..29ccfb0 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1241,7 +1241,7 @@ do_sns_delete(fi, &v4_list[j], NULL); cause = -rc; ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0, NULL, 0); - break; + return; } } } else { /* IPv6 */ @@ -1262,7 +1262,7 @@ do_sns_delete(fi, NULL, &v6_list[j]); cause = -rc; ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0, NULL, 0); - break; + return; } } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06bc2622f89256d9675e29b49acc7a3e0647eeae Gerrit-Change-Number: 39016 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmocore[master]: gprs_ns2_sns: do_sns_add: ensure ip4/ip6 pointer is set
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39013?usp=email ) Change subject: gprs_ns2_sns: do_sns_add: ensure ip4/ip6 pointer is set ...................................................................... gprs_ns2_sns: do_sns_add: ensure ip4/ip6 pointer is set To make clang analyser happy. It is also a good check, to ensure the correct address contains valida data Change-Id: I22c0096dca75bc69cdf396b240ac590d949eeb0a --- M src/gb/gprs_ns2_sns.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/39013/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index dbfc332..de0400f 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -745,12 +745,16 @@ case AF_INET: if (gss->remote.num_ip4 >= gss->num_max_ip4_remote) return -NS_CAUSE_INVAL_NR_NS_VC; + if (!ip4) + return -NS_CAUSE_PROTO_ERR_UNSPEC; /* TODO: log message duplicate */ rc = add_ip4_elem(gss, &gss->remote, ip4); break; case AF_INET6: if (gss->remote.num_ip6 >= gss->num_max_ip6_remote) return -NS_CAUSE_INVAL_NR_NS_VC; + if (!ip6) + return -NS_CAUSE_PROTO_ERR_UNSPEC; /* TODO: log message duplicate */ rc = add_ip6_elem(gss, &gss->remote, ip6); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39013?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I22c0096dca75bc69cdf396b240ac590d949eeb0a Gerrit-Change-Number: 39013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmocore[master]: gprs_ns2_sns: add include osmocom/core/talloc.h
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39012?usp=email ) Change subject: gprs_ns2_sns: add include osmocom/core/talloc.h ...................................................................... gprs_ns2_sns: add include osmocom/core/talloc.h Talloc is directly used, do an explicit include talloc and not depend on a another header to include it. Change-Id: I867c5e3f87efcf5bcc99713a0c1dcaecfc55fcbd --- M src/gb/gprs_ns2_sns.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/39012/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 0afc06e..dbfc332 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -47,6 +47,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> #include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/talloc.h> #include <osmocom/gsm/tlv.h> #include <osmocom/gprs/gprs_msgb.h> #include <osmocom/gprs/gprs_ns2.h> -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39012?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I867c5e3f87efcf5bcc99713a0c1dcaecfc55fcbd Gerrit-Change-Number: 39012 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmocore[master]: gprs_ns2_sns: move the NS-ALIVE PDU of a new NS-VC after the SNS-ACK
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39014?usp=email ) Change subject: gprs_ns2_sns: move the NS-ALIVE PDU of a new NS-VC after the SNS-ACK ...................................................................... gprs_ns2_sns: move the NS-ALIVE PDU of a new NS-VC after the SNS-ACK When adding a new NS-VC after the SNS-CONFIG is done, the new NS-VC would send out a NS-ALIVE before sending out the SNS-ACK towards the remote NSE. This isn't a big issue, because the SNS-ACK can be reordered by the network anyways, but be nice and ensure the order matches the expectation. Related: OS#6611 Change-Id: I6503bbb32b4440eb53f8c9bd03572f4a189f1a86 --- M src/gb/gprs_ns2_sns.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/39014/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index de0400f..6b92370 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -792,8 +792,6 @@ break; } - gprs_ns2_start_alive_all_nsvcs(nse); - return 0; } @@ -1267,6 +1265,8 @@ /* TODO: correct behaviour is to answer to the *same* NSVC from which the SNS_ADD was received */ ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, v4_list, num_v4, v6_list, num_v6); + + gprs_ns2_start_alive_all_nsvcs(gss->nse); } static void ns2_sns_st_configured_delete(struct osmo_fsm_inst *fi, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39014?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6503bbb32b4440eb53f8c9bd03572f4a189f1a86 Gerrit-Change-Number: 39014 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email ) Change subject: PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits ...................................................................... PCU_Tests_SNS: sns_del: check if removed NS-VC still transmits After removing a NS-VC via SNS-DEL, the NS-VC shouldn't receive any further NS PDUs. Related: OS#6611 Change-Id: Ied4367a519cf75291ff8766c9efebb0f8a12b11f --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/39011/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 263e205..5464374 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -324,13 +324,33 @@ } /* Test deleting IP endpoints at runtime */ -testcase TC_sns_del() runs on RAW_Test_CT { +testcase TC_sns_del(integer idx := 0, integer idx_del := 1, float tout := 20.0) runs on RAW_Test_CT { f_sns_bringup_1c1u(); g_handle_rx_alive := true; - f_outgoing_sns_del(idx_del := 1, w_sig := 0, w_user := 1, idx := 0); - /* FIXME: ensure we don't receive anything on just-deleted NS-VC anymore */ - setverdict(pass); + f_outgoing_sns_del(idx_del := idx_del, w_sig := 0, w_user := 1, idx := idx); + g_handle_rx_alive := false; + + /* A small grace period to prevent race conditions */ + timer Tgrace := 1.0; + Tgrace.start; + alt { + [] NSCP[idx_del].receive(t_NS_ALIVE) {} + [] Tgrace.timeout {} + } + + /* Fail on any NS PDUs */ + timer T := tout; + T.start; + alt { + [] ax_rx_fail_on_any_ns(idx_del) { + setverdict(fail, "Received unexpected NS-ALIVE ACK"); + } + [] T.timeout { + setverdict(pass); + } + } + f_clean_ns_codec(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39011?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied4367a519cf75291ff8766c9efebb0f8a12b11f Gerrit-Change-Number: 39011 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: del/change weight: don't fail on NS
by lynxis lazus 03 Dec '24

03 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39010?usp=email ) Change subject: PCU_Tests_SNS: del/change weight: don't fail on NS ...................................................................... PCU_Tests_SNS: del/change weight: don't fail on NS When doing a SNS procedure, ignore NS Alive which are already in the queue or happen direct after. Related: OS#6611 Change-Id: I8088bd8f3b3e37ee79f61e73d2a3e4f73d00c5c1 --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/39010/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index b90fe37..263e205 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -327,6 +327,7 @@ testcase TC_sns_del() runs on RAW_Test_CT { f_sns_bringup_1c1u(); + g_handle_rx_alive := true; f_outgoing_sns_del(idx_del := 1, w_sig := 0, w_user := 1, idx := 0); /* FIXME: ensure we don't receive anything on just-deleted NS-VC anymore */ setverdict(pass); @@ -337,6 +338,7 @@ testcase TC_sns_chg_weight() runs on RAW_Test_CT { f_sns_bringup_1c1u(); + g_handle_rx_alive := true; /* change w_user from 1 to 200 */ f_outgoing_sns_chg_weight(idx_chg := 1, w_sig := 0, w_user := 200, idx := 0); setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39010?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8088bd8f3b3e37ee79f61e73d2a3e4f73d00c5c1 Gerrit-Change-Number: 39010 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-hlr[master]: gsup_client: Add new APIs to avoid users accessing struct fields
by pespin 03 Dec '24

03 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39009?usp=email ) Change subject: gsup_client: Add new APIs to avoid users accessing struct fields ...................................................................... gsup_client: Add new APIs to avoid users accessing struct fields This is a first step towards changing gsup_client implementation to use an osmo_stream_cli instead of libosmo-abis' ipa_client_conn. The libosmo-abis' ipa_client_conn will eventually be deprecated together with all IPA related code in libosmo-abis. In order to be able to make the implementation change, we first need to make sure no users are using the struct fields of gsup_client (this patch); 2nd step will be making the struct private by moving it to a private header; 3rd step will be changing the implementation to use osmo_stream. Related: OS#5896 Change-Id: I401af83232022f1c141eef1f428cbe206a8aaaa2 --- M TODO-RELEASE M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c M src/gsupclient/gsup_client_mux.c M src/remote_hlr.c 5 files changed, 59 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/39009/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..f14e8b5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,6 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-gsup-client new API osmo_gsup_client_{get,set}_data(), + osmo_gsup_client_get_rem_addr(), osmo_gsup_client_get_rem_port(), + osmo_gsup_client_is_connected(), osmo_gsup_client_get_ipaccess_unit() \ No newline at end of file diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index ea66ca1..61cd45d 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -20,6 +20,9 @@ */ #pragma once +#include <stdint.h> +#include <stdbool.h> + #include <osmocom/core/timer.h> #include <osmocom/gsm/oap_client.h> #include <osmocom/gsm/ipa.h> @@ -40,6 +43,7 @@ typedef bool (*osmo_gsup_client_up_down_cb_t)(struct osmo_gsup_client *gsupc, bool up); +/* NOTE: THIS STRUCT IS CONSIDERED PRIVATE, AVOID ACCESSING ITS FIELDS! */ struct osmo_gsup_client { const char *unit_name; /* same as ipa_dev->unit_name, for backwards compat */ @@ -99,3 +103,12 @@ const struct osmo_gsup_message *gsup_msg); struct msgb *osmo_gsup_client_msgb_alloc(void); +void *osmo_gsup_client_get_data(const struct osmo_gsup_client *gsupc); +void osmo_gsup_client_set_data(struct osmo_gsup_client *gsupc, void *data); + +const char *osmo_gsup_client_get_rem_addr(const struct osmo_gsup_client *gsupc); +uint16_t osmo_gsup_client_get_rem_port(const struct osmo_gsup_client *gsupc); + +bool osmo_gsup_client_is_connected(const struct osmo_gsup_client *gsupc); +const struct ipaccess_unit *osmo_gsup_client_get_ipaccess_unit(const struct osmo_gsup_client *gsupc); + diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index 36407d5..eb36e3f 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -448,3 +448,36 @@ { return msgb_alloc_headroom(4000, 64, __func__); } + +void *osmo_gsup_client_get_data(const struct osmo_gsup_client *gsupc) +{ + return gsupc->data; +} + +void osmo_gsup_client_set_data(struct osmo_gsup_client *gsupc, void *data) +{ + gsupc->data = data; +} + +const char *osmo_gsup_client_get_rem_addr(const struct osmo_gsup_client *gsupc) +{ + if (!gsupc->link) + return NULL; + return gsupc->link->addr; +} +uint16_t osmo_gsup_client_get_rem_port(const struct osmo_gsup_client *gsupc) +{ + if (!gsupc->link) + return 0; + return gsupc->link->port; +} + +bool osmo_gsup_client_is_connected(const struct osmo_gsup_client *gsupc) +{ + return gsupc->is_connected; +} + +const struct ipaccess_unit *osmo_gsup_client_get_ipaccess_unit(const struct osmo_gsup_client *gsupc) +{ + return gsupc->ipa_dev; +} diff --git a/src/gsupclient/gsup_client_mux.c b/src/gsupclient/gsup_client_mux.c index 7699ca1..45ebd75 100644 --- a/src/gsupclient/gsup_client_mux.c +++ b/src/gsupclient/gsup_client_mux.c @@ -58,7 +58,7 @@ /* Non-static for unit tests */ int gsup_client_mux_rx(struct osmo_gsup_client *gsup_client, struct msgb *msg) { - struct gsup_client_mux *gcm = gsup_client->data; + struct gsup_client_mux *gcm = osmo_gsup_client_get_data(gsup_client); struct osmo_gsup_message gsup; enum osmo_gsup_message_class message_class; int rc; @@ -115,7 +115,7 @@ &gsup_client_mux_rx, NULL); if (!gcm->gsup_client) return -ENOMEM; - gcm->gsup_client->data = gcm; + osmo_gsup_client_set_data(gcm->gsup_client, gcm); return 0; } @@ -144,14 +144,16 @@ struct osmo_gsup_message *gsup_msg) { const char *local_msc_name; + const struct ipaccess_unit *ipa_dev; if (!gcm) return; if (!gcm->gsup_client) return; - if (!gcm->gsup_client->ipa_dev) + ipa_dev = osmo_gsup_client_get_ipaccess_unit(gcm->gsup_client); + if (!ipa_dev) return; - local_msc_name = gcm->gsup_client->ipa_dev->serno; + local_msc_name = ipa_dev->serno; if (!local_msc_name) return; gsup_msg->source_name = (const uint8_t *) local_msc_name; diff --git a/src/remote_hlr.c b/src/remote_hlr.c index 00bfbb1..93157a3 100644 --- a/src/remote_hlr.c +++ b/src/remote_hlr.c @@ -66,7 +66,7 @@ * The local MSC shall be indicated by gsup.destination_name. */ static int remote_hlr_rx(struct osmo_gsup_client *gsupc, struct msgb *msg) { - struct remote_hlr *rh = gsupc->data; + struct remote_hlr *rh = osmo_gsup_client_get_data(gsupc); struct proxy_subscr proxy_subscr; struct osmo_gsup_message gsup; int rc; @@ -108,7 +108,7 @@ static bool remote_hlr_up_down(struct osmo_gsup_client *gsupc, bool up) { - struct remote_hlr *remote_hlr = gsupc->data; + struct remote_hlr *remote_hlr = osmo_gsup_client_get_data(gsupc); struct remote_hlr_pending_up *p, *n; if (!up) { LOG_REMOTE_HLR(remote_hlr, LOGL_NOTICE, "link to remote HLR is down, removing GSUP client\n"); @@ -127,7 +127,7 @@ bool remote_hlr_is_up(struct remote_hlr *remote_hlr) { - return remote_hlr && remote_hlr->gsupc && remote_hlr->gsupc->is_connected; + return remote_hlr && remote_hlr->gsupc && osmo_gsup_client_is_connected(remote_hlr->gsupc); } struct remote_hlr *remote_hlr_get_or_connect(const struct osmo_sockaddr_str *addr, bool connect, @@ -180,7 +180,7 @@ return NULL; } - rh->gsupc->data = rh; + osmo_gsup_client_set_data(rh->gsupc, rh); llist_add(&rh->entry, &remote_hlrs); add_result_cb: -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39009?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I401af83232022f1c141eef1f428cbe206a8aaaa2 Gerrit-Change-Number: 39009 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: vty: Avoid accessing gsupclient object fields directly
by pespin 03 Dec '24

03 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/39008?usp=email ) Change subject: vty: Avoid accessing gsupclient object fields directly ...................................................................... vty: Avoid accessing gsupclient object fields directly Use new APIs recently added. Change-Id: I7ead95bb86d1ab510090c29390255007923f895f Depends: osmo-hlr.git Change-Id I401af83232022f1c141eef1f428cbe206a8aaaa2 --- M src/libmsc/e_link.c M src/libmsc/gsup_client_mux.c 2 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/39008/1 diff --git a/src/libmsc/e_link.c b/src/libmsc/e_link.c index 5107c22..9a1cde8 100644 --- a/src/libmsc/e_link.c +++ b/src/libmsc/e_link.c @@ -114,10 +114,13 @@ struct vlr_subscr *vsub; const char *local_msc_name = NULL; - if (e->gcm && e->gcm->gsup_client && e->gcm->gsup_client->ipa_dev) { - local_msc_name = e->gcm->gsup_client->ipa_dev->serno; - if (!local_msc_name) - local_msc_name = e->gcm->gsup_client->ipa_dev->unit_name; + if (e->gcm && e->gcm->gsup_client) { + const struct ipaccess_unit *ipa_dev = osmo_gsup_client_get_ipaccess_unit(e->gcm->gsup_client); + if (ipa_dev) { + local_msc_name = ipa_dev->serno; + if (!local_msc_name) + local_msc_name = ipa_dev->unit_name; + } } if (!local_msc_name) { diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c index e27b664..2c4c7fd 100644 --- a/src/libmsc/gsup_client_mux.c +++ b/src/libmsc/gsup_client_mux.c @@ -55,7 +55,7 @@ /* Non-static for unit tests */ int gsup_client_mux_rx(struct osmo_gsup_client *gsup_client, struct msgb *msg) { - struct gsup_client_mux *gcm = gsup_client->data; + struct gsup_client_mux *gcm = osmo_gsup_client_get_data(gsup_client); struct osmo_gsup_message gsup; enum osmo_gsup_message_class message_class; int rc; @@ -112,7 +112,7 @@ &gsup_client_mux_rx, NULL); if (!gcm->gsup_client) return -ENOMEM; - gcm->gsup_client->data = gcm; + osmo_gsup_client_set_data(gcm->gsup_client, gcm); return 0; } @@ -141,14 +141,16 @@ struct osmo_gsup_message *gsup_msg) { const char *local_msc_name; + const struct ipaccess_unit *ipa_dev; if (!gcm) return; if (!gcm->gsup_client) return; - if (!gcm->gsup_client->ipa_dev) + ipa_dev = osmo_gsup_client_get_ipaccess_unit(gcm->gsup_client); + if (!ipa_dev) return; - local_msc_name = gcm->gsup_client->ipa_dev->serno; + local_msc_name = ipa_dev->serno; if (!local_msc_name) return; gsup_msg->source_name = (const uint8_t *) local_msc_name; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39008?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7ead95bb86d1ab510090c29390255007923f895f Gerrit-Change-Number: 39008 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: vty: Avoid accessing gsupclient object fields directly
by pespin 03 Dec '24

03 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39007?usp=email ) Change subject: vty: Avoid accessing gsupclient object fields directly ...................................................................... vty: Avoid accessing gsupclient object fields directly Use new APIs recently added. Depends: osmo-hlr.git Change-Id I401af83232022f1c141eef1f428cbe206a8aaaa2 Change-Id: Ie443ef0bd983635a5b29e434d79b93ef3f7ce370 --- M TODO-RELEASE M src/sgsn/sgsn_vty.c 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/39007/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 261da7b..662cdb5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libgtp >1.12.0 new field dir_tun_flags in struct pdp_t libgtp >1.12.0 gtp_set_cb_update_context_ind(), gtp_update_context_resp() libosmocore >1.10.0 enum gsm48_gprs_ie_mm: GSM48_IE_GMM_UE_NET_CAP, GSM48_IE_GMM_VD_PREF_UE_USAGE +libosmo-gsup-client >1.8.0 osmo_gsup_client_is_connected(), osmo_gsup_client_get_rem_addr(), osmo_gsup_client_get_rem_port() diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index a7e8045..2cb8819 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -670,11 +670,10 @@ SHOW_STR "Display information about the SGSN") { if (sgsn->gsup_client) { - struct ipa_client_conn *link = sgsn->gsup_client->link; - vty_out(vty, - " Remote authorization: %sconnected to %s:%d via GSUP%s", - sgsn->gsup_client->is_connected ? "" : "not ", - link->addr, link->port, + vty_out(vty, " Remote authorization: %sconnected to %s:%d via GSUP%s", + osmo_gsup_client_is_connected(sgsn->gsup_client) ? "" : "not ", + osmo_gsup_client_get_rem_addr(sgsn->gsup_client), + osmo_gsup_client_get_rem_port(sgsn->gsup_client), VTY_NEWLINE); } if (sgsn->gsn) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie443ef0bd983635a5b29e434d79b93ef3f7ce370 Gerrit-Change-Number: 39007 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log