- gerrit-log - lists.osmocom.org

[M] Change in osmo-hnbgw[master]: Convert struct hnbgw_cnpool to be a talloc context

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email ) Change subject: Convert struct hnbgw_cnpool to be a talloc context ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264/comment/c96ce622_5c02f059?u… : PS2, Line 7: Convert struct hnbgw_cnpool to be a talloc context > The motivation is: […] Please move this to the `COMMIT_MSG`. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I62a511e3ea0254d0327f2664d504b9195416bc76 Gerrit-Change-Number: 40264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 07:26:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File include/osmocom/hnbgw/cnlink.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263/comment/605bd622_02101b84?u… : PS2, Line 96: hnbgw_cnlink_term_and_free > Yes because it was missing, and since I'm cleaning up the name of the function I'm also taking the c […] (not willing to block here, but) why not adding it in the patch that actually needs this function... -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 07:25:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Convert struct hnbgw_cnpool to be a talloc context

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email ) Change subject: Convert struct hnbgw_cnpool to be a talloc context ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264/comment/f2d088fc_f6df0b10?u… : PS2, Line 7: Convert struct hnbgw_cnpool to be a talloc context > I would like to see the motivation here in COMMIT_MSG. The motivation is: 1- We currently have some memory corruption somewhere which we need to figure out 2- The previous talloc context hierarchy made no sense, and it was probably a left over of previous states of the code where we didn't have support for several sccp clients, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I62a511e3ea0254d0327f2664d504b9195416bc76 Gerrit-Change-Number: 40264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 May 2025 21:46:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... Patch Set 2: (1 comment) File include/osmocom/hnbgw/cnlink.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263/comment/1cfb267f_e2de404e?u… : PS2, Line 96: hnbgw_cnlink_term_and_free > COMMIT_MSG says adding prefix, but you're also declaring a function here? Yes because it was missing, and since I'm cleaning up the name of the function I'm also taking the chance to add it here. It will be needed in a follow-up patch anyway so it's fine having it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 May 2025 21:44:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[L] Change in osmo-hnbgw[master]: Split cnlink FSM code to its own file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40262?usp=email ) Change subject: Split cnlink FSM code to its own file ...................................................................... Split cnlink FSM code to its own file As usual, it makes it a lot easier to read an FSM by having all of it enclosed in one file. Change-Id: I7e40beb13c2174e01d89915a28395a364709b321 --- M include/osmocom/hnbgw/cnlink.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/cnlink.c A src/osmo-hnbgw/cnlink_fsm.c 4 files changed, 244 insertions(+), 206 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index 9495041..3aeed0b 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -13,19 +13,6 @@ struct hnbgw_cnpool; -struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); - -void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink); - -bool cnlink_is_conn_ready(const struct hnbgw_cnlink *cnlink); -void cnlink_rx_reset_cmd(struct hnbgw_cnlink *cnlink); -void cnlink_rx_reset_ack(struct hnbgw_cnlink *cnlink); -void cnlink_resend_reset(struct hnbgw_cnlink *cnlink); -void cnlink_set_disconnected(struct hnbgw_cnlink *cnlink); - -const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, const RANAP_PagingIEs_t *paging_ies); -struct hnbgw_cnlink *cnlink_find_by_paging_mi(struct hnbgw_cnpool *cnpool, const struct osmo_mobile_identity *mi); - enum hnbgw_cnlink_ctr { /* TODO: basic counters completely missing * ... @@ -105,6 +92,11 @@ struct rate_ctr_group *ctrs; }; +struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); +void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink); +int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink); +int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink); + static inline struct osmo_sccp_instance *cnlink_sccp(const struct hnbgw_cnlink *cnlink) { if (!cnlink) @@ -116,6 +108,18 @@ return osmo_ss7_get_sccp(cnlink->hnbgw_sccp_user->ss7); } +/* cnlink_fsm.c related: */ +extern struct osmo_fsm cnlink_fsm; +bool cnlink_is_conn_ready(const struct hnbgw_cnlink *cnlink); +void cnlink_rx_reset_cmd(struct hnbgw_cnlink *cnlink); +void cnlink_rx_reset_ack(struct hnbgw_cnlink *cnlink); +void cnlink_resend_reset(struct hnbgw_cnlink *cnlink); +void cnlink_set_disconnected(struct hnbgw_cnlink *cnlink); + +/* cnlink_paging.c related: */ +const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, const RANAP_PagingIEs_t *paging_ies); +struct hnbgw_cnlink *cnlink_find_by_paging_mi(struct hnbgw_cnpool *cnpool, const struct osmo_mobile_identity *mi); + #define LOG_CNLINK(CNLINK, SUBSYS, LEVEL, FMT, ARGS...) \ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (CNLINK) ? (CNLINK)->name : "null", ##ARGS) diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index c0798a7..c2ff265 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -46,6 +46,7 @@ context_map_sccp.c \ hnbgw_cn.c \ cnlink.c \ + cnlink_fsm.c \ cnlink_paging.c \ ranap_rab_ass.c \ mgw_fsm.c \ diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 46f53d7..cea2827 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -34,34 +34,6 @@ #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/context_map.h> -static struct osmo_fsm cnlink_fsm; - -enum cnlink_fsm_state { - CNLINK_ST_DISC, - CNLINK_ST_CONN, -}; - -enum cnlink_fsm_event { - CNLINK_EV_RX_RESET, - CNLINK_EV_RX_RESET_ACK, -}; - -static const struct value_string cnlink_fsm_event_names[] = { - OSMO_VALUE_STRING(CNLINK_EV_RX_RESET), - OSMO_VALUE_STRING(CNLINK_EV_RX_RESET_ACK), - {} -}; - -static const struct osmo_tdef_state_timeout cnlink_timeouts[32] = { - [CNLINK_ST_DISC] = { .T = 4 }, -}; - -#define cnlink_fsm_state_chg(FI, STATE) \ - osmo_tdef_fsm_inst_state_chg(FI, STATE, \ - cnlink_timeouts, \ - hnbgw_T_defs, \ - -1) - struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { struct osmo_fsm_inst *fi; @@ -93,8 +65,7 @@ llist_add_tail(&cnlink->entry, &cnpool->cnlinks); LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "allocated\n"); - /* Immediately (1ms) kick off reset sending mechanism */ - osmo_fsm_inst_state_chg_ms(fi, CNLINK_ST_DISC, 1, 0); + cnlink_resend_reset(cnlink); return cnlink; } @@ -123,21 +94,6 @@ talloc_free(cnlink); } -static void link_up(struct hnbgw_cnlink *cnlink) -{ - LOGPFSML(cnlink->fi, LOGL_NOTICE, "link up\n"); -} - -static void link_lost(struct hnbgw_cnlink *cnlink) -{ - struct hnbgw_context_map *map, *map2; - - LOGPFSML(cnlink->fi, LOGL_NOTICE, "link lost\n"); - - llist_for_each_entry_safe(map, map2, &cnlink->map_list, hnbgw_cnlink_entry) - context_map_cnlink_lost(map); -} - static int hnbgw_cnlink_tx_sccp_unitdata_req(struct hnbgw_cnlink *cnlink, struct msgb *msg) { CNLINK_CTR_INC(cnlink, CNLINK_CTR_SCCP_N_UNITDATA_REQ); @@ -146,7 +102,7 @@ msg); } -static void tx_reset(struct hnbgw_cnlink *cnlink) +int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink) { struct msgb *msg; RANAP_Cause_t cause = { @@ -158,7 +114,7 @@ uint8_t plmn_buf[3]; if (!cnlink) - return; + return -1; /* We need to have chosen an SCCP instance, and the remote SCCP address needs to be set. * Only check the remote_addr, allowing use.remote_addr_name to be NULL: if the user has not set an explicit @@ -166,7 +122,7 @@ if (!cnlink->hnbgw_sccp_user || !osmo_sccp_check_addr(&cnlink->remote_addr, OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN)) { LOG_CNLINK(cnlink, DRANAP, LOGL_DEBUG, "not yet configured, not sending RANAP RESET\n"); - return; + return -1; } LOG_CNLINK(cnlink, DRANAP, LOGL_DEBUG, "Tx RANAP RESET to %s %s\n", @@ -200,10 +156,10 @@ msg = ranap_new_msg_reset2(cnlink->pool->domain, &cause, use_grnc_id); CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET); - hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); + return hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); } -static void tx_reset_ack(struct hnbgw_cnlink *cnlink) +int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink) { struct msgb *msg; struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink); @@ -213,7 +169,7 @@ if (!sccp) { LOG_CNLINK(cnlink, DRANAP, LOGL_ERROR, "cannot send RANAP RESET ACK: no CN link\n"); - return; + return -1; } LOG_CNLINK(cnlink, DRANAP, LOGL_NOTICE, "Tx RANAP RESET ACK %s %s --> %s\n", @@ -248,146 +204,5 @@ msg = ranap_new_msg_reset_ack(cnlink->pool->domain, use_grnc_id); CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET_ACK); - hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); + return hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); } - -static void cnlink_disc_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; - if (prev_state == CNLINK_ST_CONN) - link_lost(cnlink); -} - -static void cnlink_disc_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; - switch (event) { - - case CNLINK_EV_RX_RESET: - tx_reset_ack(cnlink); - cnlink_fsm_state_chg(fi, CNLINK_ST_CONN); - break; - - case CNLINK_EV_RX_RESET_ACK: - cnlink_fsm_state_chg(fi, CNLINK_ST_CONN); - break; - - default: - OSMO_ASSERT(false); - } -} - -static void cnlink_conn_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; - if (prev_state != CNLINK_ST_CONN) - link_up(cnlink); -} - -static void cnlink_conn_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; - - switch (event) { - - case CNLINK_EV_RX_RESET: - /* We were connected, but the remote side has restarted. */ - link_lost(cnlink); - tx_reset_ack(cnlink); - link_up(cnlink); - break; - - case CNLINK_EV_RX_RESET_ACK: - LOGPFSML(fi, LOGL_INFO, "Link is already up, ignoring RESET ACK\n"); - break; - - default: - OSMO_ASSERT(false); - } -} - -static int cnlink_fsm_timer_cb(struct osmo_fsm_inst *fi) -{ - struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; - - tx_reset(cnlink); - - /* (re-)enter disconnect state to resend RESET after timeout. */ - cnlink_fsm_state_chg(fi, CNLINK_ST_DISC); - - /* Return 0 to not terminate the fsm */ - return 0; -} - -#define S(x) (1 << (x)) - -static struct osmo_fsm_state cnlink_fsm_states[] = { - [CNLINK_ST_DISC] = { - .name = "DISCONNECTED", - .in_event_mask = 0 - | S(CNLINK_EV_RX_RESET) - | S(CNLINK_EV_RX_RESET_ACK) - , - .out_state_mask = 0 - | S(CNLINK_ST_DISC) - | S(CNLINK_ST_CONN) - , - .onenter = cnlink_disc_onenter, - .action = cnlink_disc_action, - }, - [CNLINK_ST_CONN] = { - .name = "CONNECTED", - .in_event_mask = 0 - | S(CNLINK_EV_RX_RESET) - | S(CNLINK_EV_RX_RESET_ACK) - , - .out_state_mask = 0 - | S(CNLINK_ST_DISC) - | S(CNLINK_ST_CONN) - , - .onenter = cnlink_conn_onenter, - .action = cnlink_conn_action, - }, -}; - -static struct osmo_fsm cnlink_fsm = { - .name = "cnlink", - .states = cnlink_fsm_states, - .num_states = ARRAY_SIZE(cnlink_fsm_states), - .log_subsys = DRANAP, - .timer_cb = cnlink_fsm_timer_cb, - .event_names = cnlink_fsm_event_names, -}; - -bool cnlink_is_conn_ready(const struct hnbgw_cnlink *cnlink) -{ - return cnlink->fi->state == CNLINK_ST_CONN; -} - -void cnlink_resend_reset(struct hnbgw_cnlink *cnlink) -{ - /* Immediately (1ms) kick off reset sending mechanism */ - osmo_fsm_inst_state_chg_ms(cnlink->fi, CNLINK_ST_DISC, 1, 0); -} - -void cnlink_set_disconnected(struct hnbgw_cnlink *cnlink) -{ - /* Go to disconnected state, with the normal RESET timeout to re-send RESET. */ - cnlink_fsm_state_chg(cnlink->fi, CNLINK_ST_DISC); -} - -static __attribute__((constructor)) void cnlink_fsm_init(void) -{ - OSMO_ASSERT(osmo_fsm_register(&cnlink_fsm) == 0); -} - -void cnlink_rx_reset_cmd(struct hnbgw_cnlink *cnlink) -{ - osmo_fsm_inst_dispatch(cnlink->fi, CNLINK_EV_RX_RESET, NULL); -} - -void cnlink_rx_reset_ack(struct hnbgw_cnlink *cnlink) -{ - osmo_fsm_inst_dispatch(cnlink->fi, CNLINK_EV_RX_RESET_ACK, NULL); -} - diff --git a/src/osmo-hnbgw/cnlink_fsm.c b/src/osmo-hnbgw/cnlink_fsm.c new file mode 100644 index 0000000..acfbae4 --- /dev/null +++ b/src/osmo-hnbgw/cnlink_fsm.c @@ -0,0 +1,218 @@ +/* (C) 2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/fsm.h> +#include <osmocom/core/tdef.h> + +#include <osmocom/gsm/gsm23236.h> + +#include <osmocom/sigtran/sccp_helpers.h> + +#include <asn1c/asn1helpers.h> +#include <osmocom/ranap/ranap_ies_defs.h> +#include <osmocom/ranap/ranap_msg_factory.h> + +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/hnbgw_cn.h> +#include <osmocom/hnbgw/tdefs.h> +#include <osmocom/hnbgw/context_map.h> + +enum cnlink_fsm_state { + CNLINK_ST_DISC, + CNLINK_ST_CONN, +}; + +enum cnlink_fsm_event { + CNLINK_EV_RX_RESET, + CNLINK_EV_RX_RESET_ACK, +}; + +static const struct value_string cnlink_fsm_event_names[] = { + OSMO_VALUE_STRING(CNLINK_EV_RX_RESET), + OSMO_VALUE_STRING(CNLINK_EV_RX_RESET_ACK), + {} +}; + +static const struct osmo_tdef_state_timeout cnlink_timeouts[32] = { + [CNLINK_ST_DISC] = { .T = 4 }, +}; + +#define cnlink_fsm_state_chg(FI, STATE) \ + osmo_tdef_fsm_inst_state_chg(FI, STATE, \ + cnlink_timeouts, \ + hnbgw_T_defs, \ + -1) + +static void link_up(struct hnbgw_cnlink *cnlink) +{ + LOGPFSML(cnlink->fi, LOGL_NOTICE, "link up\n"); +} + +static void link_lost(struct hnbgw_cnlink *cnlink) +{ + struct hnbgw_context_map *map, *map2; + + LOGPFSML(cnlink->fi, LOGL_NOTICE, "link lost\n"); + + llist_for_each_entry_safe(map, map2, &cnlink->map_list, hnbgw_cnlink_entry) + context_map_cnlink_lost(map); +} + + +static void cnlink_disc_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; + if (prev_state == CNLINK_ST_CONN) + link_lost(cnlink); +} + +static void cnlink_disc_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; + switch (event) { + + case CNLINK_EV_RX_RESET: + hnbgw_cnlink_tx_ranap_reset_ack(cnlink); + cnlink_fsm_state_chg(fi, CNLINK_ST_CONN); + break; + + case CNLINK_EV_RX_RESET_ACK: + cnlink_fsm_state_chg(fi, CNLINK_ST_CONN); + break; + + default: + OSMO_ASSERT(false); + } +} + +static void cnlink_conn_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; + if (prev_state != CNLINK_ST_CONN) + link_up(cnlink); +} + +static void cnlink_conn_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; + + switch (event) { + + case CNLINK_EV_RX_RESET: + /* We were connected, but the remote side has restarted. */ + link_lost(cnlink); + hnbgw_cnlink_tx_ranap_reset_ack(cnlink); + link_up(cnlink); + break; + + case CNLINK_EV_RX_RESET_ACK: + LOGPFSML(fi, LOGL_INFO, "Link is already up, ignoring RESET ACK\n"); + break; + + default: + OSMO_ASSERT(false); + } +} + +static int cnlink_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + struct hnbgw_cnlink *cnlink = (struct hnbgw_cnlink *)fi->priv; + + hnbgw_cnlink_tx_ranap_reset(cnlink); + + /* (re-)enter disconnect state to resend RESET after timeout. */ + cnlink_fsm_state_chg(fi, CNLINK_ST_DISC); + + /* Return 0 to not terminate the fsm */ + return 0; +} + +#define S(x) (1 << (x)) + +static struct osmo_fsm_state cnlink_fsm_states[] = { + [CNLINK_ST_DISC] = { + .name = "DISCONNECTED", + .in_event_mask = 0 + | S(CNLINK_EV_RX_RESET) + | S(CNLINK_EV_RX_RESET_ACK) + , + .out_state_mask = 0 + | S(CNLINK_ST_DISC) + | S(CNLINK_ST_CONN) + , + .onenter = cnlink_disc_onenter, + .action = cnlink_disc_action, + }, + [CNLINK_ST_CONN] = { + .name = "CONNECTED", + .in_event_mask = 0 + | S(CNLINK_EV_RX_RESET) + | S(CNLINK_EV_RX_RESET_ACK) + , + .out_state_mask = 0 + | S(CNLINK_ST_DISC) + | S(CNLINK_ST_CONN) + , + .onenter = cnlink_conn_onenter, + .action = cnlink_conn_action, + }, +}; + +struct osmo_fsm cnlink_fsm = { + .name = "cnlink", + .states = cnlink_fsm_states, + .num_states = ARRAY_SIZE(cnlink_fsm_states), + .log_subsys = DRANAP, + .timer_cb = cnlink_fsm_timer_cb, + .event_names = cnlink_fsm_event_names, +}; + +bool cnlink_is_conn_ready(const struct hnbgw_cnlink *cnlink) +{ + return cnlink->fi->state == CNLINK_ST_CONN; +} + +void cnlink_resend_reset(struct hnbgw_cnlink *cnlink) +{ + /* Immediately (1ms) kick off reset sending mechanism */ + osmo_fsm_inst_state_chg_ms(cnlink->fi, CNLINK_ST_DISC, 1, 0); +} + +void cnlink_set_disconnected(struct hnbgw_cnlink *cnlink) +{ + /* Go to disconnected state, with the normal RESET timeout to re-send RESET. */ + cnlink_fsm_state_chg(cnlink->fi, CNLINK_ST_DISC); +} + +static __attribute__((constructor)) void cnlink_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&cnlink_fsm) == 0); +} + +void cnlink_rx_reset_cmd(struct hnbgw_cnlink *cnlink) +{ + osmo_fsm_inst_dispatch(cnlink->fi, CNLINK_EV_RX_RESET, NULL); +} + +void cnlink_rx_reset_ack(struct hnbgw_cnlink *cnlink) +{ + osmo_fsm_inst_dispatch(cnlink->fi, CNLINK_EV_RX_RESET_ACK, NULL); +} + -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7e40beb13c2174e01d89915a28395a364709b321 Gerrit-Change-Number: 40262 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Convert struct hnbgw_cnpool to be a talloc context

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email ) Change subject: Convert struct hnbgw_cnpool to be a talloc context ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264/comment/b9937e6d_d7ea0983?u… : PS2, Line 7: Convert struct hnbgw_cnpool to be a talloc context I would like to see the motivation here in COMMIT_MSG. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I62a511e3ea0254d0327f2664d504b9195416bc76 Gerrit-Change-Number: 40264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 May 2025 19:32:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... Patch Set 2: (1 comment) File include/osmocom/hnbgw/cnlink.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263/comment/86d8651c_a8147ec0?u… : PS2, Line 96: hnbgw_cnlink_term_and_free COMMIT_MSG says adding prefix, but you're also declaring a function here? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 May 2025 19:28:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 3 weeks

1
0
0 0

[L] Change in osmo-hnbgw[master]: Split cnlink FSM code to its own file

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40262?usp=email ) Change subject: Split cnlink FSM code to its own file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7e40beb13c2174e01d89915a28395a364709b321 Gerrit-Change-Number: 40262 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 11 May 2025 19:26:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in ...osmo-epdg[master]: Enable the use of an UE requested IP type and address to be used for ...

by fixeria

Attention is currently required from: clufn. fixeria has posted comments on this change by clufn. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email ) Change subject: Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 Gerrit-Change-Number: 40277 Gerrit-PatchSet: 1 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Comment-Date: Sun, 11 May 2025 06:24:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in ...osmo-epdg[master]: Enable the use of an UE requested IP type and address to be used for ...

by clufn

clufn has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email ) Change subject: Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation ...................................................................... Enable the use of an UE requested IP type and address to be used for gtpv2 PDN Address Allocation Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 --- M src/conv.erl M src/epdg_gtpc_s2b.erl M src/epdg_ue_fsm.erl M src/gsup_server.erl 4 files changed, 43 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/77/40277/1 diff --git a/src/conv.erl b/src/conv.erl index 5832c64..d2a54ab 100644 --- a/src/conv.erl +++ b/src/conv.erl @@ -41,7 +41,7 @@ -export([ip_to_bin/1, bin_to_ip/1]). -export([cause_gtp2gsup/1]). -export([dia_rc_success/1, dia_rc_to_gsup_cause/1]). --export([gtp2_paa_to_epdg_eua/1, epdg_eua_to_gsup_pdp_address/1]). +-export([gtp2_paa_to_epdg_eua/1, pdp_address_to_gtp2_paa/2, epdg_eua_to_gsup_pdp_address/1]). -export([nai_to_imsi/1]). % ergw_aaa/src/ergw_aaa_3gpp_dict.erl @@ -62,6 +62,9 @@ bin_to_ip({_, _, _, _, _, _, _, _} = IP) -> IP. +%% Add "IPv6 Prefix Length" to PAA (3GPP TS 29.274 Table 8.14). +add_v6_prefix_len_byte(<< IPv6:16/binary >>) -> << 8, IPv6/binary >>. + %% Remove "IPv6 Prefix Length" from PAA (3GPP TS 29.274 Table 8.14). remove_v6_prefix_len_byte(<<_:8, Rest/binary>>) -> Rest. @@ -129,6 +132,13 @@ ipv4 = get_4_from_v4v6(Addr), ipv6 = get_6_from_v4v6(Addr)}. +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv4, Address) -> + #v2_pdn_address_allocation{type = ipv4, address = maps:get(ipv4,Address)}; +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv6, Address) -> + #v2_pdn_address_allocation{type = ipv6, address = add_v6_prefix_len_byte(maps:get(ipv6,Address))}; +pdp_address_to_gtp2_paa(?GTP_PDP_ADDR_TYPE_NR_IPv4v6, Address) -> + #v2_pdn_address_allocation{type = ipv4v6, address = get_v4v6(maps:get(ipv4,Address),maps:get(ipv6,Address))}. + epdg_eua_to_gsup_pdp_address(#epdg_eua{type_nr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, ipv4 = Addr}) -> #{pdp_type_org => 1, pdp_type_nr => ?GTP_PDP_ADDR_TYPE_NR_IPv4, diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 4b88be3..d4d2b71 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -48,7 +48,7 @@ %% gen_server Function Exports -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3]). --export([create_session_req/4, delete_session_req/1]). +-export([create_session_req/5, delete_session_req/1]). %% Application Definitions -define(SERVER, ?MODULE). @@ -144,13 +144,13 @@ lager:error("GTPv2C UDP socket open error: ~w~n", [Reason]) end. -create_session_req(Imsi, Apn, APCO, PGWAddrCandidateList) -> - gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}). +create_session_req(Imsi, Apn, APCO, Paa, PGWAddrCandidateList) -> + gen_server:call(?SERVER, {gtpc_create_session_req, {Imsi, Apn, APCO, Paa, PGWAddrCandidateList}}). delete_session_req(Imsi) -> gen_server:call(?SERVER, {gtpc_delete_session_req, {Imsi}}). -handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) -> +handle_call({gtpc_create_session_req, {Imsi, Apn, APCO, Paa, PGWAddrCandidateList}}, {Pid, _Tag} = _From, State0) -> RemoteAddrStr = pick_gtpc_remote_address(PGWAddrCandidateList, State0), lager:debug("Selected PGW Remote Address ~p~n", [RemoteAddrStr]), {ok, RemoteAddrInet} = inet_parse:address(RemoteAddrStr), @@ -160,7 +160,7 @@ raddr_str = RemoteAddrInet, raddr = RemoteAddrInet}, State0), - Req = gen_create_session_request(Sess0, APCO, State1), + Req = gen_create_session_request(Sess0, APCO, Paa, State1), tx_gtp(Req, State1), State2 = inc_seq_no(State1), lager:debug("Waiting for CreateSessionResponse~n", []), @@ -514,6 +514,7 @@ apn = Apn, local_control_tei = LocalCtlTEI} = Sess, APCO, + Paa, #gtp_state{laddr = LocalAddr, laddr_gtpu = LocalAddrGtpu, restart_counter = RCnt, @@ -548,7 +549,7 @@ }, #v2_access_point_name{instance = 0, apn = [Apn]}, #v2_selection_mode{mode = 0}, - #v2_pdn_address_allocation{type = ipv4, address = <<0,0,0,0>>}, + Paa, %% v2_pdn_address_allocation #v2_bearer_context{group = BearersIE}, #v2_recovery{restart_counter = RCnt}, #v2_additional_protocol_configuration_options{instance = 0, config = APCO_decoded} diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 2e4f417..220bc5e 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -66,6 +66,7 @@ -record(ue_fsm_data, { imsi, + paa, apn = "internet" :: string(), pgw_rem_addr_list = [] :: list(), tun_pdp_ctx :: #epdg_tun_pdp_ctx{}, @@ -96,10 +97,10 @@ {error, Err} end. -auth_request(Pid, {PdpTypeNr, Apn, EAP}) -> +auth_request(Pid, {PdpTypeNr, PdpAddress, Apn, EAP}) -> lager:info("ue_fsm auth_request~n", []), try - gen_statem:call(Pid, {auth_request, PdpTypeNr, Apn, EAP}) + gen_statem:call(Pid, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}) catch exit:Err -> {error, Err} @@ -227,7 +228,7 @@ %% Internal helpers %% ------------------------------------------------------------------ -ev_handle({call, From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> +ev_handle({call, From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> epdg_diameter_swm:tx_der_auth_request(Data#ue_fsm_data.imsi, PdpTypeNr, Apn, EAP), {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}. @@ -258,9 +259,10 @@ state_new(enter, _OldState, Data) -> {keep_state, Data}; -state_new({call, _From} = EvType, {auth_request, PdpTypeNr, Apn, EAP} = EvContent, Data) -> - lager:info("ue_fsm state_new event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), - ev_handle(EvType, EvContent, Data); +state_new({call, _From} = EvType, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP} = EvContent, Data) -> + lager:info("ue_fsm state_new event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), + Data1 = Data#ue_fsm_data{paa = conv:pdp_address_to_gtp2_paa(PdpTypeNr, PdpAddress), apn = Apn}, + ev_handle(EvType, EvContent, Data1); state_new({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), @@ -300,8 +302,8 @@ state_authenticating(enter, _OldState, Data) -> {keep_state, Data}; -state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, Apn, EAP} = EvContent, Data) -> - lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticating({call, _From} = EvType, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP} = EvContent, Data) -> + lager:info("ue_fsm state_authenticating event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), ev_handle(EvType, EvContent, Data); state_authenticating({call, From}, lu_request, Data) -> @@ -339,8 +341,8 @@ state_authenticated(enter, _OldState, Data) -> {keep_state, Data}; -state_authenticated({call, _From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_authenticated event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_authenticated({call, _From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> + lager:info("ue_fsm state_authenticated event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), {next_state, state_new, Data, [postpone]}; state_authenticated({call, From}, {tunnel_request, PCO}, Data) -> @@ -348,6 +350,7 @@ epdg_gtpc_s2b:create_session_req(Data#ue_fsm_data.imsi, Data#ue_fsm_data.apn, PCO, + Data#ue_fsm_data.paa, Data#ue_fsm_data.pgw_rem_addr_list), {next_state, state_wait_create_session_resp, Data, [{reply,From,ok}]}; @@ -437,8 +440,8 @@ state_active(enter, _OldState, Data) -> {keep_state, Data}; -state_active({call, _From}, {auth_request, PdpTypeNr, Apn, EAP}, Data) -> - lager:info("ue_fsm state_active event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, Apn, EAP, Data]), +state_active({call, _From}, {auth_request, PdpTypeNr, PdpAddress, Apn, EAP}, Data) -> + lager:info("ue_fsm state_active event=auth_request {~p, ~p, ~p}, ~p~n", [PdpTypeNr, PdpAddress, Apn, EAP, Data]), gtp_u_tun:delete_pdp_context(Data#ue_fsm_data.tun_pdp_ctx), Data1 = Data#ue_fsm_data{tun_pdp_ctx = undefined}, {next_state, state_new, Data1, [postpone]}; diff --git a/src/gsup_server.erl b/src/gsup_server.erl index c5d3738..c4c28cf 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -296,13 +296,20 @@ case maps:find(pdp_info_list, GsupMsgRx) of {ok, [PdpInfo]} -> #{pdp_context_id := _PDPCtxId, - pdp_address := #{address := #{}, + pdp_address := #{address := PdpAddress, pdp_type_nr := PdpTypeNr, pdp_type_org := 241}, access_point_name := Apn - } = PdpInfo; + } = PdpInfo, + case maps:is_key(ipv4,PdpAddress) or maps:is_key(ipv6,PdpAddress) of + true -> ok; %% Address received so do nothing + false -> %% No address received from strongswan, use a default value + PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + PdpAddress = #{ipv4 => <<0,0,0,0>>} + end; error -> % Use some sane defaults: PdpTypeNr = ?GTP_PDP_ADDR_TYPE_NR_IPv4, + PdpAddress = #{ipv4 => <<0,0,0,0>>}, Apn = "*" end, EAP = parse_eap(GsupMsgRx), @@ -310,7 +317,7 @@ undefined -> {ok, Pid} = epdg_ue_fsm:start(Imsi); Pid -> Pid end, - case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, Apn, EAP}) of + case epdg_ue_fsm:auth_request(Pid, {PdpTypeNr, PdpAddress, Apn, EAP}) of ok -> ok; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40277?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0c77b1e366df36439d3a1b72030d831dd1b3a05 Gerrit-Change-Number: 40277 Gerrit-PatchSet: 1 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log