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

Change in osmo-bts[osmith/1.4.1]: debian/control: add osmo-bts meta-package

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27543 ) Change subject: debian/control: add osmo-bts meta-package ...................................................................... debian/control: add osmo-bts meta-package Add an osmo-bts meta-package that depends on the subpackages osmo-bts-trx and osmo-bts-virtual. This is important, because the downstream packaging of debian does not split osmo-bts in subpackages, it has only one osmo-bts package. So without this, when installing "osmo-bts" in debian while having the Osmocom binary package repository installed and expecting to get the newer version, the user will actually get the older version from debian. Closes: OS#5319 Related: https://salsa.debian.org/debian-mobcom-team/osmo-bts/-/blob/master/debian/c… Change-Id: I1a6edf2eb146616ac51b7957368a8d057caa685f (cherry picked from commit a271ca7fc733e7487f8bc9e3f825f158526f19fb) --- M debian/control 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian/control b/debian/control index 0bdf48c..2cb152d 100644 --- a/debian/control +++ b/debian/control @@ -17,9 +17,25 @@ Vcs-Git: git://git.osmocom.org/osmo-bts Homepage: https://projects.osmocom.org/projects/osmobts +Package: osmo-bts +Architecture: any +Depends: osmo-bts-trx, osmo-bts-virtual, ${misc:Depends} +Description: Base Transceiver Station for GSM + OsmoBTS is a software implementation of Layer2/3 of a BTS. It implements the + following protocols/interfaces: + LAPDm (GSM 04.06) + RTP + A-bis/IP in IPA multiplex + OML (GSM TS 12.21) + RSL (GSM TS 08.58) + . + OsmoBTS is modular and has support for multiple back-ends. A back-end talks to + a specific L1/PHY implementation of the respective BTS hardware. Based on this + architecture, it should be relatively easy to add a new back-end to support + so-far unsupported GSM PHY/L1 and associated hardware. + Package: osmo-bts-trx Architecture: any -Conflicts: osmo-bts Depends: ${shlibs:Depends}, ${misc:Depends} Description: osmo-bts-trx GSM BTS with osmo-trx osmo-bts-trx to be used with the osmo-trx application @@ -34,7 +50,6 @@ Package: osmo-bts-virtual Architecture: any -Conflicts: osmo-bts Depends: ${shlibs:Depends}, ${misc:Depends} Description: Virtual Osmocom GSM BTS (no RF hardware; GSMTAP/UDP) This version of OsmoBTS doesn't use actual GSM PHY/Hardware/RF, but -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.4.1 Gerrit-Change-Id: I1a6edf2eb146616ac51b7957368a8d057caa685f Gerrit-Change-Number: 27543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bts[osmith/1.4.1]: Bump version: 1.4.0.1-34714 → 1.4.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27544 ) Change subject: Bump version: 1.4.0.1-34714 → 1.4.1 ...................................................................... Bump version: 1.4.0.1-34714 → 1.4.1 Related: OS#5319 Change-Id: Id75cd26c36741c86753a45797c573d95a09fb555 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 3ad028b..c4014b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bts (1.4.1) unstable; urgency=medium + + * debian/control: add osmo-bts meta-package + + -- Oliver Smith <osmith(a)sysmocom.de> Mon, 21 Mar 2022 14:51:33 +0100 + osmo-bts (1.4.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.4.1 Gerrit-Change-Id: Id75cd26c36741c86753a45797c573d95a09fb555 Gerrit-Change-Number: 27544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bts[osmith/1.4.1]: Bump version: 1.4.0.1-34714 → 1.4.1

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27544 ) Change subject: Bump version: 1.4.0.1-34714 → 1.4.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.4.1 Gerrit-Change-Id: Id75cd26c36741c86753a45797c573d95a09fb555 Gerrit-Change-Number: 27544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Mar 2022 14:06:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bts[osmith/1.4.1]: debian/control: add osmo-bts meta-package

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27543 ) Change subject: debian/control: add osmo-bts meta-package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.4.1 Gerrit-Change-Id: I1a6edf2eb146616ac51b7957368a8d057caa685f Gerrit-Change-Number: 27543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Mar 2022 14:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bts[osmith/1.4.1]: Bump version: 1.4.0.1-34714 → 1.4.1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27544 ) Change subject: Bump version: 1.4.0.1-34714 → 1.4.1 ...................................................................... Bump version: 1.4.0.1-34714 → 1.4.1 Related: OS#5319 Change-Id: Id75cd26c36741c86753a45797c573d95a09fb555 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/27544/1 diff --git a/debian/changelog b/debian/changelog index 3ad028b..c4014b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-bts (1.4.1) unstable; urgency=medium + + * debian/control: add osmo-bts meta-package + + -- Oliver Smith <osmith(a)sysmocom.de> Mon, 21 Mar 2022 14:51:33 +0100 + osmo-bts (1.4.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.4.1 Gerrit-Change-Id: Id75cd26c36741c86753a45797c573d95a09fb555 Gerrit-Change-Number: 27544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bts[osmith/1.4.1]: debian/control: add osmo-bts meta-package

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27543 ) Change subject: debian/control: add osmo-bts meta-package ...................................................................... debian/control: add osmo-bts meta-package Add an osmo-bts meta-package that depends on the subpackages osmo-bts-trx and osmo-bts-virtual. This is important, because the downstream packaging of debian does not split osmo-bts in subpackages, it has only one osmo-bts package. So without this, when installing "osmo-bts" in debian while having the Osmocom binary package repository installed and expecting to get the newer version, the user will actually get the older version from debian. Closes: OS#5319 Related: https://salsa.debian.org/debian-mobcom-team/osmo-bts/-/blob/master/debian/c… Change-Id: I1a6edf2eb146616ac51b7957368a8d057caa685f (cherry picked from commit a271ca7fc733e7487f8bc9e3f825f158526f19fb) --- M debian/control 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/43/27543/1 diff --git a/debian/control b/debian/control index 0bdf48c..2cb152d 100644 --- a/debian/control +++ b/debian/control @@ -17,9 +17,25 @@ Vcs-Git: git://git.osmocom.org/osmo-bts Homepage: https://projects.osmocom.org/projects/osmobts +Package: osmo-bts +Architecture: any +Depends: osmo-bts-trx, osmo-bts-virtual, ${misc:Depends} +Description: Base Transceiver Station for GSM + OsmoBTS is a software implementation of Layer2/3 of a BTS. It implements the + following protocols/interfaces: + LAPDm (GSM 04.06) + RTP + A-bis/IP in IPA multiplex + OML (GSM TS 12.21) + RSL (GSM TS 08.58) + . + OsmoBTS is modular and has support for multiple back-ends. A back-end talks to + a specific L1/PHY implementation of the respective BTS hardware. Based on this + architecture, it should be relatively easy to add a new back-end to support + so-far unsupported GSM PHY/L1 and associated hardware. + Package: osmo-bts-trx Architecture: any -Conflicts: osmo-bts Depends: ${shlibs:Depends}, ${misc:Depends} Description: osmo-bts-trx GSM BTS with osmo-trx osmo-bts-trx to be used with the osmo-trx application @@ -34,7 +50,6 @@ Package: osmo-bts-virtual Architecture: any -Conflicts: osmo-bts Depends: ${shlibs:Depends}, ${misc:Depends} Description: Virtual Osmocom GSM BTS (no RF hardware; GSMTAP/UDP) This version of OsmoBTS doesn't use actual GSM PHY/Hardware/RF, but -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.4.1 Gerrit-Change-Id: I1a6edf2eb146616ac51b7957368a8d057caa685f Gerrit-Change-Number: 27543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

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

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 ) Change subject: Store MSC ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: Created https://osmocom.org/issues/5492 for MSC pooling with the comments from here. -- 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: 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:42:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

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

by osmith

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

3 years, 3 months

1
0
0 0

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

by osmith

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

3 years, 3 months

1
0
0 0

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

by osmith

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

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022