Attention is currently required from: fixeria.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 )
Change subject: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File library/BSSMAP_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567/comment/730a157f_30a2…
PS1, Line 1908: rTC := '00'B /* Response Time is not specified */
so many magic numbers... i guess it would be quite some effort to define these values in enums?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If2bd6e636d3ee695abab9ed40417dc53ec68fd12
Gerrit-Change-Number: 27567
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 23 Mar 2022 15:29:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 )
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(-)
Approvals:
osmith: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
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 090c38f..d3a3b01 100644
--- a/src/osmo-bsc-nat/bsc_nat_fsm.c
+++ b/src/osmo-bsc-nat/bsc_nat_fsm.c
@@ -52,14 +52,14 @@
/* For connection-oriented messages, figure out which side is not the BSCNAT,
* either the called_addr or calling_addr. */
-static int sccp_sap_get_peer_addr_in(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr **peer_addr_in,
- struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr)
+static int get_peer_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr **addr,
+ struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr)
{
- if (osmo_sccp_addr_ri_cmp(&src->addr, called_addr) != 0) {
- *peer_addr_in = called_addr;
+ if (osmo_sccp_addr_ri_cmp(&sccp_inst->addr, called_addr) != 0) {
+ *addr = called_addr;
return 0;
- } else if (osmo_sccp_addr_ri_cmp(&src->addr, calling_addr) != 0) {
- *peer_addr_in = calling_addr;
+ } else if (osmo_sccp_addr_ri_cmp(&sccp_inst->addr, calling_addr) != 0) {
+ *addr = calling_addr;
return 0;
}
@@ -71,7 +71,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->addr), buf_called, buf_calling);
+ osmo_sccp_inst_addr_name(NULL, &sccp_inst->addr), buf_called, buf_calling);
return -1;
}
@@ -96,8 +96,7 @@
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)
+ if (get_peer_addr(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0)
goto error;
subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_CN);
@@ -195,8 +194,7 @@
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)
+ if (get_peer_addr(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0)
goto error;
bsc = bsc_get_by_pc(addr->pc);
@@ -225,8 +223,7 @@
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)
+ if (get_peer_addr(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0)
goto error;
subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_RAN);
--
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: 5
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 )
Change subject: README: add Manual Testing With osmo-dev
......................................................................
README: add Manual Testing With osmo-dev
Describe the manual testing that can be done with osmo-dev with the
changes up to I78ef36c72ff9a7b801e922eccc89dc44fbba7f23.
Related: SYS#5560
Change-Id: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd
---
M README.md
1 file changed, 23 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/README.md b/README.md
index 8ed9954..ca367a2 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,29 @@
[Osmocom Mailing List Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_Li…
when posting.
+Manual Testing With osmo-dev
+----------
+
+With [osmo-dev](https://git.osmocom.org/osmo-dev/) it is possible to
+build all Osmocom components for a full test network with OsmoBSCNAT,
+and run the network on your PC. Set up the make directory as described
+in osmo-dev's README, then build components with:
+
+```
+$ make cn-bsc-nat
+```
+
+Set up a network as described in osmo-dev's net/README, then put the
+following in your configuration to let it run osmo-bsc-nat with one
+virtual BSC, BTS and MS (can be used next to a real BSC/BTS/MS):
+
+```
+BSC_COUNT=2
+BTS1_RUN_IN_OSMO_DEV=1
+STP_RAN_IP="127.0.0.2"
+MS_RUN_IN_OSMO_DEV=1
+```
+
Contributing
------------
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc-nat
Gerrit-Branch: master
Gerrit-Change-Id: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd
Gerrit-Change-Number: 27478
Gerrit-PatchSet: 5
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged