March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc-nat[master]: Store BSCs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27472 ) Change subject: Store BSCs ...................................................................... Store BSCs Once a BSC has sent a RESET to BSCNAT, store it. This will be used in future patches to build connection mappings between MSC and BSCs, and to block messages from BSCs that did not send a RESET. I've considered using a FSM, but at least right now there doesn't seem to be multiple states worth storing. We only have the BSC before it has done the RESET (and then it's simply not in our list) and after it did the RESET (in the list). Don't use the stored BSCs in the forwarding logic just yet, a future commit will replace the current forwarding code with proper connection mappings. Related: SYS#5560 Change-Id: Icd7316c49ef26fb45ad45a2ccc1a7916bfb0a387 --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bssap.c 3 files changed, 64 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/72/27472/1 diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 3e47782..eb48f08 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -29,16 +29,27 @@ struct osmo_sccp_user *scu; }; +struct bsc { + struct llist_head list; + struct osmo_sccp_addr addr; +}; + struct bsc_nat { struct osmo_fsm_inst *fi; struct bsc_nat_sccp_inst *cn; struct bsc_nat_sccp_inst *ran; + + struct llist_head bscs; /* list of struct bsc */ }; struct bsc_nat *bsc_nat_alloc(void *tall_ctx); void bsc_nat_free(struct bsc_nat *bsc_nat); +struct bsc *bsc_nat_bsc_add(struct bsc_nat *bsc_nat, struct osmo_sccp_addr *addr); +struct bsc *bsc_nat_bsc_get_by_pc(struct bsc_nat *bsc_nat, uint32_t pointcode); +void bsc_nat_bsc_del(struct bsc_nat *bsc_nat, struct bsc *bsc); + const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); extern void *tall_bsc_nat_ctx; diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 579c6aa..5a6e84e 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -20,6 +20,7 @@ #include "config.h" #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/bsc_nat/logging.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> @@ -38,18 +39,62 @@ OSMO_ASSERT(bsc_nat->ran); talloc_set_name_const(bsc_nat->ran, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->bscs); + bsc_nat_fsm_alloc(bsc_nat); return bsc_nat; } +struct bsc *bsc_nat_bsc_add(struct bsc_nat *bsc_nat, struct osmo_sccp_addr *addr) +{ + struct bsc *bsc = talloc_zero(bsc_nat, struct bsc); + + OSMO_ASSERT(bsc); + talloc_set_name(bsc, "BSC(PC=%s)", osmo_ss7_pointcode_print(NULL, addr->pc)); + + LOGP(DMAIN, LOGL_DEBUG, "Add %s\n", talloc_get_name(bsc)); + + bsc->addr = *addr; + + INIT_LLIST_HEAD(&bsc->list); + llist_add(&bsc->list, &bsc_nat->bscs); + + return bsc; +} + +struct bsc *bsc_nat_bsc_get_by_pc(struct bsc_nat *bsc_nat, uint32_t pointcode) +{ + struct bsc *bsc; + + llist_for_each_entry(bsc, &bsc_nat->bscs, list) { + if (bsc->addr.pc == pointcode) + return bsc; + } + + return NULL; +} + +void bsc_nat_bsc_del(struct bsc_nat *bsc_nat, struct bsc *bsc) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(bsc)); + llist_del(&bsc->list); + talloc_free(bsc); +} + void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct bsc *bsc; + if (bsc_nat->fi) { osmo_fsm_inst_free(bsc_nat->fi); bsc_nat->fi = NULL; } + llist_for_each_entry(bsc, &bsc_nat->bscs, list) { + bsc_nat_bsc_del(bsc_nat, bsc); + } + talloc_free(bsc_nat); } diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index dfeea73..af6c8b3 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -36,7 +36,14 @@ static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { - LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(g_bsc_nat->ran, addr)); + struct bsc *bsc; + + /* Store the BSC, since RESET was done the BSCNAT should accept its messages */ + bsc = bsc_nat_bsc_get_by_pc(g_bsc_nat, addr->pc); + if (!bsc) + bsc = bsc_nat_bsc_add(g_bsc_nat, addr); + + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", talloc_get_name(bsc)); return tx_reset_ack(g_bsc_nat->ran, addr); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Icd7316c49ef26fb45ad45a2ccc1a7916bfb0a387 Gerrit-Change-Number: 27472 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Store MSC

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 ) Change subject: Store MSC ...................................................................... Store MSC Expect one MSC to be configured in the address book (part of the cs7 section in the config, see doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg) and store it on start up. Store the MSC in a list, as we may potentially support multiple MSCs in the future. Also that makes it symmetric to the BSC list. Prepare a FSM for MSC, as the next patch will extend this FSM to send a RESET to the MSC on start up. Don't use the stored MSCs in the forwarding logic just yet, a future commit will replace the current forwarding code with proper connection mappings. Related: SYS#5560 Change-Id: I711df0c649728f1007857fbfda500ed5ef69287b --- M include/osmocom/bsc_nat/Makefile.am M include/osmocom/bsc_nat/bsc_nat.h A include/osmocom/bsc_nat/msc_fsm.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/main.c A src/osmo-bsc-nat/msc_fsm.c 9 files changed, 161 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/73/27473/1 diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 76aada0..4c2bd09 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -3,5 +3,6 @@ bsc_nat_fsm.h \ bssap.h \ logging.h \ + msc_fsm.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index eb48f08..0807d83 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -29,6 +29,12 @@ struct osmo_sccp_user *scu; }; +struct msc { + struct llist_head list; + struct osmo_sccp_addr addr; + struct osmo_fsm_inst *fi; +}; + struct bsc { struct llist_head list; struct osmo_sccp_addr addr; @@ -40,12 +46,18 @@ struct bsc_nat_sccp_inst *cn; struct bsc_nat_sccp_inst *ran; + struct llist_head mscs; /* list of struct msc */ struct llist_head bscs; /* list of struct bsc */ }; struct bsc_nat *bsc_nat_alloc(void *tall_ctx); void bsc_nat_free(struct bsc_nat *bsc_nat); +struct msc *bsc_nat_msc_add(struct bsc_nat *bsc_nat, struct osmo_sccp_addr *addr); +struct msc *bsc_nat_msc_add_from_addr_book(struct bsc_nat *bsc_nat); +struct msc *bsc_nat_msc_get(struct bsc_nat *bsc_nat); +void bsc_nat_msc_del(struct bsc_nat *bsc_nat, struct msc *msc); + struct bsc *bsc_nat_bsc_add(struct bsc_nat *bsc_nat, struct osmo_sccp_addr *addr); struct bsc *bsc_nat_bsc_get_by_pc(struct bsc_nat *bsc_nat, uint32_t pointcode); void bsc_nat_bsc_del(struct bsc_nat *bsc_nat, struct bsc *bsc); diff --git a/include/osmocom/bsc_nat/msc_fsm.h b/include/osmocom/bsc_nat/msc_fsm.h new file mode 100644 index 0000000..0ea3024 --- /dev/null +++ b/include/osmocom/bsc_nat/msc_fsm.h @@ -0,0 +1,21 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * 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/lienses/>. + * + */ +#pragma once + +void msc_fsm_alloc(struct msc *msc); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 445c098..2c2d9fa 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -30,6 +30,7 @@ bssap.c \ logging.c \ main.c \ + msc_fsm.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 5a6e84e..b8c87dd 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -21,6 +21,7 @@ #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc_fsm.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> @@ -39,6 +40,7 @@ OSMO_ASSERT(bsc_nat->ran); talloc_set_name_const(bsc_nat->ran, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->mscs); INIT_LLIST_HEAD(&bsc_nat->bscs); bsc_nat_fsm_alloc(bsc_nat); @@ -46,6 +48,56 @@ return bsc_nat; } +struct msc *bsc_nat_msc_add(struct bsc_nat *bsc_nat, struct osmo_sccp_addr *addr) +{ + struct msc *msc = talloc_zero(bsc_nat, struct msc); + + OSMO_ASSERT(msc); + talloc_set_name(msc, "MSC(PC=%s)", osmo_ss7_pointcode_print(NULL, addr->pc)); + + LOGP(DMAIN, LOGL_DEBUG, "Add %s\n", talloc_get_name(msc)); + + msc->addr = *addr; + + INIT_LLIST_HEAD(&msc->list); + llist_add(&msc->list, &bsc_nat->mscs); + + msc_fsm_alloc(msc); + + return msc; +} + +struct msc *bsc_nat_msc_add_from_addr_book(struct bsc_nat *bsc_nat) +{ + struct osmo_sccp_addr addr; + + /* For now only one MSC is supported */ + if (osmo_sccp_addr_by_name_local(&addr, "msc", bsc_nat->cn->ss7_inst) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Configuration error, MSC not found in address book\n"); + return NULL; + } + + return bsc_nat_msc_add(bsc_nat, &addr); +} + + +struct msc *bsc_nat_msc_get(struct bsc_nat *bsc_nat) +{ + /* For now only one MSC is supported */ + + OSMO_ASSERT(!llist_empty(&bsc_nat->mscs)); + + return llist_first_entry(&bsc_nat->mscs, struct msc, list); +} + +void bsc_nat_msc_del(struct bsc_nat *bsc_nat, struct msc *msc) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); + llist_del(&msc->list); + osmo_fsm_inst_free(msc->fi); + talloc_free(msc); +} + struct bsc *bsc_nat_bsc_add(struct bsc_nat *bsc_nat, struct osmo_sccp_addr *addr) { struct bsc *bsc = talloc_zero(bsc_nat, struct bsc); @@ -84,6 +136,7 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct msc *msc; struct bsc *bsc; if (bsc_nat->fi) { @@ -91,6 +144,10 @@ bsc_nat->fi = NULL; } + llist_for_each_entry(msc, &bsc_nat->mscs, list) { + bsc_nat_msc_del(bsc_nat, msc); + } + llist_for_each_entry(bsc, &bsc_nat->bscs, list) { bsc_nat_bsc_del(bsc_nat, bsc); } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 3091687..b35376d 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -186,22 +186,7 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ - addr = &prim->u.unitdata.calling_addr; - - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; - - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); - - /* oph->msg stores oph and unitdata msg. Move oph->msg->data to - * unitdata msg and send it again. */ - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(g_bsc_nat->ran->scu, - &g_bsc_nat->ran->addr, - &peer_addr_out, - oph->msg->data, - msgb_length(oph->msg)); - rc = 0; + rc = bssap_handle_udt(sccp_inst, &prim->u.unitdata.calling_addr, oph->msg, msgb_l2len(oph->msg)); break; default: diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index af6c8b3..ef12192 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -20,6 +20,7 @@ #include "config.h" #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc_fsm.h> #include <osmocom/core/msgb.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/sigtran/sccp_helpers.h> diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index ef4b78d..86a774f 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -199,6 +199,9 @@ bsc_nat_fsm_start(g_bsc_nat); + if (!bsc_nat_msc_add_from_addr_book(g_bsc_nat)) + exit(1); + while (!osmo_select_shutdown_done()) osmo_select_main_ctx(0); diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c new file mode 100644 index 0000000..30434f4 --- /dev/null +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -0,0 +1,64 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * 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/lienses/>. + * + */ + +#include "config.h" +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/bssap.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/core/fsm.h> +#include <osmocom/sigtran/sccp_sap.h> + +#define X(s) (1 << (s)) + +enum msc_fsm_states { + MSC_FSM_ST_DISCONNECTED, +}; + +static struct osmo_fsm_state msc_fsm_states[] = { + [MSC_FSM_ST_DISCONNECTED] = { + .name = "DISCONNECTED", + .in_event_mask = 0 + , + .out_state_mask = 0 + , + }, +}; + +const struct value_string msc_fsm_event_names[] = { + { 0, NULL } +}; + +struct osmo_fsm msc_fsm = { + .name = "MSC", + .states = msc_fsm_states, + .num_states = ARRAY_SIZE(msc_fsm_states), + .log_subsys = DMAIN, + .event_names = msc_fsm_event_names, +}; + +static __attribute__((constructor)) void msc_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&msc_fsm) == 0); +} + +void msc_fsm_alloc(struct msc *msc) +{ + msc->fi = osmo_fsm_inst_alloc(&msc_fsm, msc, msc, LOGL_INFO, NULL); + OSMO_ASSERT(msc->fi); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I711df0c649728f1007857fbfda500ed5ef69287b Gerrit-Change-Number: 27473 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: msc_fsm: send RESET to MSC on start up

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27474 ) Change subject: msc_fsm: send RESET to MSC on start up ...................................................................... msc_fsm: send RESET to MSC on start up Automatically send RESET to the MSC as the BSCNAT starts up. Try it again if it fails, in case the MSC was not started yet or if the SCCP connection was not up yet (right now it does not seem possible to get notified when the SCCP connection is up). Related: SYS#5560 Related: https://osmocom.org/projects/osmo-bscnat/wiki/AoIP_OsmoBSCNAT#RESET Change-Id: Icfec3ec0168c7040e88a536fa48da339349fb6cf --- M include/osmocom/bsc_nat/bssap.h M include/osmocom/bsc_nat/msc_fsm.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/msc_fsm.c 6 files changed, 143 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/74/27474/1 diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h index 1a9324a..e535d5a 100644 --- a/include/osmocom/bsc_nat/bssap.h +++ b/include/osmocom/bsc_nat/bssap.h @@ -22,3 +22,5 @@ int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, unsigned int length); + +int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); diff --git a/include/osmocom/bsc_nat/msc_fsm.h b/include/osmocom/bsc_nat/msc_fsm.h index 0ea3024..3133a7c 100644 --- a/include/osmocom/bsc_nat/msc_fsm.h +++ b/include/osmocom/bsc_nat/msc_fsm.h @@ -19,3 +19,5 @@ #pragma once void msc_fsm_alloc(struct msc *msc); +void msc_fsm_connect(struct msc *msc); +void msc_fsm_rx_reset_ack(struct msc *msc); diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index b8c87dd..0a42c96 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -63,6 +63,7 @@ llist_add(&msc->list, &bsc_nat->mscs); msc_fsm_alloc(msc); + msc_fsm_connect(msc); return msc; } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index b35376d..f198eca 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -286,24 +286,6 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ rc = bssap_handle_udt(sccp_inst, &prim->u.unitdata.calling_addr, oph->msg, msgb_l2len(oph->msg)); - - /* FIXME: don't forward this to the MSC anymore, as soon as the - * BSCNAT is able to do the RESET to MSC by itself. */ - addr = &prim->u.unitdata.calling_addr; - - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; - - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); - - /* oph->msg stores oph and unitdata msg. Move oph->msg->data to - * unitdata msg and send it again. */ - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(g_bsc_nat->cn->scu, - &g_bsc_nat->cn->addr, - &peer_addr_out, - oph->msg->data, - msgb_length(oph->msg)); break; default: diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index ef12192..72fd751 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -35,6 +35,47 @@ return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); } +int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +{ + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET to %s\n", bsc_nat_print_addr(sccp_inst, addr)); + + struct msgb *msg = gsm0808_create_reset(); + + return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); +} + +static int bssap_cn_handle_reset_ack(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + struct msc *msc = bsc_nat_msc_get(g_bsc_nat); + + if (msc->addr.pc != addr->pc) { + LOGP(DMAIN, LOGL_ERROR, "Unexpected Rx RESET ACK in CN from %s, which is not %s\n", + osmo_ss7_pointcode_print(NULL, addr->pc), talloc_get_name(msc)); + return -1; + } + + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET ACK from %s\n", talloc_get_name(msc)); + msc_fsm_rx_reset_ack(msc); + + return 0; +} + +static int bssap_cn_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + int ret = 0; + + switch (msg->l3h[0]) { + case BSS_MAP_MSG_RESET_ACKNOWLEDGE: + ret = bssap_cn_handle_reset_ack(addr, msg, length); + break; + default: + LOGP(DMAIN, LOGL_NOTICE, "Unimplemented BSSMAP UDT %s\n", gsm0808_bssap_name(msg->l3h[0])); + break; + } + + return ret; +} + static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { struct bsc *bsc; @@ -74,7 +115,8 @@ LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssap_name(msg->l3h[0])); - /* NOTE: bssap_cn_rcvmsg_udt() will be added in a future patch */ + if (sccp_inst == g_bsc_nat->cn) + return bssap_cn_rcvmsg_udt(addr, msg, length - sizeof(struct bssmap_header)); return bssap_ran_rcvmsg_udt(addr, msg, length - sizeof(struct bssmap_header)); } diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c index 30434f4..2b1ae44 100644 --- a/src/osmo-bsc-nat/msc_fsm.c +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -28,19 +28,103 @@ enum msc_fsm_states { MSC_FSM_ST_DISCONNECTED, + MSC_FSM_ST_CONNECTING, + MSC_FSM_ST_CONNECTED, }; +enum msc_fsm_events { + MSC_FSM_EV_TX_RESET, + MSC_FSM_EV_RX_RESET_ACK, + MSC_FSM_EV_DISCONNECT +}; + +static void st_connecting(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case MSC_FSM_EV_RX_RESET_ACK: + osmo_fsm_inst_state_chg(fi, MSC_FSM_ST_CONNECTED, 0, 0); + break; + default: + OSMO_ASSERT(false); + } +} + +static void st_disconnected_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_stat) +{ + osmo_fsm_inst_dispatch(fi, MSC_FSM_EV_TX_RESET, NULL); +} + +static void st_disconnected(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct msc *msc = fi->priv; + + switch (event) { + case MSC_FSM_EV_TX_RESET: + LOGP(DMAIN, LOGL_DEBUG, "Tx RESET to %s\n", talloc_get_name(msc)); + + if (bssap_tx_reset(g_bsc_nat->cn, &msc->addr) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Could not send RESET to MSC (SCCP not up yet?)\n"); + } + + /* Retry in 3s if RESET ACK was not received from MSC */ + osmo_fsm_inst_state_chg(fi, MSC_FSM_ST_CONNECTING, 3, 0); + + break; + default: + OSMO_ASSERT(false); + } +} + +int msc_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->state) { + case MSC_FSM_ST_CONNECTING: + osmo_fsm_inst_state_chg(fi, MSC_FSM_ST_DISCONNECTED, 0, 0); + break; + default: + OSMO_ASSERT(false); + } + return 0; +} + static struct osmo_fsm_state msc_fsm_states[] = { [MSC_FSM_ST_DISCONNECTED] = { .name = "DISCONNECTED", .in_event_mask = 0 + | X(MSC_FSM_EV_TX_RESET) , .out_state_mask = 0 + | X(MSC_FSM_ST_CONNECTING) + , + .action = st_disconnected, + .onenter = st_disconnected_on_enter, + }, + [MSC_FSM_ST_CONNECTING] = { + .name = "CONNECTING", + .in_event_mask = 0 + | X(MSC_FSM_EV_RX_RESET_ACK) + , + .out_state_mask = 0 + | X(MSC_FSM_ST_CONNECTED) + | X(MSC_FSM_ST_DISCONNECTED) + , + .action = st_connecting, + }, + [MSC_FSM_ST_CONNECTED] = { + .name = "CONNECTED", + .in_event_mask = 0 + | X(MSC_FSM_EV_DISCONNECT) + , + .out_state_mask = 0 + | X(MSC_FSM_ST_DISCONNECTED) , }, }; const struct value_string msc_fsm_event_names[] = { + OSMO_VALUE_STRING(MSC_FSM_EV_TX_RESET), + OSMO_VALUE_STRING(MSC_FSM_EV_RX_RESET_ACK), + OSMO_VALUE_STRING(MSC_FSM_EV_DISCONNECT), { 0, NULL } }; @@ -50,6 +134,7 @@ .num_states = ARRAY_SIZE(msc_fsm_states), .log_subsys = DMAIN, .event_names = msc_fsm_event_names, + .timer_cb = msc_fsm_timer_cb, }; static __attribute__((constructor)) void msc_fsm_init(void) @@ -62,3 +147,13 @@ msc->fi = osmo_fsm_inst_alloc(&msc_fsm, msc, msc, LOGL_INFO, NULL); OSMO_ASSERT(msc->fi); } + +void msc_fsm_connect(struct msc *msc) +{ + osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_TX_RESET, NULL); +} + +void msc_fsm_rx_reset_ack(struct msc *msc) +{ + osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_RX_RESET_ACK, NULL); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Icfec3ec0168c7040e88a536fa48da339349fb6cf Gerrit-Change-Number: 27474 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_sccp_inst: local_sccp_addr -> addr

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27470 ) Change subject: bsc_nat_sccp_inst: local_sccp_addr -> addr ...................................................................... bsc_nat_sccp_inst: local_sccp_addr -> addr Make it a bit shorter, it's clear that this refers to the local address of the OsmoBSCNAT in CN/RAN. Related: SYS#5560 Change-Id: I3083374d589487ed960507e7a431c45914afc5dd --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat_fsm.c 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/70/27470/1 diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index e014800..3e47782 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -25,7 +25,7 @@ uint32_t ss7_id; struct osmo_ss7_instance *ss7_inst; - struct osmo_sccp_addr local_sccp_addr; + struct osmo_sccp_addr addr; /* OsmoBSCNAT's local address */ struct osmo_sccp_user *scu; }; diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 94b6658..aa15c06 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -57,10 +57,10 @@ static int sccp_sap_get_peer_addr_in(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr **peer_addr_in, struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) { - if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) != 0) { + if (osmo_sccp_addr_ri_cmp(&src->addr, called_addr) != 0) { *peer_addr_in = called_addr; return 0; - } else if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, calling_addr) != 0) { + } else if (osmo_sccp_addr_ri_cmp(&src->addr, calling_addr) != 0) { *peer_addr_in = calling_addr; return 0; } @@ -73,7 +73,7 @@ LOGP(DMAIN, LOGL_ERROR, "Invalid connection oriented message, locally configured address %s" " is neither called address %s nor calling address %s!\n", - osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr), buf_called, buf_calling); + osmo_sccp_inst_addr_name(NULL, &src->addr), buf_called, buf_calling); return -1; } @@ -127,7 +127,7 @@ msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->ran->scu, prim->u.connect.conn_id, - &g_bsc_nat->ran->local_sccp_addr, + &g_bsc_nat->ran->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -196,7 +196,7 @@ * unitdata msg and send it again. */ msgb_pull_to_l2(oph->msg); osmo_sccp_tx_unitdata(g_bsc_nat->ran->scu, - &g_bsc_nat->ran->local_sccp_addr, + &g_bsc_nat->ran->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -241,7 +241,7 @@ msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->cn->scu, prim->u.connect.conn_id, - &g_bsc_nat->cn->local_sccp_addr, + &g_bsc_nat->cn->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -310,7 +310,7 @@ * unitdata msg and send it again. */ msgb_pull_to_l2(oph->msg); osmo_sccp_tx_unitdata(g_bsc_nat->cn->scu, - &g_bsc_nat->cn->local_sccp_addr, + &g_bsc_nat->cn->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -345,7 +345,7 @@ sccp_inst->ss7_inst = osmo_ss7_instance_find(sccp_inst->ss7_id); - osmo_sccp_local_addr_by_instance(&sccp_inst->local_sccp_addr, sccp, ssn); + osmo_sccp_local_addr_by_instance(&sccp_inst->addr, sccp, ssn); sccp_inst->scu = osmo_sccp_user_bind(sccp, name, prim_cb, ssn); if (!sccp_inst->scu) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3083374d589487ed960507e7a431c45914afc5dd Gerrit-Change-Number: 27470 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: split up sccp_sap_up in _cn, _ran

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27469 ) Change subject: bsc_nat_fsm: split up sccp_sap_up in _cn, _ran ...................................................................... bsc_nat_fsm: split up sccp_sap_up in _cn, _ran Prepare for future patches where more will happen in the callback function. Split it up into two functions, one for CN and one for RAN, so we don't need to constantly think through both cases while changing/trying to understand the function. Related: SYS#5560 Change-Id: I8eb8f24ad33a59de8fbaf512547d389ee86c13dc --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 159 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/69/27469/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index a0ff4d2..94b6658 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -99,91 +99,220 @@ return 0; } -/* Handle incoming messages. For now this is simplified by assuming there is - * only one MSC, one BSC (not yet translating connection ids etc.). */ -static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) +/* Handle incoming messages from CN (MSC). For now this is simplified by + * assuming there is only one MSC, one BSC (not yet translating connection ids + * etc.). */ +static int sccp_sap_up_cn(struct osmo_prim_hdr *oph, void *scu) { - struct bsc_nat_sccp_inst *src = osmo_sccp_user_get_priv(scu); - struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); + struct bsc_nat_sccp_inst *sccp_inst = osmo_sccp_user_get_priv(scu); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; - struct osmo_sccp_addr *peer_addr_in; + struct osmo_sccp_addr *addr; /* MSC's address */ struct osmo_sccp_addr peer_addr_out; int rc = -1; - LOGP(DMAIN, LOGL_DEBUG, "Rx %s from %s\n", osmo_scu_prim_name(oph), src == g_bsc_nat->cn ? "CN" : "RAN"); + LOGP(DMAIN, LOGL_DEBUG, "Rx %s from CN\n", osmo_scu_prim_name(oph)); switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(dest->scu, prim->u.connect.conn_id, &dest->local_sccp_addr, &peer_addr_out, - oph->msg->data, msgb_length(oph->msg)); + osmo_sccp_tx_conn_req(g_bsc_nat->ran->scu, + prim->u.connect.conn_id, + &g_bsc_nat->ran->local_sccp_addr, + &peer_addr_out, + oph->msg->data, + msgb_length(oph->msg)); rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): /* indication of connection confirm */ - if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, + osmo_sccp_tx_conn_resp(g_bsc_nat->ran->scu, + prim->u.connect.conn_id, + &peer_addr_out, + oph->msg->data, msgb_length(oph->msg)); rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ - if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) + if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(dest->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); + osmo_sccp_tx_data(g_bsc_nat->ran->scu, + prim->u.data.conn_id, + oph->msg->data, + msgb_length(oph->msg)); rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): /* indication of disconnect */ - if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) + if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); - osmo_sccp_tx_disconn(dest->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, + osmo_sccp_tx_disconn(g_bsc_nat->ran->scu, + prim->u.disconnect.conn_id, + &prim->u.disconnect.responding_addr, prim->u.disconnect.cause); rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ - peer_addr_in = &prim->u.unitdata.calling_addr; + addr = &prim->u.unitdata.calling_addr; - if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(dest->scu, &dest->local_sccp_addr, &peer_addr_out, oph->msg->data, + osmo_sccp_tx_unitdata(g_bsc_nat->ran->scu, + &g_bsc_nat->ran->local_sccp_addr, + &peer_addr_out, + oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + + default: + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, osmo_scu_prim_name(oph)); + break; + } + +error: + msgb_free(oph->msg); + return rc; +} + +/* Handle incoming messages from RAN (BSC). For now this is simplified by + * assuming there is only one MSC, one BSC (not yet translating connection ids + * etc.). */ +static int sccp_sap_up_ran(struct osmo_prim_hdr *oph, void *scu) +{ + struct bsc_nat_sccp_inst *sccp_inst = osmo_sccp_user_get_priv(scu); + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; + struct osmo_sccp_addr *addr; /* BSC's address */ + struct osmo_sccp_addr peer_addr_out; + int rc = -1; + + LOGP(DMAIN, LOGL_DEBUG, "Rx %s from RAN\n", osmo_scu_prim_name(oph)); + + switch (OSMO_PRIM_HDR(oph)) { + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): + /* indication of new inbound connection request */ + if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + goto error; + + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_req(g_bsc_nat->cn->scu, + prim->u.connect.conn_id, + &g_bsc_nat->cn->local_sccp_addr, + &peer_addr_out, + oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): + /* indication of connection confirm */ + if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + goto error; + + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_resp(g_bsc_nat->cn->scu, + prim->u.connect.conn_id, + &peer_addr_out, + oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): + /* connection-oriented data received */ + if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) + goto error; + + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_data(g_bsc_nat->cn->scu, + prim->u.data.conn_id, + oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): + /* indication of disconnect */ + if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) + goto error; + + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + + osmo_sccp_tx_disconn(g_bsc_nat->cn->scu, + prim->u.disconnect.conn_id, + &prim->u.disconnect.responding_addr, + prim->u.disconnect.cause); + rc = 0; + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): + /* connection-less data received */ + addr = &prim->u.unitdata.calling_addr; + + if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + goto error; + + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + + /* oph->msg stores oph and unitdata msg. Move oph->msg->data to + * unitdata msg and send it again. */ + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_unitdata(g_bsc_nat->cn->scu, + &g_bsc_nat->cn->local_sccp_addr, + &peer_addr_out, + oph->msg->data, msgb_length(oph->msg)); rc = 0; break; @@ -199,7 +328,7 @@ } static int sccp_inst_init(struct bsc_nat_sccp_inst *sccp_inst, const char *name, const char *default_pc_str, - enum osmo_sccp_ssn ssn) + osmo_prim_cb prim_cb, enum osmo_sccp_ssn ssn) { int default_pc; struct osmo_sccp_instance *sccp; @@ -218,7 +347,7 @@ osmo_sccp_local_addr_by_instance(&sccp_inst->local_sccp_addr, sccp, ssn); - sccp_inst->scu = osmo_sccp_user_bind(sccp, name, sccp_sap_up, ssn); + sccp_inst->scu = osmo_sccp_user_bind(sccp, name, prim_cb, ssn); if (!sccp_inst->scu) { LOGP(DMAIN, LOGL_ERROR, "%s: failed to bind sccp user\n", name); return -2; @@ -245,12 +374,12 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - if (sccp_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, sccp_sap_up_cn, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } - if (sccp_inst_init(bsc_nat->ran, "OsmoBSCNAT-RAN", DEFAULT_PC_RAN, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->ran, "OsmoBSCNAT-RAN", DEFAULT_PC_RAN, sccp_sap_up_ran, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I8eb8f24ad33a59de8fbaf512547d389ee86c13dc Gerrit-Change-Number: 27469 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Reply to BSC's RESET with RESET ACK directly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27471 ) Change subject: Reply to BSC's RESET with RESET ACK directly ...................................................................... Reply to BSC's RESET with RESET ACK directly Let the BSCNAT directly reply to RESET sent from BSC with RESET ACK. bssap_ran_handle_reset() is a bit empty right now but will be used in a future patch to store the BSC. Related: SYS#5560 Related: https://osmocom.org/projects/osmo-bscnat/wiki/AoIP_OsmoBSCNAT#RESET Change-Id: I3223409e25c93b625d67634caf68efe9772e2558 --- M include/osmocom/bsc_nat/Makefile.am A include/osmocom/bsc_nat/bssap.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat_fsm.c A src/osmo-bsc-nat/bssap.c 5 files changed, 133 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/71/27471/1 diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 90f44a7..76aada0 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = \ bsc_nat.h \ bsc_nat_fsm.h \ + bssap.h \ logging.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h new file mode 100644 index 0000000..1a9324a --- /dev/null +++ b/include/osmocom/bsc_nat/bssap.h @@ -0,0 +1,24 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * 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/lienses/>. + * + */ +#pragma once + +#include <osmocom/bsc_nat/bsc_nat.h> + +int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, + unsigned int length); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 6a759cb..445c098 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -27,6 +27,7 @@ osmo_bsc_nat_SOURCES = \ bsc_nat.c \ bsc_nat_fsm.c \ + bssap.c \ logging.c \ main.c \ vty.c \ diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index aa15c06..3091687 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -21,6 +21,7 @@ #include <errno.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/bsc_nat/bssap.h> #include <osmocom/bsc_nat/logging.h> #include <osmocom/core/fsm.h> #include <osmocom/core/select.h> @@ -299,6 +300,10 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ + rc = bssap_handle_udt(sccp_inst, &prim->u.unitdata.calling_addr, oph->msg, msgb_l2len(oph->msg)); + + /* FIXME: don't forward this to the MSC anymore, as soon as the + * BSCNAT is able to do the RESET to MSC by itself. */ addr = &prim->u.unitdata.calling_addr; if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) @@ -314,7 +319,6 @@ &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); - rc = 0; break; default: diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c new file mode 100644 index 0000000..dfeea73 --- /dev/null +++ b/src/osmo-bsc-nat/bssap.c @@ -0,0 +1,102 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * 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/lienses/>. + * + */ + +#include "config.h" +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/sigtran/sccp_sap.h> + +static int tx_reset_ack(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +{ + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr(sccp_inst, addr)); + + struct msgb *msg = gsm0808_create_reset_ack(); + + return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); +} + +static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(g_bsc_nat->ran, addr)); + return tx_reset_ack(g_bsc_nat->ran, addr); +} + +static int bssap_ran_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + int ret = 0; + + switch (msg->l3h[0]) { + case BSS_MAP_MSG_RESET: + ret = bssap_ran_handle_reset(addr, msg, length); + break; + default: + LOGP(DMAIN, LOGL_NOTICE, "Unimplemented BSSMAP UDT %s\n", gsm0808_bssap_name(msg->l3h[0])); + break; + } + + return ret; +} + +static int bssap_rcvmsg_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msg, + unsigned int length) +{ + if (length < 1) { + LOGP(DMAIN, LOGL_ERROR, "Not enough room: %u\n", length); + return -1; + } + + LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssap_name(msg->l3h[0])); + + /* NOTE: bssap_cn_rcvmsg_udt() will be added in a future patch */ + return bssap_ran_rcvmsg_udt(addr, msg, length - sizeof(struct bssmap_header)); +} + +int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, + unsigned int length) +{ + struct bssmap_header *bs; + int rc = -1; + + LOGP(DMAIN, LOGL_DEBUG, "Rx UDT: %s\n", osmo_hexdump(msgb->l2h, length)); + + if (length < sizeof(*bs)) { + LOGP(DMAIN, LOGL_ERROR, "The header is too short\n"); + return -1; + } + + bs = (struct bssmap_header *)msgb->l2h; + if (bs->length < length - sizeof(*bs)) { + LOGP(DMAIN, LOGL_ERROR, "Failed to parse BSSMAP header\n"); + return -1; + } + + switch (bs->type) { + case BSSAP_MSG_BSS_MANAGEMENT: + msgb->l3h = &msgb->l2h[sizeof(*bs)]; + rc = bssap_rcvmsg_udt(sccp_inst, addr, msgb, length - sizeof(*bs)); + break; + default: + LOGP(DMAIN, LOGL_NOTICE, "Unimplemented msg type: %s\n", gsm0808_bssap_name(bs->type)); + } + + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3223409e25c93b625d67634caf68efe9772e2558 Gerrit-Change-Number: 27471 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: log prim_name once, not in each case

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27466 ) Change subject: bsc_nat_fsm: log prim_name once, not in each case ...................................................................... bsc_nat_fsm: log prim_name once, not in each case Move the log message outside of the switch case to make it a bit shorter. Use LOGP instead of LOG_SCCP, because the latter is about to get removed in a follow-up patch. Related: SYS#5560 Change-Id: I1f181ff38f86d83969da4e9d3da72dd9d69d298a --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/66/27466/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 3e10749..f0f28f8 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -122,11 +122,11 @@ struct osmo_sccp_addr peer_addr_out; int rc = -1; + LOGP(DMAIN, LOGL_DEBUG, "Rx %s from %s\n", osmo_scu_prim_name(oph), src == g_bsc_nat->cn ? "CN" : "RAN"); + switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; @@ -146,8 +146,6 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): /* indication of connection confirm */ - LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; @@ -167,8 +165,6 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ - LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) goto error; @@ -183,8 +179,6 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): /* indication of disconnect */ - LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) goto error; @@ -200,7 +194,6 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ peer_addr_in = &prim->u.unitdata.calling_addr; - LOG_SCCP(src, peer_addr_in, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) goto error; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I1f181ff38f86d83969da4e9d3da72dd9d69d298a Gerrit-Change-Number: 27466 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: tweak forwarding log messages

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27467 ) Change subject: bsc_nat_fsm: tweak forwarding log messages ...................................................................... bsc_nat_fsm: tweak forwarding log messages Shorten them and don't use the LOG_SCCP macro anymore that will be dropped in a follow-up patch. Change the level to DEBUG. Related: SYS#5560 Change-Id: I85f65ad3c15a10958fbfe97aef00fc386e85ef63 --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c 3 files changed, 17 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/67/27467/1 diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index a1e3da8..e014800 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -39,5 +39,7 @@ struct bsc_nat *bsc_nat_alloc(void *tall_ctx); void bsc_nat_free(struct bsc_nat *bsc_nat); +const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); + extern void *tall_bsc_nat_ctx; extern struct bsc_nat *g_bsc_nat; diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 7741184..579c6aa 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -52,3 +52,13 @@ talloc_free(bsc_nat); } + +const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +{ + static char buf[25]; + + snprintf(buf, sizeof(buf), "PC=%s in %s", osmo_ss7_pointcode_print(NULL, addr->pc), + sccp_inst == g_bsc_nat->cn ? "CN" : "RAN"); + + return buf; +} diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index f0f28f8..4d71420 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -134,9 +134,7 @@ if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) goto error; - LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &peer_addr_out), - dest == g_bsc_nat->ran ? "RAN" : "CN"); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(dest->scu, prim->u.connect.conn_id, &dest->local_sccp_addr, &peer_addr_out, @@ -153,9 +151,7 @@ if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) goto error; - LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &peer_addr_out), - dest == g_bsc_nat->ran ? "RAN" : "CN"); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, @@ -168,9 +164,7 @@ if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) goto error; - LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &peer_addr_out), - dest == g_bsc_nat->ran ? "RAN" : "CN"); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(dest->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); @@ -182,9 +176,7 @@ if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) goto error; - LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &peer_addr_out), - dest == g_bsc_nat->ran ? "RAN" : "CN"); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); osmo_sccp_tx_disconn(dest->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, prim->u.disconnect.cause); @@ -198,9 +190,7 @@ if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) goto error; - LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &peer_addr_out), - dest == g_bsc_nat->ran ? "RAN" : "CN"); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(dest, &peer_addr_out)); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I85f65ad3c15a10958fbfe97aef00fc386e85ef63 Gerrit-Change-Number: 27467 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: drop LOG_SCCP macro

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27468 ) Change subject: bsc_nat_fsm: drop LOG_SCCP macro ...................................................................... bsc_nat_fsm: drop LOG_SCCP macro After implementing more functionallity (see follow-up patches), it became clear that this macro is not so useful: * Using the macro creates unnecessary overhead, 'LOG_SCCP(sccp_inst, peer_addr_in,' is much longer than 'LOGP(' * The RI and SSN are always the same, so it's not useful to print them all the time, this is the generated prefix: '(RI=SSN_PC,PC=0.23.3,SSN=BSSAP from CN)' Related: SYS#5560 Change-Id: I49187d4e3d804c4786ee52eaebdd911e6c6cfa6c --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 4 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/68/27468/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 4d71420..a0ff4d2 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -32,18 +32,6 @@ #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ -static char log_buf[255]; - -#define LOG_SCCP(sccp_inst, peer_addr_in, level, fmt, args...) do { \ - if (peer_addr_in) \ - osmo_sccp_addr_to_str_buf(log_buf, sizeof(log_buf), NULL, peer_addr_in); \ - LOGP(DMAIN, level, "(%s%s%s) " fmt, \ - peer_addr_in ? log_buf : "", \ - peer_addr_in ? " from " : "", \ - sccp_inst == g_bsc_nat->ran ? "RAN" : "CN", \ - ## args); \ -} while (0) - #define X(s) (1 << (s)) enum bsc_nat_fsm_states { @@ -83,7 +71,7 @@ osmo_sccp_addr_to_str_buf(buf_called, sizeof(buf_called), NULL, called_addr); osmo_sccp_addr_to_str_buf(buf_calling, sizeof(buf_calling), NULL, calling_addr); - LOG_SCCP(src, NULL, LOGL_ERROR, "Invalid connection oriented message, locally configured address %s" + LOGP(DMAIN, LOGL_ERROR, "Invalid connection oriented message, locally configured address %s" " is neither called address %s nor calling address %s!\n", osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr), buf_called, buf_calling); return -1; @@ -98,12 +86,12 @@ if (src == g_bsc_nat->ran) { if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest->ss7_inst) < 0) { - LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find MSC in address book\n"); + LOGP(DMAIN, LOGL_ERROR, "Could not find MSC in address book\n"); return -1; } } else { if (osmo_sccp_addr_by_name_local(peer_addr_out, "bsc", dest->ss7_inst) < 0) { - LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find BSC in address book\n"); + LOGP(DMAIN, LOGL_ERROR, "Could not find BSC in address book\n"); return -2; } } @@ -201,7 +189,7 @@ break; default: - LOG_SCCP(src, NULL, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, osmo_scu_prim_name(oph)); + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, osmo_scu_prim_name(oph)); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I49187d4e3d804c4786ee52eaebdd911e6c6cfa6c Gerrit-Change-Number: 27468 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: move conn.ind before conn.conf

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27464 ) Change subject: bsc_nat_fsm: move conn.ind before conn.conf ...................................................................... bsc_nat_fsm: move conn.ind before conn.conf conn.ind happens before conn.conf, so use the same order in the switch statement. Related: SYS#5560 Change-Id: Ibdb5a9b092ab481f35cf5920f3635fdf4a9b85c2 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/64/27464/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index b4e0516..085cafd 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -128,27 +128,6 @@ int rc = -1; switch (OSMO_PRIM_HDR(oph)) { - case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): - /* indication of connection confirm */ - LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); - - if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, - &prim->u.connect.calling_addr) < 0) - goto error; - - if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) - goto error; - - LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", - osmo_sccp_inst_addr_name(NULL, &peer_addr_out), - dest == g_bsc_nat->ran ? "RAN" : "CN"); - - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, - msgb_length(oph->msg)); - rc = 0; - break; - case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); @@ -170,6 +149,27 @@ rc = 0; break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): + /* indication of connection confirm */ + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ibdb5a9b092ab481f35cf5920f3635fdf4a9b85c2 Gerrit-Change-Number: 27464 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022