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

Change in osmo-bsc-nat[master]: bsc_nat_fsm: tweak get_peer_addr

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 to look at the new patch set (#4). Change subject: bsc_nat_fsm: tweak get_peer_addr ...................................................................... bsc_nat_fsm: tweak get_peer_addr Rename the function from sccp_sap_get_peer_addr_in to get_peer_addr to make the code using it slightly more readable. The _in at the end of the function is not needed anymore, this was used to differentiate from peer_addr_out which was used in the caller code before the connection mapping was implemented in I1556aa665fbb0a97507f98794e74820731fa6935. Now instead of peer_addr_out, subscr_conn->bsc->addr or subscr_conn->msc->addr are used. Rename variable arguments to sccp_inst and addr to be consistent with the variable names in the callers. Related: SYS#5560 Change-Id: Ie023360724254be54cbaac4490b0341dfe68399f --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 10 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/77/27477/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 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: Ie023360724254be54cbaac4490b0341dfe68399f Gerrit-Change-Number: 27477 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

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

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 to look at the new patch set (#4). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/78/27478/4 -- 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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/46/27546/1 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: 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: use sub-structs for cn, ran

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/47/27547/1 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: 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]: bssap: drop tx_reset_ack

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27545 ) Change subject: bssap: drop tx_reset_ack ...................................................................... bssap: drop tx_reset_ack Merge with bssap_ran_handle_reset() since it makes upcoming refactoring of bsc_nat_print_addr less complicated. Related: SYS#5560 Change-Id: Ie1a967fb397f3ea1c3bb7bedbdd0a3a324d0996f --- M src/osmo-bsc-nat/bssap.c 1 file changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/45/27545/1 diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 5e15ecc..c054db6 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -25,19 +25,15 @@ #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> -static int tx_reset_ack(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) -{ - LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr(sccp_inst, addr)); - - struct msgb *msg = gsm0808_create_reset_ack(); - - return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); -} - static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { - LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(g_bsc_nat->ran, addr)); - return tx_reset_ack(g_bsc_nat->ran, addr); + 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) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27545 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: Ie1a967fb397f3ea1c3bb7bedbdd0a3a324d0996f Gerrit-Change-Number: 27545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

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

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27471 to look at the new patch set (#3). 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, 134 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/71/27471/3 -- 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: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

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

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27472 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/72/27472/3 -- 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: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

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

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27474 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/74/27474/3 -- 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: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

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

by osmith

Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/73/27473/3 -- 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: 3 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: newpatchset

3 years, 3 months

1
0
0 0

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

by osmith

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/76/27476/3 -- 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: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022