pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27730 )
Change subject: DIAMETER_Emulation: Fix typo in comment
......................................................................
DIAMETER_Emulation: Fix typo in comment
Change-Id: I6163fc9153082598c7211b16a7c18fb95cf3d08a
---
M library/DIAMETER_Emulation.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/27730/1
diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn
index e53f4e5..0f1b9fe 100644
--- a/library/DIAMETER_Emulation.ttcn
+++ b/library/DIAMETER_Emulation.ttcn
@@ -399,7 +399,7 @@
inout DIAMETEREM_register;
} with { extension "internal" };
-/* Function that can be used as create_cb and will usse the expect table */
+/* Function that can be used as create_cb and will use the expect table */
function ExpectedCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id)
runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr {
var DIAMETER_ConnHdlr ret := null;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27730
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: I6163fc9153082598c7211b16a7c18fb95cf3d08a
Gerrit-Change-Number: 27730
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27731 )
Change subject: DIAMETER_Emulation: Allow up to 256 IMSI Diameter components
......................................................................
DIAMETER_Emulation: Allow up to 256 IMSI Diameter components
TC_createSession_ping4_256 requries 256 concurrent connections.
Change-Id: Idc305a868f827dee63a476979fc9de9fc12580c5
---
M library/DIAMETER_Emulation.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/27731/1
diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn
index 0f1b9fe..8fb7230 100644
--- a/library/DIAMETER_Emulation.ttcn
+++ b/library/DIAMETER_Emulation.ttcn
@@ -78,9 +78,9 @@
* to send where with CLIENT.send() to vc_conn */
port DIAMETER_Conn_PT DIAMETER_CLIENT;
/* currently tracked connections */
- var AssociationData DiameterAssocTable[16];
+ var AssociationData DiameterAssocTable[256];
/* pending expected CRCX */
- var ExpectData DiameterExpectTable[8];
+ var ExpectData DiameterExpectTable[256];
/* procedure based port to register for incoming connections */
port DIAMETEREM_PROC_PT DIAMETER_PROC;
/* test port for unit data messages */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27731
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: Idc305a868f827dee63a476979fc9de9fc12580c5
Gerrit-Change-Number: 27731
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27729 )
Change subject: DIAMETER_Emulation: Rename association table
......................................................................
DIAMETER_Emulation: Rename association table
The table has no direct relation to SGSAP, it tracks IMSI connections in
a generic way.
Change-Id: I12399465549739fb99af193e7071fff8bc452b0b
---
M library/DIAMETER_Emulation.ttcn
1 file changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/27729/1
diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn
index 73fc87c..e53f4e5 100644
--- a/library/DIAMETER_Emulation.ttcn
+++ b/library/DIAMETER_Emulation.ttcn
@@ -78,7 +78,7 @@
* to send where with CLIENT.send() to vc_conn */
port DIAMETER_Conn_PT DIAMETER_CLIENT;
/* currently tracked connections */
- var AssociationData SgsapAssociationTable[16];
+ var AssociationData DiameterAssocTable[16];
/* pending expected CRCX */
var ExpectData DiameterExpectTable[8];
/* procedure based port to register for incoming connections */
@@ -131,8 +131,8 @@
private function f_imsi_known(hexstring imsi)
runs on DIAMETER_Emulation_CT return boolean {
var integer i;
- for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- if (SgsapAssociationTable[i].imsi == imsi) {
+ for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ if (DiameterAssocTable[i].imsi == imsi) {
return true;
}
}
@@ -142,8 +142,8 @@
private function f_comp_known(DIAMETER_ConnHdlr client)
runs on DIAMETER_Emulation_CT return boolean {
var integer i;
- for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- if (SgsapAssociationTable[i].comp_ref == client) {
+ for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ if (DiameterAssocTable[i].comp_ref == client) {
return true;
}
}
@@ -153,9 +153,9 @@
private function f_comp_by_imsi(hexstring imsi)
runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr {
var integer i;
- for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- if (SgsapAssociationTable[i].imsi == imsi) {
- return SgsapAssociationTable[i].comp_ref;
+ for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ if (DiameterAssocTable[i].imsi == imsi) {
+ return DiameterAssocTable[i].comp_ref;
}
}
setverdict(fail, "DIAMETER Association Table not found by IMSI", imsi);
@@ -165,9 +165,9 @@
private function f_imsi_by_comp(DIAMETER_ConnHdlr client)
runs on DIAMETER_Emulation_CT return hexstring {
var integer i;
- for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- if (SgsapAssociationTable[i].comp_ref == client) {
- return SgsapAssociationTable[i].imsi;
+ for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ if (DiameterAssocTable[i].comp_ref == client) {
+ return DiameterAssocTable[i].imsi;
}
}
setverdict(fail, "DIAMETER Association Table not found by component ", client);
@@ -177,10 +177,10 @@
private function f_imsi_table_add(DIAMETER_ConnHdlr comp_ref, hexstring imsi)
runs on DIAMETER_Emulation_CT {
var integer i;
- for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- if (not isvalue(SgsapAssociationTable[i].imsi)) {
- SgsapAssociationTable[i].imsi := imsi;
- SgsapAssociationTable[i].comp_ref := comp_ref;
+ for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ if (not isvalue(DiameterAssocTable[i].imsi)) {
+ DiameterAssocTable[i].imsi := imsi;
+ DiameterAssocTable[i].comp_ref := comp_ref;
return;
}
}
@@ -190,11 +190,11 @@
private function f_imsi_table_del(DIAMETER_ConnHdlr comp_ref, hexstring imsi)
runs on DIAMETER_Emulation_CT {
var integer i;
- for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- if (SgsapAssociationTable[i].comp_ref == comp_ref and
- SgsapAssociationTable[i].imsi == imsi) {
- SgsapAssociationTable[i].imsi := omit;
- SgsapAssociationTable[i].comp_ref := null;
+ for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ if (DiameterAssocTable[i].comp_ref == comp_ref and
+ DiameterAssocTable[i].imsi == imsi) {
+ DiameterAssocTable[i].imsi := omit;
+ DiameterAssocTable[i].comp_ref := null;
return;
}
}
@@ -205,9 +205,9 @@
private function f_imsi_table_init()
runs on DIAMETER_Emulation_CT {
- for (var integer i := 0; i < sizeof(SgsapAssociationTable); i := i+1) {
- SgsapAssociationTable[i].comp_ref := null;
- SgsapAssociationTable[i].imsi := omit;
+ for (var integer i := 0; i < sizeof(DiameterAssocTable); i := i+1) {
+ DiameterAssocTable[i].comp_ref := null;
+ DiameterAssocTable[i].imsi := omit;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27729
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: I12399465549739fb99af193e7071fff8bc452b0b
Gerrit-Change-Number: 27729
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27711 )
Change subject: Make subscr_conn_get_next_id RAN specific
......................................................................
Patch Set 3:
(1 comment)
File src/osmo-bsc-nat/subscr_conn.c:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27711/comment/40934572_29ce0302
PS2, Line 31: {
> I think it makes much more sense to have 3 separate functions, other than having a 1 more complex fu […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27711
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: I77b0ef33f94c401d24f38eb8d79e1007234e0ab4
Gerrit-Change-Number: 27711
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 11 Apr 2022 10:24:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710 )
Change subject: Parse BSSMAP in conn-oriented data
......................................................................
Patch Set 3:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710/comment/90662c39_537a630d
PS2, Line 9: Add functions the parse the BSSMAP part of BSSAP messages, and in theory
> to parse?
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710
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: I3e2599a9a07925afdbe69f7b8dbcec227681dfa2
Gerrit-Change-Number: 27710
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 11 Apr 2022 10:24:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712 )
Change subject: Add subscr_conn_fsm
......................................................................
Patch Set 3:
(7 comments)
File include/osmocom/bsc_nat/bssap.h:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/00c102bf_20721566
PS2, Line 30: struct bssmap_assignment_rqst {
> bssmap_ass_req?
Done
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/03790ba0_9b9cba3d
PS2, Line 47: struct bssmap_assignment_complete {
> bssmap_ass_compl?
Done
File src/osmo-bsc-nat/bssap_conn.c:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/2e653571_9d03d99b
PS2, Line 69: static int bssmap_cn_handle_assignment_rqst(struct subscr_conn *subscr_conn, struct msgb *msg, unsigned int length)
> bssmap_cn_handle_ass_req?
Done
File src/osmo-bsc-nat/subscr_conn.c:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/85bb7e60_ea5bbadf
PS2, Line 32: int subscr_conn_get_next_id(enum subscr_conn_id_type id_type)
> I'd rather split in 3 functions, using a macro if necessary.
Done
File src/osmo-bsc-nat/subscr_conn_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/02e773ca_62f00c8a
PS2, Line 72: case SUBSCR_CONN_FSM_EV_BSSMAP_CLEAR_COMMAND:
> missing break. Probably not affecting in behavior but I don't see an intended fall-through here.
This was intentional, but added a break to make it explicit.
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/e545b812_a5b5d305
PS2, Line 172: static int tx_assignment_request_to_ran(const struct subscr_conn *subscr_conn)
> If possible please move helper functions to the top, and put all the state FM functions together.
Done
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712/comment/d8535d82_7b0a4c30
PS2, Line 351: ,
> nice style to lose one an extra line for no good reason :D (j/k)
Neels invented this, but I like how it's diff friendly :)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27712
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: I7e491aada6f5db0eb35ef2039869c6ba07f9ca3b
Gerrit-Change-Number: 27712
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 11 Apr 2022 10:23:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708
to look at the new patch set (#3).
Change subject: Proper exit if bsc_nat_fsm fails to start
......................................................................
Proper exit if bsc_nat_fsm fails to start
Instead of segfaulting later on, properly exit if the bsc_nat_fsm does
not start. One reason for having it fail could be a missing mgw pool
config block.
Related: SYS#5560
Change-Id: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6
---
M include/osmocom/bsc_nat/bsc_nat_fsm.h
M src/osmo-bsc-nat/bsc_nat_fsm.c
M src/osmo-bsc-nat/main.c
3 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/08/27708/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708
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: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6
Gerrit-Change-Number: 27708
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset