- gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: cnlink: Cleanup talloc tree

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email ) Change subject: cnlink: Cleanup talloc tree ...................................................................... cnlink: Cleanup talloc tree Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 --- M src/osmo-hnbgw/cnlink.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/67/40267/1 diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 18ffbd4..85d211a 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -163,12 +163,10 @@ struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { - struct osmo_fsm_inst *fi; struct hnbgw_cnlink *cnlink; const struct rate_ctr_group_desc *ctrg_desc; OSMO_ASSERT(cnpool); - char *name = talloc_asprintf(OTC_SELECT, "%s-%d", cnpool->peer_name, nr); switch (cnpool->domain) { case DOMAIN_CS: @@ -181,28 +179,25 @@ OSMO_ASSERT(0); } - - fi = osmo_fsm_inst_alloc(&cnlink_fsm, g_hnbgw, NULL, LOGL_DEBUG, name); - OSMO_ASSERT(fi); - cnlink = talloc_zero(g_hnbgw, struct hnbgw_cnlink); - fi->priv = cnlink; - + cnlink = talloc_zero(cnpool, struct hnbgw_cnlink); + OSMO_ASSERT(cnlink); *cnlink = (struct hnbgw_cnlink){ - .name = name, .pool = cnpool, - .fi = fi, .nr = nr, .vty = { /* VTY config defaults for the new cnlink */ .nri_ranges = osmo_nri_ranges_alloc(cnlink), }, .allow_attach = true, - .ctrs = rate_ctr_group_alloc(g_hnbgw, ctrg_desc, nr), + .ctrs = rate_ctr_group_alloc(cnlink, ctrg_desc, nr), }; - talloc_steal(cnlink, name); + cnlink->name = talloc_asprintf(cnlink, "%s-%d", cnpool->peer_name, nr); INIT_LLIST_HEAD(&cnlink->map_list); INIT_LLIST_HEAD(&cnlink->paging); + cnlink->fi = osmo_fsm_inst_alloc(&cnlink_fsm, cnlink, cnlink, LOGL_DEBUG, cnlink->name); + OSMO_ASSERT(cnlink->fi); + llist_add_tail(&cnlink->entry, &cnpool->cnlinks); LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "allocated\n"); @@ -229,9 +224,14 @@ { if (!cnlink) return; - osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); + if (cnlink->hnbgw_sccp_user) hnbgw_cnlink_drop_sccp(cnlink); + + osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); + cnlink->fi = NULL; + rate_ctr_group_free(cnlink->ctrs); + llist_del(&cnlink->entry); talloc_free(cnlink); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40267?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I90c22f2a2932ede7103c66f2263e72ac2fdae497 Gerrit-Change-Number: 40267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 4 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: Introduce func helper hnbgw_sccp_user_get_sccp_instance()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40268?usp=email ) Change subject: Introduce func helper hnbgw_sccp_user_get_sccp_instance() ...................................................................... Introduce func helper hnbgw_sccp_user_get_sccp_instance() This way we keep struct field access within the header file. Change-Id: I1684fa1871098ab6df7c79c9c0e0daf6c6f35b09 --- M include/osmocom/hnbgw/cnlink.h M include/osmocom/hnbgw/hnbgw_sccp.h 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/68/40268/1 diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index c4e494d..fd1b7de 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -108,9 +108,7 @@ return NULL; if (!cnlink->hnbgw_sccp_user) return NULL; - if (!cnlink->hnbgw_sccp_user->ss7) - return NULL; - return osmo_ss7_get_sccp(cnlink->hnbgw_sccp_user->ss7); + return hnbgw_sccp_user_get_sccp_instance(cnlink->hnbgw_sccp_user); } /* cnlink_fsm.c related: */ diff --git a/include/osmocom/hnbgw/hnbgw_sccp.h b/include/osmocom/hnbgw/hnbgw_sccp.h index d207348..4388a3a 100644 --- a/include/osmocom/hnbgw/hnbgw_sccp.h +++ b/include/osmocom/hnbgw/hnbgw_sccp.h @@ -57,3 +57,10 @@ int hnbgw_sccp_user_tx_data_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id, struct msgb *ranap_msg); int hnbgw_sccp_user_tx_disconnect_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id); + +static inline struct osmo_sccp_instance *hnbgw_sccp_user_get_sccp_instance(const struct hnbgw_sccp_user *hsu) +{ + if (!hsu->ss7) + return NULL; + return osmo_ss7_get_sccp(hsu->ss7); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40268?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1684fa1871098ab6df7c79c9c0e0daf6c6f35b09 Gerrit-Change-Number: 40268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 4 weeks

1
0
0 0

[L] Change in osmo-hnbgw[master]: Move cnlink funcs from hnbgw_cn.c to cnlink.c

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40266?usp=email ) Change subject: Move cnlink funcs from hnbgw_cn.c to cnlink.c ...................................................................... Move cnlink funcs from hnbgw_cn.c to cnlink.c This way we finally end up with hnbgw_cnpool related funcionalities in hnbgw_cn.c, and cnlink related ones in cnlink.c. Change-Id: Ic9a962877ea000aa1bca6c2c282baac6e53f6489 --- M include/osmocom/hnbgw/cnlink.h M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c 4 files changed, 172 insertions(+), 171 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/66/40266/1 diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index 3ede801..c4e494d 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -98,6 +98,10 @@ int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink); int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink); +int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); + +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); + static inline struct osmo_sccp_instance *hnbgw_cnlink_sccp(const struct hnbgw_cnlink *cnlink) { if (!cnlink) diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 1a5288a..8e765c8 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -61,6 +61,3 @@ void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool); struct hnbgw_cnlink *cnlink_get_nr(struct hnbgw_cnpool *cnpool, int nr, bool create_if_missing); void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool); - -int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); -char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index d02d45b..18ffbd4 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -347,3 +347,171 @@ CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET_ACK); return hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); } + +static bool addr_has_pc_and_ssn(const struct osmo_sccp_addr *addr) +{ + if (!(addr->presence & OSMO_SCCP_ADDR_T_SSN)) + return false; + if (!(addr->presence & OSMO_SCCP_ADDR_T_PC)) + return false; + return true; +} + +static int resolve_addr_name(struct osmo_sccp_addr *dest, struct osmo_ss7_instance **ss7, + const char *addr_name, const char *label, + uint32_t default_pc) +{ + if (!addr_name) { + osmo_sccp_make_addr_pc_ssn(dest, default_pc, OSMO_SCCP_SSN_RANAP); + if (label) + LOGP(DCN, LOGL_INFO, "%s remote addr not configured, using default: %s\n", label, + osmo_sccp_addr_name(*ss7, dest)); + return 0; + } + + *ss7 = osmo_sccp_addr_by_name(dest, addr_name); + if (!*ss7) { + if (label) + LOGP(DCN, LOGL_ERROR, "%s remote addr: no such SCCP address book entry: '%s'\n", + label, addr_name); + return -1; + } + + osmo_sccp_addr_set_ssn(dest, OSMO_SCCP_SSN_RANAP); + + if (!addr_has_pc_and_ssn(dest)) { + if (label) + LOGP(DCN, LOGL_ERROR, "Invalid/incomplete %s remote-addr: %s\n", + label, osmo_sccp_addr_name(*ss7, dest)); + return -1; + } + + return 0; +} + +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) +{ + struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); + if (!sccp) + return osmo_sccp_addr_dump(addr); + return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); +} + +static void hnbgw_cnlink_cfg_copy(struct hnbgw_cnlink *cnlink) +{ + struct osmo_nri_range *r; + + osmo_talloc_replace_string(cnlink, &cnlink->use.remote_addr_name, cnlink->vty.remote_addr_name); + + osmo_nri_ranges_free(cnlink->use.nri_ranges); + cnlink->use.nri_ranges = osmo_nri_ranges_alloc(cnlink); + llist_for_each_entry(r, &cnlink->vty.nri_ranges->entries, entry) + osmo_nri_ranges_add(cnlink->use.nri_ranges, r); +} + +static bool hnbgw_hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) +{ + bool changed = false; + + if (cnlink->vty.remote_addr_name && cnlink->use.remote_addr_name) { + struct osmo_ss7_instance *ss7; + struct osmo_sccp_addr remote_addr = {}; + + /* Instead of comparing whether the address book entry names are different, actually resolve the + * resulting SCCP address, and only restart the cnlink if the resulting address changed. */ + resolve_addr_name(&remote_addr, &ss7, cnlink->vty.remote_addr_name, NULL, DEFAULT_PC_HNBGW); + if (osmo_sccp_addr_cmp(&remote_addr, &cnlink->remote_addr, OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN)) + changed = true; + } else if (cnlink->vty.remote_addr_name != cnlink->use.remote_addr_name) { + /* One of them is NULL, the other is not. */ + changed = true; + } + + /* if more cnlink configuration is added in the future, it needs to be compared here. */ + + return changed; +} + +static void hnbgw_cnlink_log_self(struct hnbgw_cnlink *cnlink) +{ + struct osmo_ss7_instance *ss7 = cnlink->hnbgw_sccp_user->ss7; + LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "using: cs7-%u %s <-> %s %s %s\n", + osmo_ss7_instance_get_id(ss7), + /* printing the entire SCCP address is quite long, rather just print the point-code */ + osmo_ss7_pointcode_print(ss7, cnlink->hnbgw_sccp_user->local_addr.pc), + osmo_ss7_pointcode_print2(ss7, cnlink->remote_addr.pc), + cnlink->name, cnlink->use.remote_addr_name ? : "(default remote point-code)"); +} + +/* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink. + * The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present. + * Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */ +int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink) +{ + struct osmo_ss7_instance *ss7 = NULL; + struct hnbgw_sccp_user *hsu; + + /* If a hnbgw_sccp_user has already been set up, use that. */ + if (cnlink->hnbgw_sccp_user) { + if (hnbgw_hnbgw_cnlink_sccp_cfg_changed(cnlink)) { + LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "config changed, restarting SCCP\n"); + hnbgw_cnlink_drop_sccp(cnlink); + } else { + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "SCCP instance already set up, using %s\n", + cnlink->hnbgw_sccp_user->name); + return 0; + } + } else { + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "no SCCP instance selected yet\n"); + } + + /* Copy the current configuration: cnlink->use = cnlink->vty */ + hnbgw_cnlink_cfg_copy(cnlink); + + /* Figure out which cs7 instance to use. If cnlink->remote_addr_name is set, it points to an address book entry + * in a specific cs7 instance. If it is not set, leave ss7 == NULL to use cs7 instance 0. */ + if (cnlink->use.remote_addr_name) { + if (resolve_addr_name(&cnlink->remote_addr, &ss7, cnlink->use.remote_addr_name, cnlink->name, + DEFAULT_PC_HNBGW)) { + LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "cannot initialize SCCP: there is no SCCP address named '%s'\n", + cnlink->use.remote_addr_name); + return -ENOENT; + } + + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "remote-addr is '%s', using cs7 instance %u\n", + cnlink->use.remote_addr_name, osmo_ss7_instance_get_id(ss7)); + } else { + /* If no address is configured, use the default remote CN address, according to legacy behavior. */ + osmo_sccp_make_addr_pc_ssn(&cnlink->remote_addr, cnlink->pool->default_remote_pc, OSMO_SCCP_SSN_RANAP); + } + + /* If no 'cs7 instance' has been selected by the address, see if there already is a cs7 0 we can use by default. + * If it doesn't exist, it will get created by osmo_sccp_simple_client_on_ss7_id(). */ + if (!ss7) { + ss7 = osmo_ss7_instance_find(0); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "Using default 'cs7 instance 0' (%s)\n", ss7 ? "already exists" : "will create"); + } + + if (ss7) { + /* Has another cnlink already set up an SCCP instance for this ss7? */ + llist_for_each_entry(hsu, &g_hnbgw->sccp.users, entry) { + if (hsu->ss7 != ss7) + continue; + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "using existing SCCP instance %s on cs7 instance %u\n", + hsu->name, osmo_ss7_instance_get_id(ss7)); + cnlink->hnbgw_sccp_user = hsu; + hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); + hnbgw_cnlink_log_self(cnlink); + return 0; + } + /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", osmo_ss7_instance_get_id(ss7)); + } + + /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a + * particular cs7 instance above, use 'cs7 instance 0'. */ + cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(ss7 ? osmo_ss7_instance_get_id(ss7) : 0); + hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); + hnbgw_cnlink_log_self(cnlink); + return 0; +} diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index a50c52e..f881dc1 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -42,47 +42,6 @@ #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> -static bool addr_has_pc_and_ssn(const struct osmo_sccp_addr *addr) -{ - if (!(addr->presence & OSMO_SCCP_ADDR_T_SSN)) - return false; - if (!(addr->presence & OSMO_SCCP_ADDR_T_PC)) - return false; - return true; -} - -static int resolve_addr_name(struct osmo_sccp_addr *dest, struct osmo_ss7_instance **ss7, - const char *addr_name, const char *label, - uint32_t default_pc) -{ - if (!addr_name) { - osmo_sccp_make_addr_pc_ssn(dest, default_pc, OSMO_SCCP_SSN_RANAP); - if (label) - LOGP(DCN, LOGL_INFO, "%s remote addr not configured, using default: %s\n", label, - osmo_sccp_addr_name(*ss7, dest)); - return 0; - } - - *ss7 = osmo_sccp_addr_by_name(dest, addr_name); - if (!*ss7) { - if (label) - LOGP(DCN, LOGL_ERROR, "%s remote addr: no such SCCP address book entry: '%s'\n", - label, addr_name); - return -1; - } - - osmo_sccp_addr_set_ssn(dest, OSMO_SCCP_SSN_RANAP); - - if (!addr_has_pc_and_ssn(dest)) { - if (label) - LOGP(DCN, LOGL_ERROR, "Invalid/incomplete %s remote-addr: %s\n", - label, osmo_sccp_addr_name(*ss7, dest)); - return -1; - } - - return 0; -} - void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool) { struct osmo_nri_range *r; @@ -95,125 +54,6 @@ osmo_nri_ranges_add(cnpool->use.null_nri_ranges, r); } -static void hnbgw_cnlink_cfg_copy(struct hnbgw_cnlink *cnlink) -{ - struct osmo_nri_range *r; - - osmo_talloc_replace_string(cnlink, &cnlink->use.remote_addr_name, cnlink->vty.remote_addr_name); - - osmo_nri_ranges_free(cnlink->use.nri_ranges); - cnlink->use.nri_ranges = osmo_nri_ranges_alloc(cnlink); - llist_for_each_entry(r, &cnlink->vty.nri_ranges->entries, entry) - osmo_nri_ranges_add(cnlink->use.nri_ranges, r); -} - -static bool hnbgw_hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) -{ - bool changed = false; - - if (cnlink->vty.remote_addr_name && cnlink->use.remote_addr_name) { - struct osmo_ss7_instance *ss7; - struct osmo_sccp_addr remote_addr = {}; - - /* Instead of comparing whether the address book entry names are different, actually resolve the - * resulting SCCP address, and only restart the cnlink if the resulting address changed. */ - resolve_addr_name(&remote_addr, &ss7, cnlink->vty.remote_addr_name, NULL, DEFAULT_PC_HNBGW); - if (osmo_sccp_addr_cmp(&remote_addr, &cnlink->remote_addr, OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN)) - changed = true; - } else if (cnlink->vty.remote_addr_name != cnlink->use.remote_addr_name) { - /* One of them is NULL, the other is not. */ - changed = true; - } - - /* if more cnlink configuration is added in the future, it needs to be compared here. */ - - return changed; -} - -static void hnbgw_cnlink_log_self(struct hnbgw_cnlink *cnlink) -{ - struct osmo_ss7_instance *ss7 = cnlink->hnbgw_sccp_user->ss7; - LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "using: cs7-%u %s <-> %s %s %s\n", - osmo_ss7_instance_get_id(ss7), - /* printing the entire SCCP address is quite long, rather just print the point-code */ - osmo_ss7_pointcode_print(ss7, cnlink->hnbgw_sccp_user->local_addr.pc), - osmo_ss7_pointcode_print2(ss7, cnlink->remote_addr.pc), - cnlink->name, cnlink->use.remote_addr_name ? : "(default remote point-code)"); -} - -/* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink. - * The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present. - * Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */ -int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink) -{ - struct osmo_ss7_instance *ss7 = NULL; - struct hnbgw_sccp_user *hsu; - - /* If a hnbgw_sccp_user has already been set up, use that. */ - if (cnlink->hnbgw_sccp_user) { - if (hnbgw_hnbgw_cnlink_sccp_cfg_changed(cnlink)) { - LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "config changed, restarting SCCP\n"); - hnbgw_cnlink_drop_sccp(cnlink); - } else { - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "SCCP instance already set up, using %s\n", - cnlink->hnbgw_sccp_user->name); - return 0; - } - } else { - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "no SCCP instance selected yet\n"); - } - - /* Copy the current configuration: cnlink->use = cnlink->vty */ - hnbgw_cnlink_cfg_copy(cnlink); - - /* Figure out which cs7 instance to use. If cnlink->remote_addr_name is set, it points to an address book entry - * in a specific cs7 instance. If it is not set, leave ss7 == NULL to use cs7 instance 0. */ - if (cnlink->use.remote_addr_name) { - if (resolve_addr_name(&cnlink->remote_addr, &ss7, cnlink->use.remote_addr_name, cnlink->name, - DEFAULT_PC_HNBGW)) { - LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "cannot initialize SCCP: there is no SCCP address named '%s'\n", - cnlink->use.remote_addr_name); - return -ENOENT; - } - - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "remote-addr is '%s', using cs7 instance %u\n", - cnlink->use.remote_addr_name, osmo_ss7_instance_get_id(ss7)); - } else { - /* If no address is configured, use the default remote CN address, according to legacy behavior. */ - osmo_sccp_make_addr_pc_ssn(&cnlink->remote_addr, cnlink->pool->default_remote_pc, OSMO_SCCP_SSN_RANAP); - } - - /* If no 'cs7 instance' has been selected by the address, see if there already is a cs7 0 we can use by default. - * If it doesn't exist, it will get created by osmo_sccp_simple_client_on_ss7_id(). */ - if (!ss7) { - ss7 = osmo_ss7_instance_find(0); - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "Using default 'cs7 instance 0' (%s)\n", ss7 ? "already exists" : "will create"); - } - - if (ss7) { - /* Has another cnlink already set up an SCCP instance for this ss7? */ - llist_for_each_entry(hsu, &g_hnbgw->sccp.users, entry) { - if (hsu->ss7 != ss7) - continue; - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "using existing SCCP instance %s on cs7 instance %u\n", - hsu->name, osmo_ss7_instance_get_id(ss7)); - cnlink->hnbgw_sccp_user = hsu; - hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); - hnbgw_cnlink_log_self(cnlink); - return 0; - } - /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", osmo_ss7_instance_get_id(ss7)); - } - - /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a - * particular cs7 instance above, use 'cs7 instance 0'. */ - cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(ss7 ? osmo_ss7_instance_get_id(ss7) : 0); - hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); - hnbgw_cnlink_log_self(cnlink); - return 0; -} - void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool) { struct hnbgw_cnlink *cnlink; @@ -410,14 +250,6 @@ #undef LOG_NRI } -char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) -{ - struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); - if (!sccp) - return osmo_sccp_addr_dump(addr); - return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); -} - static const struct rate_ctr_desc cnpool_ctr_description[] = { [CNPOOL_CTR_SUBSCR_NO_CNLINK] = { "cnpool:subscr:no_cnlink", -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40266?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9a962877ea000aa1bca6c2c282baac6e53f6489 Gerrit-Change-Number: 40266 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 4 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... cnlink: Fix several funcs missing prefix Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 --- M include/osmocom/hnbgw/cnlink.h M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_sccp.c M src/osmo-hnbgw/hnbgw_vty.c 6 files changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/63/40263/1 diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index 3aeed0b..3ede801 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -92,12 +92,13 @@ struct rate_ctr_group *ctrs; }; -struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); +struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); +void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink); 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) +static inline struct osmo_sccp_instance *hnbgw_cnlink_sccp(const struct hnbgw_cnlink *cnlink) { if (!cnlink) return NULL; diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index d6098b4..5ca5675 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -70,4 +70,4 @@ void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool); int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); -char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index cea2827..ae6b266 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -34,7 +34,7 @@ #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/context_map.h> -struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) +struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { struct osmo_fsm_inst *fi; struct hnbgw_cnlink *cnlink; @@ -84,7 +84,7 @@ hnbgw_sccp_user_put(hsu, HSU_USE_CNLINK); } -void cnlink_term_and_free(struct hnbgw_cnlink *cnlink) +void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink) { if (!cnlink) return; @@ -127,7 +127,7 @@ LOG_CNLINK(cnlink, DRANAP, LOGL_DEBUG, "Tx RANAP RESET to %s %s\n", cnlink_is_cs(cnlink) ? "IuCS" : "IuPS", - cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); if (g_hnbgw->config.plmn.mcc) { osmo_plmn_to_bcd(plmn_buf, &g_hnbgw->config.plmn); @@ -162,7 +162,7 @@ int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink) { struct msgb *msg; - struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink); + struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); RANAP_GlobalRNC_ID_t grnc_id; RANAP_GlobalRNC_ID_t *use_grnc_id = NULL; uint8_t plmn_buf[3]; @@ -174,8 +174,8 @@ LOG_CNLINK(cnlink, DRANAP, LOGL_NOTICE, "Tx RANAP RESET ACK %s %s --> %s\n", cnlink_is_cs(cnlink) ? "IuCS" : "IuPS", - cnlink_sccp_addr_to_str(cnlink, &cnlink->hnbgw_sccp_user->local_addr), - cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->hnbgw_sccp_user->local_addr), + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); if (g_hnbgw->config.plmn.mcc) { osmo_plmn_to_bcd(plmn_buf, &g_hnbgw->config.plmn); diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 121c77f..1c5a7fc 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -111,7 +111,7 @@ osmo_nri_ranges_add(cnlink->use.nri_ranges, r); } -static bool hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) +static bool hnbgw_hnbgw_cnlink_sccp_cfg_changed(struct hnbgw_cnlink *cnlink) { bool changed = false; @@ -155,7 +155,7 @@ /* If a hnbgw_sccp_user has already been set up, use that. */ if (cnlink->hnbgw_sccp_user) { - if (hnbgw_cnlink_sccp_cfg_changed(cnlink)) { + if (hnbgw_hnbgw_cnlink_sccp_cfg_changed(cnlink)) { LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "config changed, restarting SCCP\n"); hnbgw_cnlink_drop_sccp(cnlink); } else { @@ -247,7 +247,7 @@ if (!create_if_missing) return NULL; - return cnlink_alloc(cnpool, nr); + return hnbgw_cnlink_alloc(cnpool, nr); } static bool is_cnlink_usable(struct hnbgw_cnlink *cnlink, bool is_emerg) @@ -414,9 +414,9 @@ #undef LOG_NRI } -char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) { - struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink); + struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); if (!sccp) return osmo_sccp_addr_dump(addr); return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index 4699b2f..434c58e 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -123,9 +123,9 @@ LOGP(DCN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n", param->conn_id, - cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr), - cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr), - cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr)); + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr), + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr), + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr)); CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_CONNECT_CNF); @@ -159,7 +159,7 @@ LOGP(DCN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s cause=%s\n", param->conn_id, - cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr), + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr), osmo_sua_sccp_cause_name(param->cause, cause_buf, sizeof(cause_buf))); CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_DISCONNECT_IND); diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index e2c3d8f..bfe0c73 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -154,7 +154,7 @@ vty_out(vty, " %s%s%s%s", cnlink->use.remote_addr_name ? : "", cnlink->use.remote_addr_name ? "=" : "", - cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr), + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr), VTY_NEWLINE); rt = osmo_ss7_route_lookup(ss7, cnlink->remote_addr.pc); -- 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: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 4 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40264?usp=email ) Change subject: Convert struct hnbgw_cnpool to be a talloc context ...................................................................... Convert struct hnbgw_cnpool to be a talloc context Change-Id: I62a511e3ea0254d0327f2664d504b9195416bc76 --- M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_sccp.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/osmo_hnbgw_main.c 7 files changed, 81 insertions(+), 68 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/64/40264/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index eb9c61c..685bc12 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -133,9 +133,9 @@ struct llist_head users; /* Pool of core network peers: MSCs for IuCS */ - struct hnbgw_cnpool cnpool_iucs; + struct hnbgw_cnpool *cnpool_iucs; /* Pool of core network peers: SGSNs for IuPS */ - struct hnbgw_cnpool cnpool_iups; + struct hnbgw_cnpool *cnpool_iups; } sccp; /* MGW pool, also includes the single MGCP client as fallback if no * pool is configured. */ diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 5ca5675..fe4f7bb 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -56,11 +56,7 @@ struct rate_ctr_group *ctrs; }; -extern const struct rate_ctr_group_desc iucs_ctrg_desc; -extern const struct rate_ctr_group_desc iups_ctrg_desc; - -extern const struct rate_ctr_group_desc msc_ctrg_desc; -extern const struct rate_ctr_group_desc sgsn_ctrg_desc; +struct hnbgw_cnpool *hnbgw_cnpool_alloc(RANAP_CN_DomainIndicator_t domain); struct hnbgw_cnlink *hnbgw_cnlink_select(struct hnbgw_context_map *map); diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index c46ddad..d237928 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -235,35 +235,8 @@ g_hnbgw->config.pfcp.remote_port = OSMO_PFCP_PORT; #endif - g_hnbgw->sccp.cnpool_iucs = (struct hnbgw_cnpool){ - .domain = DOMAIN_CS, - .pool_name = "iucs", - .peer_name = "msc", - .default_remote_pc = DEFAULT_PC_MSC, - .vty = { - .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, - .null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw), - }, - .cnlink_ctrg_desc = &msc_ctrg_desc, - - .ctrs = rate_ctr_group_alloc(g_hnbgw, &iucs_ctrg_desc, 0), - }; - INIT_LLIST_HEAD(&g_hnbgw->sccp.cnpool_iucs.cnlinks); - - g_hnbgw->sccp.cnpool_iups = (struct hnbgw_cnpool){ - .domain = DOMAIN_PS, - .pool_name = "iups", - .peer_name = "sgsn", - .default_remote_pc = DEFAULT_PC_SGSN, - .vty = { - .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, - .null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw), - }, - .cnlink_ctrg_desc = &sgsn_ctrg_desc, - - .ctrs = rate_ctr_group_alloc(g_hnbgw, &iups_ctrg_desc, 0), - }; - INIT_LLIST_HEAD(&g_hnbgw->sccp.cnpool_iups.cnlinks); + g_hnbgw->sccp.cnpool_iucs = hnbgw_cnpool_alloc(DOMAIN_CS); + g_hnbgw->sccp.cnpool_iups = hnbgw_cnpool_alloc(DOMAIN_PS); osmo_timer_setup(&g_hnbgw->store_uptime_timer, hnbgw_store_hnb_uptime, g_hnbgw); osmo_timer_schedule(&g_hnbgw->store_uptime_timer, STORE_UPTIME_INTERVAL, 0); diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 1c5a7fc..e8570a2 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -42,10 +42,6 @@ #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> -/*********************************************************************** - * Incoming primitives from SCCP User SAP - ***********************************************************************/ - static bool addr_has_pc_and_ssn(const struct osmo_sccp_addr *addr) { if (!(addr->presence & OSMO_SCCP_ADDR_T_SSN)) @@ -94,7 +90,7 @@ cnpool->use.nri_bitlen = cnpool->vty.nri_bitlen; osmo_nri_ranges_free(cnpool->use.null_nri_ranges); - cnpool->use.null_nri_ranges = osmo_nri_ranges_alloc(g_hnbgw); + cnpool->use.null_nri_ranges = osmo_nri_ranges_alloc(cnpool); llist_for_each_entry(r, &cnpool->vty.null_nri_ranges->entries, entry) osmo_nri_ranges_add(cnpool->use.null_nri_ranges, r); } @@ -269,7 +265,7 @@ */ struct hnbgw_cnlink *hnbgw_cnlink_select(struct hnbgw_context_map *map) { - struct hnbgw_cnpool *cnpool = map->is_ps ? &g_hnbgw->sccp.cnpool_iups : &g_hnbgw->sccp.cnpool_iucs; + struct hnbgw_cnpool *cnpool = map->is_ps ? g_hnbgw->sccp.cnpool_iups : g_hnbgw->sccp.cnpool_iucs; struct hnbgw_cnlink *cnlink; struct hnbgw_cnlink *round_robin_next = NULL; struct hnbgw_cnlink *round_robin_first = NULL; @@ -578,3 +574,51 @@ ARRAY_SIZE(cnpool_ctr_description), cnpool_ctr_description, }; + +static int hnbgw_cnpool_talloc_destructor(struct hnbgw_cnpool *cnpool) +{ + struct hnbgw_cnlink *cnlink; + osmo_nri_ranges_free(cnpool->vty.null_nri_ranges); + cnpool->vty.null_nri_ranges = NULL; + + while ((cnlink = llist_first_entry_or_null(&cnpool->cnlinks, struct hnbgw_cnlink, entry))) + hnbgw_cnlink_term_and_free(cnlink); + return 0; +} + +struct hnbgw_cnpool *hnbgw_cnpool_alloc(RANAP_CN_DomainIndicator_t domain) +{ + struct hnbgw_cnpool *cnpool = talloc_zero(g_hnbgw, struct hnbgw_cnpool); + OSMO_ASSERT(cnpool); + + cnpool->domain = domain; + cnpool->vty = (struct hnbgw_cnpool_cfg){ + .nri_bitlen = OSMO_NRI_BITLEN_DEFAULT, + .null_nri_ranges = osmo_nri_ranges_alloc(cnpool), + }; + OSMO_ASSERT(cnpool->vty.null_nri_ranges); + INIT_LLIST_HEAD(&cnpool->cnlinks); + + talloc_set_destructor(cnpool, hnbgw_cnpool_talloc_destructor); + + switch (domain) { + case DOMAIN_CS: + cnpool->pool_name = "iucs"; + cnpool->peer_name = "msc"; + cnpool->default_remote_pc = DEFAULT_PC_MSC; + cnpool->cnlink_ctrg_desc = &msc_ctrg_desc; + cnpool->ctrs = rate_ctr_group_alloc(cnpool, &iucs_ctrg_desc, 0); + break; + case DOMAIN_PS: + cnpool->pool_name = "iups"; + cnpool->peer_name = "sgsn"; + cnpool->default_remote_pc = DEFAULT_PC_SGSN; + cnpool->cnlink_ctrg_desc = &sgsn_ctrg_desc; + cnpool->ctrs = rate_ctr_group_alloc(cnpool, &iups_ctrg_desc, 0); + break; + default: + OSMO_ASSERT(0); + } + + return cnpool; +} diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index 434c58e..ed58b78 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -54,11 +54,11 @@ const struct osmo_sccp_addr *remote_addr) { struct hnbgw_cnlink *cnlink; - llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iucs.cnlinks, entry) { + llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iucs->cnlinks, entry) { if (cnlink_matches(cnlink, hsu, remote_addr)) return cnlink; } - llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iups.cnlinks, entry) { + llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iups->cnlinks, entry) { if (cnlink_matches(cnlink, hsu, remote_addr)) return cnlink; } @@ -188,9 +188,9 @@ static struct hnbgw_cnlink *cnlink_find_by_remote_pc(struct osmo_ss7_instance *cs7, uint32_t pc) { struct hnbgw_cnlink *cnlink; - cnlink = _cnlink_find_by_remote_pc(&g_hnbgw->sccp.cnpool_iucs, cs7, pc); + cnlink = _cnlink_find_by_remote_pc(g_hnbgw->sccp.cnpool_iucs, cs7, pc); if (!cnlink) - cnlink = _cnlink_find_by_remote_pc(&g_hnbgw->sccp.cnpool_iups, cs7, pc); + cnlink = _cnlink_find_by_remote_pc(g_hnbgw->sccp.cnpool_iups, cs7, pc); return cnlink; } diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index bfe0c73..52c5ba6 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -86,7 +86,7 @@ "iucs", "Configure IuCS options") { vty->node = IUCS_NODE; - vty->index = &g_hnbgw->sccp.cnpool_iucs; + vty->index = g_hnbgw->sccp.cnpool_iucs; return CMD_SUCCESS; } @@ -100,7 +100,7 @@ "iups", "Configure IuPS options") { vty->node = IUPS_NODE; - vty->index = &g_hnbgw->sccp.cnpool_iups; + vty->index = g_hnbgw->sccp.cnpool_iups; return CMD_SUCCESS; } @@ -167,10 +167,10 @@ { struct hnbgw_cnlink *cnlink; vty_out(vty, "IuCS: "); - llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iucs.cnlinks, entry) + llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iucs->cnlinks, entry) _show_cnlink(vty, cnlink); vty_out(vty, "IuPS: "); - llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iups.cnlinks, entry) + llist_for_each_entry(cnlink, &g_hnbgw->sccp.cnpool_iups->cnlinks, entry) _show_cnlink(vty, cnlink); return CMD_SUCCESS; } @@ -511,7 +511,7 @@ "Configure an IuCS link to an MSC\n" "MSC nr\n") { - return cnlink_nr(vty, &g_hnbgw->sccp.cnpool_iucs, argc, argv); + return cnlink_nr(vty, g_hnbgw->sccp.cnpool_iucs, argc, argv); } /* 'sgsn 0' */ @@ -520,7 +520,7 @@ "Configure an IuPS link to an SGSN\n" "SGSN nr\n") { - return cnlink_nr(vty, &g_hnbgw->sccp.cnpool_iups, argc, argv); + return cnlink_nr(vty, g_hnbgw->sccp.cnpool_iups, argc, argv); } /* 'msc 0' / 'remote-addr my-msc' and @@ -716,14 +716,14 @@ * nri null add ... */ vty_out(vty, "hnbgw%s", VTY_NEWLINE); - cnpool_write_nri(vty, &g_hnbgw->sccp.cnpool_iucs, true); - cnpool_write_nri(vty, &g_hnbgw->sccp.cnpool_iups, true); + cnpool_write_nri(vty, g_hnbgw->sccp.cnpool_iucs, true); + cnpool_write_nri(vty, g_hnbgw->sccp.cnpool_iups, true); /* msc 0 * nri add ... */ - cnlinks_write_nri(vty, &g_hnbgw->sccp.cnpool_iucs, true); - cnlinks_write_nri(vty, &g_hnbgw->sccp.cnpool_iups, true); + cnlinks_write_nri(vty, g_hnbgw->sccp.cnpool_iucs, true); + cnlinks_write_nri(vty, g_hnbgw->sccp.cnpool_iups, true); return CMD_SUCCESS; } @@ -739,9 +739,9 @@ { struct hnbgw_cnpool *cnpool; if (!strcmp("msc", argv[0])) - cnpool = &g_hnbgw->sccp.cnpool_iucs; + cnpool = g_hnbgw->sccp.cnpool_iucs; else - cnpool = &g_hnbgw->sccp.cnpool_iups; + cnpool = g_hnbgw->sccp.cnpool_iups; cnpool->round_robin_next_nr = atoi(argv[1]); return CMD_SUCCESS; } @@ -760,9 +760,9 @@ int nr = atoi(argv[1]); if (!strcmp("msc", msc_sgsn)) - cnpool = &g_hnbgw->sccp.cnpool_iucs; + cnpool = g_hnbgw->sccp.cnpool_iucs; else - cnpool = &g_hnbgw->sccp.cnpool_iups; + cnpool = g_hnbgw->sccp.cnpool_iups; cnlink = cnlink_get_nr(cnpool, nr, false); if (!cnlink) { @@ -801,11 +801,11 @@ { struct hnbgw_cnpool *cnpool; - cnpool = &g_hnbgw->sccp.cnpool_iucs; + cnpool = g_hnbgw->sccp.cnpool_iucs; hnbgw_cnpool_apply_cfg(cnpool); hnbgw_cnpool_cnlinks_start_or_restart(cnpool); - cnpool = &g_hnbgw->sccp.cnpool_iups; + cnpool = g_hnbgw->sccp.cnpool_iups; hnbgw_cnpool_apply_cfg(cnpool); hnbgw_cnpool_cnlinks_start_or_restart(cnpool); @@ -1014,8 +1014,8 @@ llist_for_each_entry(hnbp, &g_hnbgw->hnb_persistent_list, list) write_one_hnbp(vty, hnbp); - _config_write_cnpool(vty, &g_hnbgw->sccp.cnpool_iucs); - _config_write_cnpool(vty, &g_hnbgw->sccp.cnpool_iups); + _config_write_cnpool(vty, g_hnbgw->sccp.cnpool_iucs); + _config_write_cnpool(vty, g_hnbgw->sccp.cnpool_iups); if (g_hnbgw->config.nft_kpi.enable) vty_out(vty, " nft-kpi%s%s%s", @@ -1065,13 +1065,13 @@ static int config_write_msc(struct vty *vty) { - _config_write_cnlink(vty, &g_hnbgw->sccp.cnpool_iucs); + _config_write_cnlink(vty, g_hnbgw->sccp.cnpool_iucs); return CMD_SUCCESS; } static int config_write_sgsn(struct vty *vty) { - _config_write_cnlink(vty, &g_hnbgw->sccp.cnpool_iups); + _config_write_cnlink(vty, g_hnbgw->sccp.cnpool_iups); return CMD_SUCCESS; } diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index 845002f..0f932d9 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -345,8 +345,8 @@ #endif } - hnbgw_cnpool_start(&g_hnbgw->sccp.cnpool_iucs); - hnbgw_cnpool_start(&g_hnbgw->sccp.cnpool_iups); + hnbgw_cnpool_start(g_hnbgw->sccp.cnpool_iucs); + hnbgw_cnpool_start(g_hnbgw->sccp.cnpool_iups); if (hnbgw_cmdline_config.daemonize) { rc = osmo_daemonize(); -- 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: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I62a511e3ea0254d0327f2664d504b9195416bc76 Gerrit-Change-Number: 40264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 4 weeks

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/62/40262/1 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: newchange 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>

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: Add required conversions for IPv6 and IPv4v6 support

by clufn

Attention is currently required from: fixeria, laforge, pespin. clufn has posted comments on this change by clufn. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40255?usp=email ) Change subject: Add required conversions for IPv6 and IPv4v6 support ...................................................................... Patch Set 8: (1 comment) File src/conv.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40255/comment/a15f21ea_25b1… : PS7, Line 42: -export([get_6_from_bin/1]). > @vyanitskiy@sysmocom. […] Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40255?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: I2426e0dcee3ca92075b845f6b21a175a3d047c08 Gerrit-Change-Number: 40255 Gerrit-PatchSet: 8 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 10:35:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 month, 4 weeks

1
0
0 0

[S] Change in ...osmo-epdg[master]: Add required conversions for IPv6 and IPv4v6 support

by pespin

Attention is currently required from: clufn, fixeria, laforge. pespin has posted comments on this change by clufn. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40255?usp=email ) Change subject: Add required conversions for IPv6 and IPv4v6 support ...................................................................... Patch Set 7: (1 comment) File src/conv.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40255/comment/403168e6_e264… : PS7, Line 42: -export([get_6_from_bin/1]). @vyanitskiy@sysmocom.de iirc we don't need to export these functions at this point because they are not used in any other module right? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/40255?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: I2426e0dcee3ca92075b845f6b21a175a3d047c08 Gerrit-Change-Number: 40255 Gerrit-PatchSet: 7 Gerrit-Owner: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: clufn <callumfarrbennett(a)yahoo.com> Gerrit-Comment-Date: Thu, 08 May 2025 10:32:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 4 weeks

1
0
0 0

[XS] Change in docker-playground[master]: nplab: don't use deprecated git.osmocom.org

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/40260?usp=email ) Change subject: nplab: don't use deprecated git.osmocom.org ...................................................................... Patch Set 1: (1 comment) File nplab-sua-test/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/40260/comment/bfeb6894_a75… : PS1, Line 6: RUN cd /tmp && git clone https://gitea.osmocom.org/nplab/sua-testtool it rings a bell that I was able to get some sort of URL to check the cache with gitea in the past, but I don't recall exactly tbh. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40260?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If6859323b5af3bd13a974cd1d676d4f19aa16773 Gerrit-Change-Number: 40260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 10:28:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 4 weeks

1
0
0 0

[M] Change in docker-playground[master]: {osmo-dev-on-,}debian-sid: remove

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/40259?usp=email ) Change subject: {osmo-dev-on-,}debian-sid: remove ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I379d56676327a59962d955bb3d4a0562142228e3 Gerrit-Change-Number: 40259 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 10:25:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 4 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log