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

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 2532717..c3ddea3 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: 2 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_fsm: tweak forwarding log messages

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index f57c42d..db6c059 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -40,5 +40,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 b3af0d6..2e9c781 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 c3ddea3..a67c5d9 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: 2 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]: treewide: tweak includes

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27465 ) Change subject: treewide: tweak includes ...................................................................... treewide: tweak includes Categorize includes by: * (library includes) * Osmocom includes except for OsmoBSCNAT * OsmoBSCNAT includes Order the includes in each category alphabetically, and remove empty lines between them. This allows me to keep them consistent, and with empty lines removed between these categories it doesn't look inconsistent if there is only one include from two categories in one file, but multiple includes from the same category in another file. While at it, also have one empty line after the license header in all c, h files, and one after the includes. Related: SYS#5560 Change-Id: I1a7b95ccb0c87fd53645c72f0c02449e8403043b --- M include/osmocom/bsc_nat/bsc_nat.h M include/osmocom/bsc_nat/bsc_nat_fsm.h M include/osmocom/bsc_nat/logging.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/logging.c M src/osmo-bsc-nat/main.c M src/osmo-bsc-nat/vty.c 8 files changed, 6 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 3c77c23..f57c42d 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -16,12 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/lienses/>. * */ + #pragma once #include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h> - struct bsc_nat_sccp_inst { uint32_t ss7_id; struct osmo_ss7_instance *ss7_inst; diff --git a/include/osmocom/bsc_nat/bsc_nat_fsm.h b/include/osmocom/bsc_nat/bsc_nat_fsm.h index 944de71..a2becfb 100644 --- a/include/osmocom/bsc_nat/bsc_nat_fsm.h +++ b/include/osmocom/bsc_nat/bsc_nat_fsm.h @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/lienses/>. * */ + #pragma once void bsc_nat_fsm_alloc(struct bsc_nat *bsc_nat); diff --git a/include/osmocom/bsc_nat/logging.h b/include/osmocom/bsc_nat/logging.h index 88f67b0..54e954c 100644 --- a/include/osmocom/bsc_nat/logging.h +++ b/include/osmocom/bsc_nat/logging.h @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/lienses/>. * */ + #pragma once #include <osmocom/core/logging.h> diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index f9867c1..b3af0d6 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -18,7 +18,6 @@ */ #include "config.h" - #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/bsc_nat/bsc_nat.h> diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index fb61715..2532717 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -18,18 +18,13 @@ */ #include "config.h" - #include <errno.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_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> diff --git a/src/osmo-bsc-nat/logging.c b/src/osmo-bsc-nat/logging.c index 5ada8c2..729371f 100644 --- a/src/osmo-bsc-nat/logging.c +++ b/src/osmo-bsc-nat/logging.c @@ -16,9 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/lienses/>. * */ + #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> - #include <osmocom/bsc_nat/logging.h> static const struct log_info_cat log_cat[] = { diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 7e9696e..c0b65ea 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -18,9 +18,7 @@ */ #include "config.h" - #include <getopt.h> - #include <osmocom/core/application.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> @@ -29,7 +27,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/vty/ports.h> #include <osmocom/vty/telnet_interface.h> - #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c index 41681d4..10c669a 100644 --- a/src/osmo-bsc-nat/vty.c +++ b/src/osmo-bsc-nat/vty.c @@ -18,13 +18,10 @@ */ #include "config.h" - #include <unistd.h> - -#include <osmocom/vty/telnet_interface.h> -#include <osmocom/vty/logging.h> #include <osmocom/vty/command.h> - +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/vty.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27465 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: I1a7b95ccb0c87fd53645c72f0c02449e8403043b Gerrit-Change-Number: 27465 Gerrit-PatchSet: 2 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_sccp_inst: store ss7_inst

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27463 ) Change subject: bsc_nat_sccp_inst: store ss7_inst ...................................................................... bsc_nat_sccp_inst: store ss7_inst Get ss7_inst once and store it inside bsc_nat_sccp_inst to avoid multiple calls to osmo_ss7_instance_find(). Related: SYS#5560 Change-Id: I9a8b69fb3df17c85a67958fbca88948573d39694 --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat_fsm.c 2 files changed, 10 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 37568e8..3c77c23 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -24,6 +24,8 @@ struct bsc_nat_sccp_inst { uint32_t ss7_id; + struct osmo_ss7_instance *ss7_inst; + struct osmo_sccp_addr local_sccp_addr; 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 a35a704..a66e6b2 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -100,17 +100,14 @@ struct osmo_sccp_addr *peer_addr_out) { struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); - struct osmo_ss7_instance *dest_ss7 = osmo_ss7_instance_find(dest->ss7_id); - - OSMO_ASSERT(dest_ss7); if (src == g_bsc_nat->ran) { - if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest_ss7) < 0) { + 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"); return -1; } } else { - if (osmo_sccp_addr_by_name_local(peer_addr_out, "bsc", dest_ss7) < 0) { + 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"); return -2; } @@ -251,6 +248,8 @@ return -1; } + 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); sccp_inst->scu = osmo_sccp_user_bind(sccp, name, sccp_sap_up, ssn); @@ -270,9 +269,10 @@ sccp_inst->scu = NULL; } - struct osmo_ss7_instance *ss7_inst = osmo_ss7_instance_find(sccp_inst->ss7_id); - if (ss7_inst) - osmo_ss7_instance_destroy(ss7_inst); + if (sccp_inst->ss7_inst) { + osmo_ss7_instance_destroy(sccp_inst->ss7_inst); + sccp_inst->ss7_inst = NULL; + } talloc_free(sccp_inst); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27463 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: I9a8b69fb3df17c85a67958fbca88948573d39694 Gerrit-Change-Number: 27463 Gerrit-PatchSet: 2 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_fsm: move conn.ind before conn.conf

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index a66e6b2..fb61715 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: 2 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_sccp_inst: local_sccp_addr -> addr

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27470 ) Change subject: bsc_nat_sccp_inst: local_sccp_addr -> addr ...................................................................... Patch Set 2: Code-Review+2 -- 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: 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-Comment-Date: Mon, 21 Mar 2022 10:23:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: Get rid of si13_default

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27542 ) Change subject: SI13: Get rid of si13_default ...................................................................... SI13: Get rid of si13_default It's really confusing having a "default" struct whose inner values are changing based on previous state. Furthermore, it's only used in generate_si13() so there's no need to keep it outside the function. Let's move it inside the function and rename it to avoid confusion. Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 --- M src/osmo-bsc/system_information.c 1 file changed, 46 insertions(+), 55 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 797c556..187678d 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1200,44 +1200,11 @@ return l2_plen + rc; } -static struct osmo_gsm48_si13_info si13_default = { - .cell_opts = { - .nmo = GPRS_NMO_II, - .t3168 = 2000, - .t3192 = 1500, - .drx_timer_max = 3, - .bs_cv_max = 15, - .ctrl_ack_type_use_block = true, - .ext_info_present = true, - .ext_info = { - .egprs_supported = 0, /* overridden in gsm_generate_si() */ - .use_egprs_p_ch_req = 0, /* overridden in generate_si13() */ - .bep_period = 5, - .pfc_supported = 0, - .dtm_supported = 0, - .bss_paging_coordination = 0, /* overridden in generate_si13() */ - .ccn_active = false, /* overridden in generate_si13() */ - }, - }, - .pwr_ctrl_pars = { - .alpha = 0, /* a = 0.0 */ - .t_avg_w = 16, - .t_avg_t = 16, - .pc_meas_chan = 0, /* downling measured on CCCH */ - .n_avg_i = 8, - }, - .bcch_change_mark = 1, - .si_change_field = 0, - .rac = 0, /* needs to be patched */ - .spgc_ccch_sup = 0, - .net_ctrl_ord = 0, - .prio_acc_thr = 6, -}; - static int generate_si13(enum osmo_sysinfo_type t, struct gsm_bts *bts) { struct gsm48_system_information_type_13 *si13 = (struct gsm48_system_information_type_13 *) GSM_BTS_SI(bts, t); + struct osmo_gsm48_si13_info si13_info; int ret; memset(si13, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); @@ -1246,43 +1213,67 @@ si13->header.skip_indicator = 0; si13->header.system_information = GSM48_MT_RR_SYSINFO_13; - si13_default.rac = bts->gprs.rac; - si13_default.net_ctrl_ord = bts->gprs.net_ctrl_ord; - - si13_default.cell_opts.ctrl_ack_type_use_block = - bts->gprs.ctrl_ack_type_use_block; - - /* Information about the other SIs */ - si13_default.bcch_change_mark = bts->bcch_change_mark; + si13_info = (struct osmo_gsm48_si13_info){ + .cell_opts = { + .nmo = GPRS_NMO_II, + .t3168 = 2000, + .t3192 = 1500, + .drx_timer_max = 3, + .bs_cv_max = 15, + .ctrl_ack_type_use_block = bts->gprs.ctrl_ack_type_use_block, + .ext_info_present = true, + .ext_info = { + .egprs_supported = 0, /* overridden below */ + .use_egprs_p_ch_req = 0, /* overridden below */ + .bep_period = 5, + .pfc_supported = 0, + .dtm_supported = 0, + .bss_paging_coordination = 0, /* overridden below */ + .ccn_active = false, /* overridden below */ + }, + }, + .pwr_ctrl_pars = { + .alpha = bts->gprs.pwr_ctrl.alpha, /* a = 0.0 */ + .t_avg_w = 16, + .t_avg_t = 16, + .pc_meas_chan = 0, /* downling measured on CCCH */ + .n_avg_i = 8, + }, + .bcch_change_mark = bts->bcch_change_mark, /* Information about the other SIs */ + .si_change_field = 0, + .rac = bts->gprs.rac, + .spgc_ccch_sup = 0, + .net_ctrl_ord = bts->gprs.net_ctrl_ord, + .prio_acc_thr = 6, + }; switch (bts->gprs.mode) { case BTS_GPRS_EGPRS: - si13_default.cell_opts.ext_info.egprs_supported = 1; + si13_info.cell_opts.ext_info.egprs_supported = 1; /* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */ if (bts->gprs.egprs_pkt_chan_request) - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1; + si13_info.cell_opts.ext_info.use_egprs_p_ch_req = 1; else - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0; + si13_info.cell_opts.ext_info.use_egprs_p_ch_req = 0; break; case BTS_GPRS_GPRS: case BTS_GPRS_NONE: - si13_default.cell_opts.ext_info.egprs_supported = 0; - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0; + si13_info.cell_opts.ext_info.egprs_supported = 0; + si13_info.cell_opts.ext_info.use_egprs_p_ch_req = 0; break; } if (osmo_bts_has_feature(&bts->features, BTS_FEAT_PAGING_COORDINATION)) - si13_default.cell_opts.ext_info.bss_paging_coordination = 1; + si13_info.cell_opts.ext_info.bss_paging_coordination = 1; else - si13_default.cell_opts.ext_info.bss_paging_coordination = 0; + si13_info.cell_opts.ext_info.bss_paging_coordination = 0; - si13_default.cell_opts.ext_info.ccn_active = bts->gprs.ccn.forced_vty ? - bts->gprs.ccn.active : - osmo_bts_has_feature(&bts->model->features, - BTS_FEAT_CCN); - si13_default.pwr_ctrl_pars.alpha = bts->gprs.pwr_ctrl.alpha; + si13_info.cell_opts.ext_info.ccn_active = bts->gprs.ccn.forced_vty ? + bts->gprs.ccn.active : + osmo_bts_has_feature(&bts->model->features, + BTS_FEAT_CCN); - ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_default); + ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_info); if (ret < 0) return ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 Gerrit-Change-Number: 27542 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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[master]: SI13: Get rid of si13_default

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27542 ) Change subject: SI13: Get rid of si13_default ...................................................................... Patch Set 4: Code-Review+2 (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27542/comment/ff4695ba_d9514686 PS3, Line 1272: > Please fix alignment here. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 Gerrit-Change-Number: 27542 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Mar 2022 21:58:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: Get rid of si13_default

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27542 to look at the new patch set (#4). Change subject: SI13: Get rid of si13_default ...................................................................... SI13: Get rid of si13_default It's really confusing having a "default" struct whose inner values are changing based on previous state. Furthermore, it's only used in generate_si13() so there's no need to keep it outside the function. Let's move it inside the function and rename it to avoid confusion. Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 --- M src/osmo-bsc/system_information.c 1 file changed, 46 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/27542/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 Gerrit-Change-Number: 27542 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: Get rid of si13_default

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27542 ) Change subject: SI13: Get rid of si13_default ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27542/comment/2664d3d2_2c6d81ac PS3, Line 1272: Please fix alignment here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 Gerrit-Change-Number: 27542 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Mar 2022 21:43:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022