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

Change in osmo-bsc-nat[master]: treewide: tweak includes

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27465 ) Change subject: treewide: tweak includes ...................................................................... treewide: tweak includes Order them alphabetically and remove empty lines between them, that's the easiest way for me to keep them consistent. Related: SYS#5560 Change-Id: I1a7b95ccb0c87fd53645c72f0c02449e8403043b --- M include/osmocom/bsc_nat/bsc_nat.h M include/osmocom/bsc_nat/vty.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 7 files changed, 17 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/65/27465/1 diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 3c77c23..a1e3da8 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -21,7 +21,6 @@ #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/vty.h b/include/osmocom/bsc_nat/vty.h index 9a842b5..8fe35a2 100644 --- a/include/osmocom/bsc_nat/vty.h +++ b/include/osmocom/bsc_nat/vty.h @@ -16,7 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/lienses/>. * */ - #pragma once #include <osmocom/vty/vty.h> diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index f9867c1..7741184 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -18,11 +18,10 @@ */ #include "config.h" - -#include <osmocom/core/talloc.h> -#include <osmocom/core/utils.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 085cafd..3e10749 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -18,21 +18,16 @@ */ #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> +#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 <stdint.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 */ diff --git a/src/osmo-bsc-nat/logging.c b/src/osmo-bsc-nat/logging.c index 5ada8c2..653789b 100644 --- a/src/osmo-bsc-nat/logging.c +++ b/src/osmo-bsc-nat/logging.c @@ -16,11 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/lienses/>. * */ +#include <osmocom/bsc_nat/logging.h> #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> -#include <osmocom/bsc_nat/logging.h> - static const struct log_info_cat log_cat[] = { [DMAIN] = { .name = "DMAIN", diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 7e9696e..ef4b78d 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -18,9 +18,11 @@ */ #include "config.h" - #include <getopt.h> - +#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/vty.h> #include <osmocom/core/application.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> @@ -30,11 +32,6 @@ #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> -#include <osmocom/bsc_nat/vty.h> - static const char *const copyright = "OsmoBSCNAT - Osmocom BSC NAT\r\n" "Copyright (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>\r\n" diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c index 41681d4..0dd0e15 100644 --- a/src/osmo-bsc-nat/vty.c +++ b/src/osmo-bsc-nat/vty.c @@ -18,15 +18,12 @@ */ #include "config.h" - -#include <unistd.h> - -#include <osmocom/vty/telnet_interface.h> -#include <osmocom/vty/logging.h> -#include <osmocom/vty/command.h> - #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/vty.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> +#include <unistd.h> static struct cmd_node bsc_nat_node = { BSC_NAT_NODE, -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: fix sccp_sap_get_peer_addr_in

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27461 ) Change subject: bsc_nat_fsm: fix sccp_sap_get_peer_addr_in ...................................................................... bsc_nat_fsm: fix sccp_sap_get_peer_addr_in Fix the logic to not always return src->local_sccp_addr. What we need to know is the peer's address. Related: SYS#5560 Change-Id: I0055c0fafe672db5ce7a616d94c8964e8d58968f --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/61/27461/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 906fd94..1de3e0c 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -69,15 +69,15 @@ return g_bsc_nat->cn; } -/* For connection-oriented messages, figure out which side is the BSCNAT, +/* 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_ss7_inst *src, struct osmo_sccp_addr **peer_addr_in, struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) { - if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) == 0) { + if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) != 0) { *peer_addr_in = called_addr; return 0; - } else if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, calling_addr) == 0) { + } else if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, calling_addr) != 0) { *peer_addr_in = calling_addr; return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27461 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: I0055c0fafe672db5ce7a616d94c8964e8d58968f Gerrit-Change-Number: 27461 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_sccp_inst: rename from bsc_nat_ss7_inst

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27462 ) Change subject: bsc_nat_sccp_inst: rename from bsc_nat_ss7_inst ...................................................................... bsc_nat_sccp_inst: rename from bsc_nat_ss7_inst This name seems more fitting, since the code mostly interacts with the sccp addr and scu contained in the struct. Related: SYS#5560 Change-Id: Id0f965811eff0eb7b387d5ae2eec2451d6d8e415 --- 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, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/62/27462/1 diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 2031527..37568e8 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -22,7 +22,7 @@ #include <osmocom/sigtran/sccp_sap.h> -struct bsc_nat_ss7_inst { +struct bsc_nat_sccp_inst { uint32_t ss7_id; struct osmo_sccp_addr local_sccp_addr; struct osmo_sccp_user *scu; @@ -31,8 +31,8 @@ struct bsc_nat { struct osmo_fsm_inst *fi; - struct bsc_nat_ss7_inst *cn; - struct bsc_nat_ss7_inst *ran; + struct bsc_nat_sccp_inst *cn; + struct bsc_nat_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 adb32c4..f9867c1 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -31,13 +31,13 @@ bsc_nat = talloc_zero(tall_ctx, struct bsc_nat); OSMO_ASSERT(bsc_nat); - bsc_nat->cn = talloc_zero(bsc_nat, struct bsc_nat_ss7_inst); + 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_ss7_inst (CN)"); + talloc_set_name_const(bsc_nat->cn, "struct bsc_nat_sccp_inst (CN)"); - bsc_nat->ran = talloc_zero(bsc_nat, struct bsc_nat_ss7_inst); + 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_ss7_inst (RAN)"); + talloc_set_name_const(bsc_nat->ran, "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 1de3e0c..a35a704 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -39,13 +39,13 @@ static char log_buf[255]; -#define LOG_SCCP(ss7_inst, peer_addr_in, level, fmt, args...) do { \ +#define LOG_SCCP(sccp_inst, peer_addr_in, level, fmt, args...) do { \ if (peer_addr_in) \ osmo_sccp_addr_to_str_buf(log_buf, sizeof(log_buf), NULL, peer_addr_in); \ LOGP(DMAIN, level, "(%s%s%s) " fmt, \ peer_addr_in ? log_buf : "", \ peer_addr_in ? " from " : "", \ - ss7_inst == g_bsc_nat->ran ? "RAN" : "CN", \ + sccp_inst == g_bsc_nat->ran ? "RAN" : "CN", \ ## args); \ } while (0) @@ -62,7 +62,7 @@ BSC_NAT_FSM_EV_STOP, }; -static struct bsc_nat_ss7_inst *ss7_inst_dest(struct bsc_nat_ss7_inst *src) +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; @@ -71,7 +71,7 @@ /* 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_ss7_inst *src, struct osmo_sccp_addr **peer_addr_in, +static int sccp_sap_get_peer_addr_in(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr **peer_addr_in, struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) { if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) != 0) { @@ -96,10 +96,10 @@ /* 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_ss7_inst *src, struct osmo_sccp_addr *peer_addr_in, +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_ss7_inst *dest = ss7_inst_dest(src); + 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); @@ -123,8 +123,8 @@ * only one MSC, one BSC (not yet translating connection ids etc.). */ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) { - struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); - struct bsc_nat_ss7_inst *dest = ss7_inst_dest(src); + struct bsc_nat_sccp_inst *src = osmo_sccp_user_get_priv(scu); + struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; struct osmo_sccp_addr *peer_addr_in; struct osmo_sccp_addr peer_addr_out; @@ -235,7 +235,7 @@ return rc; } -static int ss7_inst_init(struct bsc_nat_ss7_inst *inst, const char *name, const char *default_pc_str, +static int sccp_inst_init(struct bsc_nat_sccp_inst *sccp_inst, const char *name, const char *default_pc_str, enum osmo_sccp_ssn ssn) { int default_pc; @@ -244,49 +244,49 @@ default_pc = osmo_ss7_pointcode_parse(NULL, default_pc_str); OSMO_ASSERT(default_pc >= 0); - sccp = osmo_sccp_simple_client_on_ss7_id(inst, inst->ss7_id, name, default_pc, OSMO_SS7_ASP_PROT_M3UA, 0, NULL, - 0, NULL); + sccp = osmo_sccp_simple_client_on_ss7_id(sccp_inst, sccp_inst->ss7_id, name, default_pc, OSMO_SS7_ASP_PROT_M3UA, + 0, NULL, 0, NULL); if (!sccp) { LOGP(DMAIN, LOGL_ERROR, "%s: failed to request sccp client instance for sccp user\n", name); return -1; } - osmo_sccp_local_addr_by_instance(&inst->local_sccp_addr, sccp, ssn); + osmo_sccp_local_addr_by_instance(&sccp_inst->local_sccp_addr, sccp, ssn); - inst->scu = osmo_sccp_user_bind(sccp, name, sccp_sap_up, ssn); - if (!inst->scu) { + sccp_inst->scu = osmo_sccp_user_bind(sccp, name, sccp_sap_up, ssn); + if (!sccp_inst->scu) { LOGP(DMAIN, LOGL_ERROR, "%s: failed to bind sccp user\n", name); return -2; } - osmo_sccp_user_set_priv(inst->scu, inst); + osmo_sccp_user_set_priv(sccp_inst->scu, sccp_inst); return 0; } -static void ss7_inst_free(struct bsc_nat_ss7_inst *inst) +static void sccp_inst_free(struct bsc_nat_sccp_inst *sccp_inst) { - if (inst->scu) { - osmo_sccp_user_unbind(inst->scu); - inst->scu = NULL; + if (sccp_inst->scu) { + osmo_sccp_user_unbind(sccp_inst->scu); + sccp_inst->scu = NULL; } - struct osmo_ss7_instance *ss7 = osmo_ss7_instance_find(inst->ss7_id); - if (ss7) - osmo_ss7_instance_destroy(ss7); + struct osmo_ss7_instance *ss7_inst = osmo_ss7_instance_find(sccp_inst->ss7_id); + if (ss7_inst) + osmo_ss7_instance_destroy(ss7_inst); - talloc_free(inst); + talloc_free(sccp_inst); } static void st_starting_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - if (ss7_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } - if (ss7_inst_init(bsc_nat->ran, "OsmoBSCNAT-RAN", DEFAULT_PC_RAN, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->ran, "OsmoBSCNAT-RAN", DEFAULT_PC_RAN, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } @@ -309,10 +309,10 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - ss7_inst_free(bsc_nat->cn); + sccp_inst_free(bsc_nat->cn); bsc_nat->cn = NULL; - ss7_inst_free(bsc_nat->ran); + sccp_inst_free(bsc_nat->ran); bsc_nat->ran = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27462 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: Id0f965811eff0eb7b387d5ae2eec2451d6d8e415 Gerrit-Change-Number: 27462 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_sccp_inst: store ss7_inst

by osmith

osmith has uploaded this change for review. ( 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, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/63/27463/1 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..b4e0516 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,8 @@ 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); 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: change prefix from CN to NET

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27459 ) Change subject: net/templates/run.sh: change prefix from CN to NET ...................................................................... net/templates/run.sh: change prefix from CN to NET osmo-dev's net scripts can be used to run components from RAN too, so change the title prefix and tmux session name from CN to NET. Change-Id: I3f46d5a4c7bd20861735c4e01f7cafbc5db08aae --- M net/templates/run.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/59/27459/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index a7b0f9a..6b8a324 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # tmux: start this script inside a new session -tmux_session="CN" +tmux_session="NET" if [ "${TERMINAL}" = "tmux" ] && [ "$1" != "inside-tmux" ]; then echo "Starting tmux session '$tmux_session'" unset TMUX @@ -145,7 +145,7 @@ *) sleep .2 $terminal \ - -title "CN:$title" \ + -title "NET:$title" \ -e sh -c "$launcher" \ & -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3f46d5a4c7bd20861735c4e01f7cafbc5db08aae Gerrit-Change-Number: 27459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/osmo-bsc-nat.cfg: omit PC for bsc

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27460 ) Change subject: net/templates/osmo-bsc-nat.cfg: omit PC for bsc ...................................................................... net/templates/osmo-bsc-nat.cfg: omit PC for bsc With most recent OsmoBSCNAT patches, the addresses from the connecting BSCs get used, no need to hardcode them in the config anymore. Depends: osmo-bsc-nat I1556aa665fbb0a97507f98794e74820731fa6935 Change-Id: I78ef36c72ff9a7b801e922eccc89dc44fbba7f23 --- M net/templates/osmo-bsc-nat.cfg 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/27460/1 diff --git a/net/templates/osmo-bsc-nat.cfg b/net/templates/osmo-bsc-nat.cfg index 38ac647..41187a3 100644 --- a/net/templates/osmo-bsc-nat.cfg +++ b/net/templates/osmo-bsc-nat.cfg @@ -14,10 +14,6 @@ asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua remote-ip ${STP_RAN_IP} local-ip ${BSCNAT_RAN_IP} - sccp-address bsc - routing-indicator PC - point-code ${BSC0_PC} - subsystem-number 254 bsc-nat cs7-instance-cn 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I78ef36c72ff9a7b801e922eccc89dc44fbba7f23 Gerrit-Change-Number: 27460 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run: log name input: display last

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27456 ) Change subject: net/templates/run: log name input: display last ...................................................................... net/templates/run: log name input: display last Make it easier for the user to follow a consistent naming scheme for the log files if they want do do so, by displaying the last log name. enter name to save log (last: 2022-03-07_04-test-log-name): Change-Id: I6c5b64e15d9a8dabaf65022d6b82b69523a3ca6b --- M net/templates/run.sh 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/56/27456/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 3165f53..1b4bcdd 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -171,6 +171,16 @@ done } +read_log_name() { + log_name_last="$(ls -Art "log" | tail -n1)" + if [ -n "$log_name_last" ]; then + log_name_last=" (last: $log_name_last)" + fi + + echo "enter name to save log$log_name_last:" + read log_name +} + find_term kill_pids @@ -309,8 +319,7 @@ cp *.cfg "$logdir"/ echo -echo enter name to save log -read log_name +read_log_name if [ -n "$log_name" ]; then newlogdir="log/$log_name" #scp "bts:/tmp/{bts,pcu}.log" "bts:neels/osmo-{bts,pcu}.cfg" "$logdir" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6c5b64e15d9a8dabaf65022d6b82b69523a3ca6b Gerrit-Change-Number: 27456 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run: one variable for stp4cn/stp4ran

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27457 ) Change subject: net/templates/run: one variable for stp4cn/stp4ran ...................................................................... net/templates/run: one variable for stp4cn/stp4ran Make it consistent with osmo-mgw and osmo-bsc where we also have more than one config, and the config is not part of the variable. Change-Id: I83301d75814070c29c6362c59fade9044aa2c0cc --- M net/templates/run.sh 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/27457/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 1b4bcdd..a73f645 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -199,8 +199,7 @@ #mgw="strace osmo-mgw" mgw="osmo-mgw" hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" -stp4cn="osmo-stp -c osmo-stp-cn.cfg" -stp4ran="osmo-stp -c osmo-stp-ran.cfg" +stp="osmo-stp" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" bscnat="osmo-bsc-nat" bts="osmo-bts-virtual" @@ -250,10 +249,10 @@ term "$ggsn" GGSN if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then - term "$stp4cn" STP + term "$stp -c osmo-stp-cn.cfg" STP else - term "$stp4cn" STP4CN - term "$stp4ran" STP4RAN + term "$stp -c osmo-stp-cn.cfg" STP4CN + term "$stp -c osmo-stp-ran.cfg" STP4RAN term "$mgw -c osmo-mgw-for-bsc-nat.cfg" MGW4BSCNAT term "$bscnat" BSCNAT fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I83301d75814070c29c6362c59fade9044aa2c0cc Gerrit-Change-Number: 27457 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: move cmds for network components to config

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27458 ) Change subject: net: move cmds for network components to config ...................................................................... net: move cmds for network components to config Instead of hardcoding wrappers such as gdb for various commands in run.sh, put all commands into a config file so the user can add gdb/valgrind/strace/udtrace/... to the program they are currently interested in debugging in their own config. Change-Id: Ifce731ab61d263e9df7a8dc87dd572ca3d30f8dd --- M net/README M net/config_2g3g M net/templates/run.sh 3 files changed, 69 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/58/27458/1 diff --git a/net/README b/net/README index 3ca15fe..59f5f58 100644 --- a/net/README +++ b/net/README @@ -131,6 +131,31 @@ all windows and the whole tmux session. This does work over SSH. +=== Wrap commands in gdb, valgrind, udtrace etc. + +During development it's useful to wrap Osmocom programs inside gdb, valgrind or +other tools. For each program where you want to do this, copy the CMD_ line +from config_2g3g to your config and adjust it accordingly. + +==== Examples: gdb, valgrind, strace + +CMD_MSC="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-msc" +CMD_MSC="valgrind osmo-msc" +CMD_MSC="strace osmo-msc" + +==== Example: udtrace + +To use udtrace on the MNCC socket, use the following with an adjusted +/path/to/udtrace. Explanation of the enviornment variables: +- LD_LIBRARY_PATH allows linking to titan if udtrace was compiled with titan + support +- LD_PRELOAD of libasan allows building osmo-msc with the sanitize.opts +- the tee saves the stderr logging as well as the udtrace output to new file + current_log/osmo-msc.out, since udtrace will not show in osmo-msc.log + +CMD_MSC="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/path/to/udtrace/libudtrace.so osmo-msc 2>&1 | tee -a current_log/osmo-msc.out" + + === Logging and pcaps The run.sh script automatically stores all configs, logs and pcap traces in diff --git a/net/config_2g3g b/net/config_2g3g index 6111b24..83cef72 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -167,3 +167,22 @@ LOG_OUTPUT0_TYPE=stderr LOG_OUTPUT1_TYPE=file current_log/${_name}.log LOG_OUTPUT2_TYPE=gsmtap 127.0.0.9 + +# Commands to execute for various network components. In your config, you can +# wrap these in gdb, valgrind, strace, udtrace etc. See README for details. +CMD_BSC="osmo-bsc" +CMD_BSCNAT="osmo-bsc-nat" +CMD_BTS="osmo-bts-virtual" +CMD_FREESWITCH="./freeswitch/freeswitch.sh" +CMD_GBPROXY="osmo-gbproxy" +CMD_GGSN="osmo-ggsn" +CMD_HLR="osmo-hlr" +CMD_HNBGW="osmo-hnbgw" +CMD_KAMAILIO="kamailio" +CMD_MGW="osmo-mgw" +CMD_MS="mobile" +CMD_MSC="osmo-msc" +CMD_SGSN="osmo-sgsn" +CMD_SIPCON="osmo-sip-connector" +CMD_STP="osmo-stp" +CMD_VIRTPHY="virtphy" diff --git a/net/templates/run.sh b/net/templates/run.sh index a73f645..a7b0f9a 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -184,41 +184,15 @@ find_term kill_pids -hnbgw="osmo-hnbgw" -msc="gdb -ex run --args $(which osmo-msc)" -# To enable udtrace on osmo-msc MNCC socket, use this with adjusted /path/to/udtrace: -# - LD_LIBRARY_PATH allows linking to titan if udtrace was compiled with titan support. -# - LD_PRELOAD of libasan allows building osmo-msc with the sanitize.opts. -# - the tee saves the stderr logging as well as the udtrace output to new file current_log/osmo-msc.out, since udtrace -# will not show in osmo-msc.log -#msc="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/path/to/udtrace/libudtrace.so osmo-msc 2>&1 | tee -a current_log/osmo-msc.out" -gbproxy="osmo-gbproxy" -sgsn="osmo-sgsn" -ggsn="osmo-ggsn" -#mgw="gdb -ex run --args osmo-mgw" -#mgw="strace osmo-mgw" -mgw="osmo-mgw" -hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" -stp="osmo-stp" -bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" -bscnat="osmo-bsc-nat" -bts="osmo-bts-virtual" -virtphy="virtphy -D lo" -ms="mobile -c mobile.cfg" - if [ "x${MSC_MNCC}" != "xinternal" ]; then - sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" - case "${PBX_SERVER}" in "kamailio") # Require kamailio (PATH hack is needed for Debian) - kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)" - if [ -z "$kamailio" ]; then + if [ -z "$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)" ]; then echo "ERROR: kamailio is not installed." echo "After installing it, make sure that it does *not* run as daemon." exit 1 fi - kamailio="$kamailio -f kamailio.cfg -D -e -E" ;; "freeswitch") if [ -z "$(which freeswitch)" ]; then @@ -246,59 +220,59 @@ sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & echo "$!" > "$PIDFILE_TCPDUMP_LO" -term "$ggsn" GGSN +term "${CMD_GGSN}" GGSN if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then - term "$stp -c osmo-stp-cn.cfg" STP + term "${CMD_STP} -c osmo-stp-cn.cfg" STP else - term "$stp -c osmo-stp-cn.cfg" STP4CN - term "$stp -c osmo-stp-ran.cfg" STP4RAN - term "$mgw -c osmo-mgw-for-bsc-nat.cfg" MGW4BSCNAT - term "$bscnat" BSCNAT + term "${CMD_STP} -c osmo-stp-cn.cfg" STP4CN + term "${CMD_STP} -c osmo-stp-ran.cfg" STP4RAN + term "${CMD_MGW} -c osmo-mgw-for-bsc-nat.cfg" MGW4BSCNAT + term "${CMD_BSCNAT}" BSCNAT fi -term "$hlr" HLR -term "$sgsn" SGSN +term "${CMD_HLR} --db-upgrade" HLR +term "${CMD_SGSN}" SGSN if [ "${GBPROXY_RUN_IN_OSMO_DEV}" = 1 ]; then - term "$gbproxy" GBPROXY + term "${CMD_GBPROXY}" GBPROXY fi -term "$mgw -c osmo-mgw-for-msc.cfg" MGW4MSC -term "$msc" MSC -term "$hnbgw" HNBGW +term "${CMD_MGW} -c osmo-mgw-for-msc.cfg" MGW4MSC +term "${CMD_MSC}" MSC +term "${CMD_HNBGW}" HNBGW if [ "$BSC_COUNT" = 1 ]; then - term "$mgw -c osmo-mgw-for-bsc-0.cfg" MGW4BSC - term "$bsc -c osmo-bsc-0.cfg" BSC + term "${CMD_MGW} -c osmo-mgw-for-bsc-0.cfg" MGW4BSC + term "${CMD_BSC} -c osmo-bsc-0.cfg" BSC else - term "$mgw -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0 - term "$mgw -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1 - term "$bsc -c osmo-bsc-0.cfg" BSC0 - term "$bsc -c osmo-bsc-1.cfg" BSC1 + term "${CMD_MGW} -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0 + term "${CMD_MGW} -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1 + term "${CMD_BSC} -c osmo-bsc-0.cfg" BSC0 + term "${CMD_BSC} -c osmo-bsc-1.cfg" BSC1 fi ${foreach(BTS)} if [ "${BTSn_RUN_IN_OSMO_DEV}" = 1 ]; then - term "$bts -c osmo-bts-${BTSn}.cfg" BTS${BTSn} + term "${CMD_BTS} -c osmo-bts-${BTSn}.cfg" BTS${BTSn} fi ${foreach_end} if [ "${MS_RUN_IN_OSMO_DEV}" = 1 ]; then - term "$virtphy" VIRTPHY - term "$ms" MS + term "${CMD_VIRTPHY} -D lo" VIRTPHY + term "${CMD_MS} -c mobile.cfg" MS fi if [ "x${MSC_MNCC}" != "xinternal" ]; then - term "$sipcon" SIPCON + term "${CMD_SIPCON} -c osmo-sip-connector.cfg" SIPCON case "${PBX_SERVER}" in "kamailio") - term "$kamailio" KAMAILIO + term "${CMD_KAMAILIO} -f kamailio.cfg -D -e -E" KAMAILIO ;; "freeswitch") - term "./freeswitch/freeswitch.sh" FREESWITCH + term "${CMD_FREESWITCH}" FREESWITCH ;; esac fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ifce731ab61d263e9df7a8dc87dd572ca3d30f8dd Gerrit-Change-Number: 27458 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: only one variable for mgw

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27454 ) Change subject: net/templates/run.sh: only one variable for mgw ...................................................................... net/templates/run.sh: only one variable for mgw Prepare to add another MGW for the BSCNAT. Use only one variable for the mgw, always append the -c configfile parameter further below in the script where it gets used. Change-Id: I6f3fe11109107b35059ebe731e0a74a91a04504c --- M net/templates/run.sh 1 file changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/54/27454/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index c19c081..29e5347 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -185,10 +185,9 @@ gbproxy="osmo-gbproxy" sgsn="osmo-sgsn" ggsn="osmo-ggsn" -mgw4msc="osmo-mgw -c osmo-mgw-for-msc.cfg" -#mgw4bsc="gdb -ex run --args osmo-mgw" -#mgw4bsc="strace osmo-mgw" -mgw4bsc="osmo-mgw" +#mgw="gdb -ex run --args osmo-mgw" +#mgw="strace osmo-mgw" +mgw="osmo-mgw" hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" stp4cn="osmo-stp -c osmo-stp-cn.cfg" stp4ran="osmo-stp -c osmo-stp-ran.cfg" @@ -255,17 +254,17 @@ term "$gbproxy" GBPROXY fi -term "$mgw4msc" MGW4MSC +term "$mgw -c osmo-mgw-for-msc.cfg" MGW4MSC term "$msc" MSC term "$hnbgw" HNBGW if [ "$BSC_COUNT" = 1 ]; then - term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC + term "$mgw -c osmo-mgw-for-bsc-0.cfg" MGW4BSC term "$bsc -c osmo-bsc-0.cfg" BSC else - term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0 - term "$mgw4bsc -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1 + term "$mgw -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0 + term "$mgw -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1 term "$bsc -c osmo-bsc-0.cfg" BSC0 term "$bsc -c osmo-bsc-1.cfg" BSC1 fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6f3fe11109107b35059ebe731e0a74a91a04504c Gerrit-Change-Number: 27454 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022