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

Change in osmo-bsc-nat[master]: README: add Manual Testing With osmo-dev

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 ) Change subject: README: add Manual Testing With osmo-dev ...................................................................... README: add Manual Testing With osmo-dev Describe the manual testing that can be done with osmo-dev with the changes up to I78ef36c72ff9a7b801e922eccc89dc44fbba7f23. Related: SYS#5560 Change-Id: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd --- M README.md 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index 8ed9954..ca367a2 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,29 @@ [Osmocom Mailing List Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_Li… when posting. +Manual Testing With osmo-dev +---------- + +With [osmo-dev](https://git.osmocom.org/osmo-dev/) it is possible to +build all Osmocom components for a full test network with OsmoBSCNAT, +and run the network on your PC. Set up the make directory as described +in osmo-dev's README, then build components with: + +``` +$ make cn-bsc-nat +``` + +Set up a network as described in osmo-dev's net/README, then put the +following in your configuration to let it run osmo-bsc-nat with one +virtual BSC, BTS and MS (can be used next to a real BSC/BTS/MS): + +``` +BSC_COUNT=2 +BTS1_RUN_IN_OSMO_DEV=1 +STP_RAN_IP="127.0.0.2" +MS_RUN_IN_OSMO_DEV=1 +``` + Contributing ------------ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 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: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd Gerrit-Change-Number: 27478 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: README: add Manual Testing With osmo-dev

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 ) Change subject: README: add Manual Testing With osmo-dev ...................................................................... Patch Set 5: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 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: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd Gerrit-Change-Number: 27478 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 09:22:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: sccp_sap_up_ran: ignore RAN until MSC is connected

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27475 ) Change subject: sccp_sap_up_ran: ignore RAN until MSC is connected ...................................................................... sccp_sap_up_ran: ignore RAN until MSC is connected Related: SYS#5560 Change-Id: Idf9501412484fa92e8836952609fba7c5443d6c9 --- M include/osmocom/bsc_nat/msc.h M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/msc_fsm.c 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h index 47b4d13..db42526 100644 --- a/include/osmocom/bsc_nat/msc.h +++ b/include/osmocom/bsc_nat/msc.h @@ -36,4 +36,6 @@ void msc_tx_reset(struct msc *msc); void msc_rx_reset_ack(struct msc *msc); +bool msc_is_connected(struct msc *msc); + void msc_free(struct msc *msc); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 1d92ba3..ad10ea2 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -29,6 +29,7 @@ #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/bssap.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ @@ -208,10 +209,17 @@ 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; + struct msc *msc; int rc = -1; LOGP(DMAIN, LOGL_DEBUG, "Rx %s from RAN\n", osmo_scu_prim_name(oph)); + msc = msc_get(); + if (!msc_is_connected(msc)) { + LOGP(DMAIN, LOGL_DEBUG, "Ignoring message from RAN, MSC is not connected yet\n"); + goto error; + } + switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c index d8b89c6..e660c57 100644 --- a/src/osmo-bsc-nat/msc_fsm.c +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -152,3 +152,8 @@ { osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_RX_RESET_ACK, NULL); } + +bool msc_is_connected(struct msc *msc) +{ + return msc->fi->state == MSC_FSM_ST_CONNECTED; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27475 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: Idf9501412484fa92e8836952609fba7c5443d6c9 Gerrit-Change-Number: 27475 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Support forwarding messages with multiple BSCs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 ) Change subject: Support forwarding messages with multiple BSCs ...................................................................... Support forwarding messages with multiple BSCs Implement a proper subscriber connection mapping. Create a new subscr_conn when one of the stored BSCs sends a conn.ind and use that subscr_conn for all related connection-oriented messages with the same RAN-side conn_id to send messages back and forth between BSC and MSC. Add subscr_conn_get_next_id based on OsmoBSC's bsc_sccp_inst_next_conn_id. With this patch, it's possible to do a successful Location Updating procedure between MS2 and MSC in the following network: MS1 --- BTS1 --- BSC1 --. BSCNAT --- MSC MS2 --- BTS2 --- BSC2 --' Related: SYS#5560 Change-Id: I1556aa665fbb0a97507f98794e74820731fa6935 --- M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M include/osmocom/bsc_nat/Makefile.am M include/osmocom/bsc_nat/bsc.h M include/osmocom/bsc_nat/bsc_nat.h M include/osmocom/bsc_nat/msc.h A include/osmocom/bsc_nat/subscr_conn.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc.c M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/msc.c A src/osmo-bsc-nat/subscr_conn.c 12 files changed, 258 insertions(+), 85 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg index f56dcb0..2f5ff39 100644 --- a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg +++ b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg @@ -13,10 +13,6 @@ asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua remote-ip 127.0.0.2 local-ip 127.0.0.4 - sccp-address bsc - routing-indicator PC - point-code 0.23.3 - subsystem-number 254 bsc-nat cs7-instance-cn 0 diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 1c675f7..81dacad 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -5,5 +5,6 @@ bssap.h \ logging.h \ msc.h \ + subscr_conn.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bsc.h b/include/osmocom/bsc_nat/bsc.h index 34590b9..7c11a82 100644 --- a/include/osmocom/bsc_nat/bsc.h +++ b/include/osmocom/bsc_nat/bsc.h @@ -29,3 +29,4 @@ struct bsc *bsc_alloc(struct osmo_sccp_addr *addr); struct bsc *bsc_get_by_pc(uint32_t pointcode); void bsc_free(struct bsc *bsc); +void bsc_free_subscr_conn_all(struct bsc *bsc); diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 9e58a79..93717cc 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -37,14 +37,17 @@ struct bsc_nat { struct osmo_fsm_inst *fi; + struct llist_head subscr_conns; /* list of struct subscr_conn */ struct { struct bsc_nat_sccp_inst *sccp_inst; + uint32_t subscr_conn_id_next; struct llist_head mscs; /* list of struct msc */ } cn; struct { struct bsc_nat_sccp_inst *sccp_inst; + uint32_t subscr_conn_id_next; struct llist_head bscs; /* list of struct bsc */ } ran; }; diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h index db42526..77fc001 100644 --- a/include/osmocom/bsc_nat/msc.h +++ b/include/osmocom/bsc_nat/msc.h @@ -39,3 +39,4 @@ bool msc_is_connected(struct msc *msc); void msc_free(struct msc *msc); +void msc_free_subscr_conn_all(struct msc *msc); diff --git a/include/osmocom/bsc_nat/subscr_conn.h b/include/osmocom/bsc_nat/subscr_conn.h new file mode 100644 index 0000000..696e0c3 --- /dev/null +++ b/include/osmocom/bsc_nat/subscr_conn.h @@ -0,0 +1,43 @@ +/* (C) 2021 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 + +/* connection for one subscriber */ +struct subscr_conn { + struct llist_head list; + + struct { + uint32_t id; + struct msc *msc; + } cn; + + struct { + uint32_t id; + struct bsc *bsc; + } ran; +}; + +int subscr_conn_get_next_id(enum bsc_nat_net net); + +struct subscr_conn *subscr_conn_alloc(struct msc *msc, struct bsc *bsc, uint32_t id_cn, uint32_t id_ran); + +struct subscr_conn *subscr_conn_get_by_id(uint32_t id, enum bsc_nat_net net); + +void subscr_conn_free(struct subscr_conn *subscr_conn); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 8fd5667..e2b11ca 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -33,6 +33,7 @@ main.c \ msc.c \ msc_fsm.c \ + subscr_conn.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc.c b/src/osmo-bsc-nat/bsc.c index 2ad6e0e..0461909 100644 --- a/src/osmo-bsc-nat/bsc.c +++ b/src/osmo-bsc-nat/bsc.c @@ -21,6 +21,7 @@ #include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/subscr_conn.h> struct bsc *bsc_alloc(struct osmo_sccp_addr *addr) { @@ -51,9 +52,20 @@ return NULL; } +void bsc_free_subscr_conn_all(struct bsc *bsc) +{ + struct subscr_conn *subscr_conn; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if (subscr_conn->ran.bsc == bsc) + subscr_conn_free(subscr_conn); + } +} + void bsc_free(struct bsc *bsc) { LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(bsc)); + bsc_free_subscr_conn_all(bsc); llist_del(&bsc->list); talloc_free(bsc); } diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 23d7498..7ba24e6 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include <inttypes.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/bsc_nat/bsc.h> @@ -25,6 +26,7 @@ #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> #include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/subscr_conn.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { @@ -41,6 +43,7 @@ OSMO_ASSERT(bsc_nat->ran.sccp_inst); talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->subscr_conns); INIT_LLIST_HEAD(&bsc_nat->cn.mscs); INIT_LLIST_HEAD(&bsc_nat->ran.bscs); @@ -51,6 +54,7 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct subscr_conn *subscr_conn, *s; struct msc *msc, *m; struct bsc *bsc, *b; @@ -59,6 +63,10 @@ bsc_nat->fi = NULL; } + llist_for_each_entry_safe(subscr_conn, s, &bsc_nat->subscr_conns, list) { + subscr_conn_free(subscr_conn); + } + llist_for_each_entry_safe(msc, m, &bsc_nat->cn.mscs, list) { msc_free(msc); } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index ad10ea2..090c38f 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -19,17 +19,20 @@ #include "config.h" #include <errno.h> +#include <inttypes.h> #include <stdint.h> #include <osmocom/core/fsm.h> #include <osmocom/core/select.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/bsc_nat/bsc.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/bsc_nat/msc.h> +#include <osmocom/bsc_nat/subscr_conn.h> #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ @@ -47,13 +50,6 @@ BSC_NAT_FSM_EV_STOP, }; -static struct bsc_nat_sccp_inst *sccp_inst_dest(struct bsc_nat_sccp_inst *src) -{ - if (src == g_bsc_nat->cn.sccp_inst) - return g_bsc_nat->ran.sccp_inst; - return g_bsc_nat->cn.sccp_inst; -} - /* For connection-oriented messages, figure out which side is not the BSCNAT, * either the called_addr or calling_addr. */ static int sccp_sap_get_peer_addr_in(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr **peer_addr_in, @@ -79,37 +75,13 @@ return -1; } -/* Figure out who will receive the message. - * For now this is simplified by assuming there is only one MSC, one BSC. */ -static int sccp_sap_get_peer_addr_out(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr *peer_addr_in, - struct osmo_sccp_addr *peer_addr_out) -{ - struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); - - if (src == g_bsc_nat->ran.sccp_inst) { - if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest->ss7_inst) < 0) { - 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) { - LOGP(DMAIN, LOGL_ERROR, "Could not find BSC in address book\n"); - return -2; - } - } - - return 0; -} - -/* 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.). */ +/* Handle incoming messages from CN (MSC) */ static int sccp_sap_up_cn(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; /* MSC's address */ - struct osmo_sccp_addr peer_addr_out; + struct subscr_conn *subscr_conn; int rc = -1; LOGP(DMAIN, LOGL_DEBUG, "Rx %s from CN\n", osmo_scu_prim_name(oph)); @@ -117,23 +89,9 @@ 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_ran(&peer_addr_out)); - - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(g_bsc_nat->ran.sccp_inst->scu, - prim->u.connect.conn_id, - &g_bsc_nat->ran.sccp_inst->addr, - &peer_addr_out, - oph->msg->data, - msgb_length(oph->msg)); - rc = 0; + /* FIXME: MSC has sent a message without conn_id, figure out to + * which BSC to forward this. */ + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, osmo_scu_prim_name(oph)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): @@ -142,15 +100,19 @@ &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_CN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.connect.conn_id, + bsc_nat_print_addr_cn(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->ran.sccp_inst->scu, - prim->u.connect.conn_id, - &peer_addr_out, + subscr_conn->ran.id, + &subscr_conn->ran.bsc->addr, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -158,14 +120,18 @@ 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) + subscr_conn = subscr_conn_get_by_id(prim->u.data.conn_id, BSC_NAT_NET_CN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.data.conn_id, + bsc_nat_print_addr_cn(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->ran.sccp_inst->scu, - prim->u.data.conn_id, + subscr_conn->ran.id, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -173,15 +139,22 @@ 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) + subscr_conn = subscr_conn_get_by_id(prim->u.disconnect.conn_id, BSC_NAT_NET_CN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.disconnect.conn_id, + bsc_nat_print_addr_cn(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); osmo_sccp_tx_disconn(g_bsc_nat->ran.sccp_inst->scu, - prim->u.disconnect.conn_id, - &prim->u.disconnect.responding_addr, + subscr_conn->ran.id, + &g_bsc_nat->ran.sccp_inst->addr, prim->u.disconnect.cause); + + subscr_conn_free(subscr_conn); + rc = 0; break; @@ -200,16 +173,15 @@ 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.). */ +/* Handle incoming messages from RAN (BSC) */ 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; + struct subscr_conn *subscr_conn; struct msc *msc; + struct bsc *bsc; int rc = -1; LOGP(DMAIN, LOGL_DEBUG, "Rx %s from RAN\n", osmo_scu_prim_name(oph)); @@ -227,16 +199,25 @@ &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; + bsc = bsc_get_by_pc(addr->pc); + if (!bsc) + bsc = bsc_alloc(addr); - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + if (subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_RAN)) { + LOGP(DMAIN, LOGL_ERROR, "%s attempted to create new connection with already used" + " conn_id=%" PRIu32 ", ignoring\n", talloc_get_name(bsc), prim->u.connect.conn_id); + goto error; + } + + subscr_conn = subscr_conn_alloc(msc, bsc, subscr_conn_get_next_id(BSC_NAT_NET_CN), prim->u.connect.conn_id); + + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->cn.sccp_inst->scu, - prim->u.connect.conn_id, + subscr_conn->cn.id, &g_bsc_nat->cn.sccp_inst->addr, - &peer_addr_out, + &subscr_conn->cn.msc->addr, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -248,15 +229,19 @@ &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_RAN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.connect.conn_id, + bsc_nat_print_addr_ran(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->cn.sccp_inst->scu, - prim->u.connect.conn_id, - &peer_addr_out, + subscr_conn->cn.id, + &subscr_conn->cn.msc->addr, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -264,14 +249,18 @@ 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) + subscr_conn = subscr_conn_get_by_id(prim->u.data.conn_id, BSC_NAT_NET_RAN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.data.conn_id, + bsc_nat_print_addr_ran(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->cn.sccp_inst->scu, - prim->u.data.conn_id, + subscr_conn->cn.id, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -279,15 +268,22 @@ 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) + subscr_conn = subscr_conn_get_by_id(prim->u.disconnect.conn_id, BSC_NAT_NET_RAN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.disconnect.conn_id, + bsc_nat_print_addr_ran(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); osmo_sccp_tx_disconn(g_bsc_nat->cn.sccp_inst->scu, - prim->u.disconnect.conn_id, - &prim->u.disconnect.responding_addr, + subscr_conn->cn.id, + &g_bsc_nat->cn.sccp_inst->addr, prim->u.disconnect.cause); + + subscr_conn_free(subscr_conn); + rc = 0; break; diff --git a/src/osmo-bsc-nat/msc.c b/src/osmo-bsc-nat/msc.c index e78a8e6..4204bac 100644 --- a/src/osmo-bsc-nat/msc.c +++ b/src/osmo-bsc-nat/msc.c @@ -22,6 +22,7 @@ #include <osmocom/bsc_nat/msc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/subscr_conn.h> extern struct osmo_fsm msc_fsm; @@ -70,9 +71,20 @@ return llist_first_entry(&g_bsc_nat->cn.mscs, struct msc, list); } +void msc_free_subscr_conn_all(struct msc *msc) +{ + struct subscr_conn *subscr_conn; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if (subscr_conn->cn.msc == msc) + subscr_conn_free(subscr_conn); + } +} + void msc_free(struct msc *msc) { LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); + msc_free_subscr_conn_all(msc); llist_del(&msc->list); osmo_fsm_inst_free(msc->fi); talloc_free(msc); diff --git a/src/osmo-bsc-nat/subscr_conn.c b/src/osmo-bsc-nat/subscr_conn.c new file mode 100644 index 0000000..02afb7d --- /dev/null +++ b/src/osmo-bsc-nat/subscr_conn.c @@ -0,0 +1,99 @@ +/* (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 <inttypes.h> +#include <osmocom/core/talloc.h> +#include <osmocom/bsc_nat/bsc.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/subscr_conn.h> +#include <osmocom/bsc_nat/logging.h> + +/* Get the next available id in either CN or RAN. */ +int subscr_conn_get_next_id(enum bsc_nat_net net) +{ + uint32_t *id; + + if (net == BSC_NAT_NET_RAN) + id = &g_bsc_nat->ran.subscr_conn_id_next; + else + id = &g_bsc_nat->cn.subscr_conn_id_next; + + for (int i = 0; i < 0xFFFFFF; i++) { + struct subscr_conn *subscr_conn; + bool already_used = false; + + *id = (*id + 1) & 0xffffff; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if ((net == BSC_NAT_NET_RAN && subscr_conn->ran.id == *id) + || (net == BSC_NAT_NET_CN && subscr_conn->cn.id == *id)) { + already_used = true; + break; + } + } + + if (!already_used) + return *id; + } + return -1; +} + +struct subscr_conn *subscr_conn_alloc(struct msc *msc, struct bsc *bsc, uint32_t id_cn, uint32_t id_ran) +{ + struct subscr_conn *subscr_conn = talloc_zero(g_bsc_nat, struct subscr_conn); + + OSMO_ASSERT(subscr_conn); + talloc_set_name(subscr_conn, "SUBSCR-CONN %s:%" PRIu32 " <=> %s:%" PRIu32, + talloc_get_name(msc), id_cn, + talloc_get_name(bsc), id_ran); + + LOGP(DMAIN, LOGL_DEBUG, "Add %s\n", talloc_get_name(subscr_conn)); + + subscr_conn->cn.id = id_cn; + subscr_conn->cn.msc = msc; + subscr_conn->ran.id = id_ran; + subscr_conn->ran.bsc = bsc; + + INIT_LLIST_HEAD(&subscr_conn->list); + llist_add(&subscr_conn->list, &g_bsc_nat->subscr_conns); + + return subscr_conn; +} + +struct subscr_conn *subscr_conn_get_by_id(uint32_t id, enum bsc_nat_net net) +{ + struct subscr_conn *subscr_conn; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if ((net == BSC_NAT_NET_RAN && subscr_conn->ran.id == id) + || (net == BSC_NAT_NET_CN && subscr_conn->cn.id == id)) + return subscr_conn; + } + + return NULL; +} + +void subscr_conn_free(struct subscr_conn *subscr_conn) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(subscr_conn)); + llist_del(&subscr_conn->list); + talloc_free(subscr_conn); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 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: I1556aa665fbb0a97507f98794e74820731fa6935 Gerrit-Change-Number: 27476 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27474 ) Change subject: Send RESET to MSC on start up ...................................................................... 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.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/msc.c A src/osmo-bsc-nat/msc_fsm.c 7 files changed, 216 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h index 996cb69..ca387c2 100644 --- a/include/osmocom/bsc_nat/bssap.h +++ b/include/osmocom/bsc_nat/bssap.h @@ -23,3 +23,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.h b/include/osmocom/bsc_nat/msc.h index 1f91de0..47b4d13 100644 --- a/include/osmocom/bsc_nat/msc.h +++ b/include/osmocom/bsc_nat/msc.h @@ -19,11 +19,13 @@ #pragma once +#include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h> struct msc { struct llist_head list; struct osmo_sccp_addr addr; + struct osmo_fsm_inst *fi; }; struct msc *msc_alloc(struct osmo_sccp_addr *addr); @@ -31,4 +33,7 @@ struct msc *msc_get(void); +void msc_tx_reset(struct msc *msc); +void msc_rx_reset_ack(struct msc *msc); + void msc_free(struct msc *msc); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 1dd82fd..8fd5667 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -32,6 +32,7 @@ logging.c \ main.c \ msc.c \ + msc_fsm.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 4193ae9..1d92ba3 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_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.sccp_inst->scu, - &g_bsc_nat->cn.sccp_inst->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 83eec99..f88bb20 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -25,6 +25,50 @@ #include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> + +int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +{ + enum bsc_nat_net net = sccp_inst == g_bsc_nat->cn.sccp_inst ? BSC_NAT_NET_CN : BSC_NAT_NET_RAN; + + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET to %s\n", bsc_nat_print_addr(net, 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 = msc_get(); + + 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_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) { @@ -69,7 +113,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.sccp_inst) + return bssap_cn_rcvmsg_udt(addr, msg, length); return bssap_ran_rcvmsg_udt(addr, msg, length); } diff --git a/src/osmo-bsc-nat/msc.c b/src/osmo-bsc-nat/msc.c index 70f9d76..e78a8e6 100644 --- a/src/osmo-bsc-nat/msc.c +++ b/src/osmo-bsc-nat/msc.c @@ -23,6 +23,8 @@ #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +extern struct osmo_fsm msc_fsm; + struct msc *msc_alloc(struct osmo_sccp_addr *addr) { struct msc *msc = talloc_zero(g_bsc_nat, struct msc); @@ -37,6 +39,11 @@ INIT_LLIST_HEAD(&msc->list); llist_add(&msc->list, &g_bsc_nat->cn.mscs); + msc->fi = osmo_fsm_inst_alloc(&msc_fsm, msc, msc, LOGL_INFO, NULL); + OSMO_ASSERT(msc->fi); + + msc_tx_reset(msc); + return msc; } @@ -67,5 +74,6 @@ { LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); llist_del(&msc->list); + osmo_fsm_inst_free(msc->fi); talloc_free(msc); } diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c new file mode 100644 index 0000000..d8b89c6 --- /dev/null +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -0,0 +1,154 @@ +/* (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/core/fsm.h> +#include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/bssap.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> + +#define X(s) (1 << (s)) + +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.sccp_inst, &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 } +}; + +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, + .timer_cb = msc_fsm_timer_cb, +}; + +static __attribute__((constructor)) void msc_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&msc_fsm) == 0); +} + +void msc_tx_reset(struct msc *msc) +{ + osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_TX_RESET, NULL); +} + +void msc_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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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/Makefile.am A include/osmocom/bsc_nat/bsc.h M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/Makefile.am A src/osmo-bsc-nat/bsc.c M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bssap.c 7 files changed, 110 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 76aada0..398b0aa 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -1,4 +1,5 @@ noinst_HEADERS = \ + bsc.h \ bsc_nat.h \ bsc_nat_fsm.h \ bssap.h \ diff --git a/include/osmocom/bsc_nat/bsc.h b/include/osmocom/bsc_nat/bsc.h new file mode 100644 index 0000000..34590b9 --- /dev/null +++ b/include/osmocom/bsc_nat/bsc.h @@ -0,0 +1,31 @@ +/* (C) 2021 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/sigtran/sccp_sap.h> + +struct bsc { + struct llist_head list; + struct osmo_sccp_addr addr; +}; + +struct bsc *bsc_alloc(struct osmo_sccp_addr *addr); +struct bsc *bsc_get_by_pc(uint32_t pointcode); +void bsc_free(struct bsc *bsc); diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 3d863f1..aac06ab 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -44,6 +44,7 @@ struct { struct bsc_nat_sccp_inst *sccp_inst; + struct llist_head bscs; /* list of struct bsc */ } ran; }; diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 445c098..bb8e990 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -25,6 +25,7 @@ $(NULL) osmo_bsc_nat_SOURCES = \ + bsc.c \ bsc_nat.c \ bsc_nat_fsm.c \ bssap.c \ diff --git a/src/osmo-bsc-nat/bsc.c b/src/osmo-bsc-nat/bsc.c new file mode 100644 index 0000000..2ad6e0e --- /dev/null +++ b/src/osmo-bsc-nat/bsc.c @@ -0,0 +1,59 @@ +/* (C) 2021 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.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> + +struct bsc *bsc_alloc(struct osmo_sccp_addr *addr) +{ + struct bsc *bsc = talloc_zero(g_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, &g_bsc_nat->ran.bscs); + + return bsc; +} + +struct bsc *bsc_get_by_pc(uint32_t pointcode) +{ + struct bsc *bsc; + + llist_for_each_entry(bsc, &g_bsc_nat->ran.bscs, list) { + if (bsc->addr.pc == pointcode) + return bsc; + } + + return NULL; +} + +void bsc_free(struct bsc *bsc) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(bsc)); + llist_del(&bsc->list); + talloc_free(bsc); +} diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 409bf74..8baa096 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -20,8 +20,10 @@ #include "config.h" #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/bsc_nat/logging.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { @@ -38,6 +40,8 @@ OSMO_ASSERT(bsc_nat->ran.sccp_inst); talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->ran.bscs); + bsc_nat_fsm_alloc(bsc_nat); return bsc_nat; @@ -45,11 +49,17 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct bsc *bsc, *b; + if (bsc_nat->fi) { osmo_fsm_inst_free(bsc_nat->fi); bsc_nat->fi = NULL; } + llist_for_each_entry_safe(bsc, b, &bsc_nat->ran.bscs, list) { + bsc_free(bsc); + } + talloc_free(bsc_nat); } diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index e5c8ca2..83eec99 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -22,12 +22,19 @@ #include <osmocom/gsm/gsm0808.h> #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; + struct bsc *bsc; + + /* Store the BSC, since RESET was done the BSCNAT should accept its messages */ + bsc = bsc_get_by_pc(addr->pc); + if (!bsc) + bsc = bsc_alloc(addr); LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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. 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.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/main.c A src/osmo-bsc-nat/msc.c 8 files changed, 120 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 398b0aa..1c675f7 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -4,5 +4,6 @@ bsc_nat_fsm.h \ bssap.h \ logging.h \ + msc.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index aac06ab..9e58a79 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -40,6 +40,7 @@ struct { struct bsc_nat_sccp_inst *sccp_inst; + struct llist_head mscs; /* list of struct msc */ } cn; struct { diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h new file mode 100644 index 0000000..1f91de0 --- /dev/null +++ b/include/osmocom/bsc_nat/msc.h @@ -0,0 +1,34 @@ +/* (C) 2021 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/sigtran/sccp_sap.h> + +struct msc { + struct llist_head list; + struct osmo_sccp_addr addr; +}; + +struct msc *msc_alloc(struct osmo_sccp_addr *addr); +int msc_alloc_from_addr_book(void); + +struct msc *msc_get(void); + +void msc_free(struct msc *msc); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index bb8e990..1dd82fd 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -31,6 +31,7 @@ bssap.c \ logging.c \ main.c \ + msc.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 8baa096..23d7498 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -24,6 +24,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.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { @@ -40,6 +41,7 @@ OSMO_ASSERT(bsc_nat->ran.sccp_inst); talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->cn.mscs); INIT_LLIST_HEAD(&bsc_nat->ran.bscs); bsc_nat_fsm_alloc(bsc_nat); @@ -49,6 +51,7 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct msc *msc, *m; struct bsc *bsc, *b; if (bsc_nat->fi) { @@ -56,6 +59,10 @@ bsc_nat->fi = NULL; } + llist_for_each_entry_safe(msc, m, &bsc_nat->cn.mscs, list) { + msc_free(msc); + } + llist_for_each_entry_safe(bsc, b, &bsc_nat->ran.bscs, list) { bsc_free(bsc); } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 07b9eb5..4193ae9 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_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.sccp_inst->scu, - &g_bsc_nat->ran.sccp_inst->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/main.c b/src/osmo-bsc-nat/main.c index c0b65ea..6cb1e0f 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -30,6 +30,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.h> #include <osmocom/bsc_nat/vty.h> static const char *const copyright = @@ -199,6 +200,9 @@ bsc_nat_fsm_start(g_bsc_nat); + if (msc_alloc_from_addr_book() < 0) + exit(1); + while (!osmo_select_shutdown_done()) osmo_select_main_ctx(0); diff --git a/src/osmo-bsc-nat/msc.c b/src/osmo-bsc-nat/msc.c new file mode 100644 index 0000000..70f9d76 --- /dev/null +++ b/src/osmo-bsc-nat/msc.c @@ -0,0 +1,71 @@ +/* (C) 2021 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 <errno.h> +#include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> + +struct msc *msc_alloc(struct osmo_sccp_addr *addr) +{ + struct msc *msc = talloc_zero(g_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, &g_bsc_nat->cn.mscs); + + return msc; +} + +int msc_alloc_from_addr_book(void) +{ + struct osmo_sccp_addr addr; + + /* For now only one MSC is supported */ + if (osmo_sccp_addr_by_name_local(&addr, "msc", g_bsc_nat->cn.sccp_inst->ss7_inst) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Configuration error, MSC not found in address book\n"); + return -ENOENT; + } + + msc_alloc(&addr); + return 0; +} + +struct msc *msc_get(void) +{ + /* For now only one MSC is supported */ + + OSMO_ASSERT(!llist_empty(&g_bsc_nat->cn.mscs)); + + return llist_first_entry(&g_bsc_nat->cn.mscs, struct msc, list); +} + +void msc_free(struct msc *msc) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); + llist_del(&msc->list); + talloc_free(msc); +} -- 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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat: use sub-structs for cn, ran

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27547 ) Change subject: bsc_nat: use sub-structs for cn, ran ...................................................................... bsc_nat: use sub-structs for cn, ran As suggested in code review, create sub-structs for cn and ran. The following patches will fill them up with mscs, bscs etc. Related: SYS#5560 Change-Id: I6a3cc0d837a3d89e7153c2296812df0863f3471f --- 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 M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/vty.c 5 files changed, 42 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index af4041b..3d863f1 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -38,8 +38,13 @@ struct bsc_nat { struct osmo_fsm_inst *fi; - struct bsc_nat_sccp_inst *cn; - struct bsc_nat_sccp_inst *ran; + struct { + struct bsc_nat_sccp_inst *sccp_inst; + } cn; + + struct { + struct bsc_nat_sccp_inst *sccp_inst; + } ran; }; struct bsc_nat *bsc_nat_alloc(void *tall_ctx); diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index cae65e5..409bf74 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -30,13 +30,13 @@ bsc_nat = talloc_zero(tall_ctx, struct bsc_nat); OSMO_ASSERT(bsc_nat); - bsc_nat->cn = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); - OSMO_ASSERT(bsc_nat->cn); - talloc_set_name_const(bsc_nat->cn, "struct bsc_nat_sccp_inst (CN)"); + bsc_nat->cn.sccp_inst = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); + OSMO_ASSERT(bsc_nat->cn.sccp_inst); + talloc_set_name_const(bsc_nat->cn.sccp_inst, "struct bsc_nat_sccp_inst (CN)"); - bsc_nat->ran = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); - OSMO_ASSERT(bsc_nat->ran); - talloc_set_name_const(bsc_nat->ran, "struct bsc_nat_sccp_inst (RAN)"); + bsc_nat->ran.sccp_inst = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); + OSMO_ASSERT(bsc_nat->ran.sccp_inst); + talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); bsc_nat_fsm_alloc(bsc_nat); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 1f4662f..07b9eb5 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -48,9 +48,9 @@ static struct bsc_nat_sccp_inst *sccp_inst_dest(struct bsc_nat_sccp_inst *src) { - if (src == g_bsc_nat->cn) - return g_bsc_nat->ran; - return g_bsc_nat->cn; + if (src == g_bsc_nat->cn.sccp_inst) + return g_bsc_nat->ran.sccp_inst; + return g_bsc_nat->cn.sccp_inst; } /* For connection-oriented messages, figure out which side is not the BSCNAT, @@ -85,7 +85,7 @@ { struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); - if (src == g_bsc_nat->ran) { + if (src == g_bsc_nat->ran.sccp_inst) { if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest->ss7_inst) < 0) { LOGP(DMAIN, LOGL_ERROR, "Could not find MSC in address book\n"); return -1; @@ -126,9 +126,9 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(g_bsc_nat->ran->scu, + osmo_sccp_tx_conn_req(g_bsc_nat->ran.sccp_inst->scu, prim->u.connect.conn_id, - &g_bsc_nat->ran->addr, + &g_bsc_nat->ran.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -147,7 +147,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_resp(g_bsc_nat->ran->scu, + osmo_sccp_tx_conn_resp(g_bsc_nat->ran.sccp_inst->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, @@ -163,7 +163,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(g_bsc_nat->ran->scu, + osmo_sccp_tx_data(g_bsc_nat->ran.sccp_inst->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); @@ -177,7 +177,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); - osmo_sccp_tx_disconn(g_bsc_nat->ran->scu, + osmo_sccp_tx_disconn(g_bsc_nat->ran.sccp_inst->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, prim->u.disconnect.cause); @@ -196,8 +196,8 @@ /* 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, + osmo_sccp_tx_unitdata(g_bsc_nat->ran.sccp_inst->scu, + &g_bsc_nat->ran.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -240,9 +240,9 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(g_bsc_nat->cn->scu, + osmo_sccp_tx_conn_req(g_bsc_nat->cn.sccp_inst->scu, prim->u.connect.conn_id, - &g_bsc_nat->cn->addr, + &g_bsc_nat->cn.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -261,7 +261,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_resp(g_bsc_nat->cn->scu, + osmo_sccp_tx_conn_resp(g_bsc_nat->cn.sccp_inst->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, @@ -277,7 +277,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(g_bsc_nat->cn->scu, + osmo_sccp_tx_data(g_bsc_nat->cn.sccp_inst->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); @@ -291,7 +291,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); - osmo_sccp_tx_disconn(g_bsc_nat->cn->scu, + osmo_sccp_tx_disconn(g_bsc_nat->cn.sccp_inst->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, prim->u.disconnect.cause); @@ -314,8 +314,8 @@ /* 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, + osmo_sccp_tx_unitdata(g_bsc_nat->cn.sccp_inst->scu, + &g_bsc_nat->cn.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -380,12 +380,12 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - if (sccp_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, sccp_sap_up_cn, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->cn.sccp_inst, "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, sccp_sap_up_ran, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->ran.sccp_inst, "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; } @@ -408,11 +408,11 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - sccp_inst_free(bsc_nat->cn); - bsc_nat->cn = NULL; + sccp_inst_free(bsc_nat->cn.sccp_inst); + bsc_nat->cn.sccp_inst = NULL; - sccp_inst_free(bsc_nat->ran); - bsc_nat->ran = NULL; + sccp_inst_free(bsc_nat->ran.sccp_inst); + bsc_nat->ran.sccp_inst = NULL; } static void st_stopped(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 597c0e6..e5c8ca2 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -27,7 +27,7 @@ static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { - struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran; + struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_ran(addr)); diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c index 10c669a..bf86faa 100644 --- a/src/osmo-bsc-nat/vty.c +++ b/src/osmo-bsc-nat/vty.c @@ -45,8 +45,8 @@ static int config_write_bsc_nat(struct vty *vty) { vty_out(vty, "bsc-nat%s", VTY_NEWLINE); - vty_out(vty, " cs7-instance-cn %u%s", g_bsc_nat->cn->ss7_id, VTY_NEWLINE); - vty_out(vty, " cs7-instance-ran %u%s", g_bsc_nat->ran->ss7_id, VTY_NEWLINE); + vty_out(vty, " cs7-instance-cn %u%s", g_bsc_nat->cn.sccp_inst->ss7_id, VTY_NEWLINE); + vty_out(vty, " cs7-instance-ran %u%s", g_bsc_nat->ran.sccp_inst->ss7_id, VTY_NEWLINE); return CMD_SUCCESS; } @@ -58,7 +58,7 @@ "cs7-instance-cn <0-15>", "Set SS7 to be used to connect to CN-side\n" SS7_REF_STR) { - g_bsc_nat->cn->ss7_id = atoi(argv[0]); + g_bsc_nat->cn.sccp_inst->ss7_id = atoi(argv[0]); return CMD_SUCCESS; } @@ -67,7 +67,7 @@ "cs7-instance-ran <0-15>", "Set SS7 to be used to connect to RAN-side\n" SS7_REF_STR) { - g_bsc_nat->ran->ss7_id = atoi(argv[0]); + g_bsc_nat->ran.sccp_inst->ss7_id = atoi(argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27547 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: I6a3cc0d837a3d89e7153c2296812df0863f3471f Gerrit-Change-Number: 27547 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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, 130 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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..996cb69 --- /dev/null +++ b/include/osmocom/bsc_nat/bssap.h @@ -0,0 +1,25 @@ +/* (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 4ce60ce..0c36607 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -27,6 +27,7 @@ #include <osmocom/sigtran/sccp_helpers.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> #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ @@ -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..c054db6 --- /dev/null +++ b/src/osmo-bsc-nat/bssap.c @@ -0,0 +1,98 @@ +/* (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/core/msgb.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> + +static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran; + + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(sccp_inst, addr)); + + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr(sccp_inst, addr)); + msg = gsm0808_create_reset_ack(); + return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); +} + +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); +} + +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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_print_addr: pass net enum, not sccp_inst

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27546 ) Change subject: bsc_nat_print_addr: pass net enum, not sccp_inst ...................................................................... bsc_nat_print_addr: pass net enum, not sccp_inst The sccp_inst was only used to differentiate between CN / RAN. Instead of passing that, pass an enum and add bsc_nat_print_addr_cn and _ran defines to keep it short. This is in preparation for refactoring struct bsc_nat as suggested in code review. Related: SYS#5560 Change-Id: I3c6046a6726c31bf137223c46c2c96b3898ad324 --- 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 M src/osmo-bsc-nat/bssap.c 4 files changed, 22 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index d80510a..af4041b 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -22,6 +22,11 @@ #include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h> +enum bsc_nat_net { + BSC_NAT_NET_CN = 0, + BSC_NAT_NET_RAN +}; + struct bsc_nat_sccp_inst { uint32_t ss7_id; struct osmo_ss7_instance *ss7_inst; @@ -40,7 +45,9 @@ 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); +#define bsc_nat_print_addr_cn(addr) bsc_nat_print_addr(BSC_NAT_NET_CN, addr) +#define bsc_nat_print_addr_ran(addr) bsc_nat_print_addr(BSC_NAT_NET_RAN, addr) +const char *bsc_nat_print_addr(enum bsc_nat_net net, 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 2e9c781..cae65e5 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -53,12 +53,12 @@ talloc_free(bsc_nat); } -const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +const char *bsc_nat_print_addr(enum bsc_nat_net net, 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"); + net == BSC_NAT_NET_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 0c36607..1f4662f 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -123,7 +123,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->ran->scu, @@ -144,7 +144,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->ran->scu, @@ -160,7 +160,7 @@ 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->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->ran->scu, @@ -175,7 +175,7 @@ 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->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); osmo_sccp_tx_disconn(g_bsc_nat->ran->scu, prim->u.disconnect.conn_id, @@ -191,7 +191,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ @@ -237,7 +237,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->cn->scu, @@ -258,7 +258,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->cn->scu, @@ -274,7 +274,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->cn->scu, @@ -289,7 +289,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); osmo_sccp_tx_disconn(g_bsc_nat->cn->scu, prim->u.disconnect.conn_id, @@ -309,7 +309,7 @@ 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)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index c054db6..597c0e6 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -29,9 +29,9 @@ { struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran; - LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(sccp_inst, addr)); + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_ran(addr)); - LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr(sccp_inst, addr)); + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr_ran(addr)); msg = gsm0808_create_reset_ack(); return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27546 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: I3c6046a6726c31bf137223c46c2c96b3898ad324 Gerrit-Change-Number: 27546 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022