pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35515?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: GTPv2_Emulation: routing improvements: Prioritize response, fallback to TEID
......................................................................
GTPv2_Emulation: routing improvements: Prioritize response, fallback to TEID
First try forwarding to component transmitting the originating request,
since this is the most fine-grained match.
Finally, if no specific match was found and if messages belongs to
TEID0, send it over that port as a fallback.
Fixes: 1d2cc67036e95a0c3ee3ac7738d7e15d5f76b8a2
Change-Id: Ie96d65085fb352489150183415dbd6cc8237a47c
---
M library/GTPv2_Emulation.ttcn
1 file changed, 24 insertions(+), 6 deletions(-)
Approvals:
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn
index eb2b977..240cce4 100644
--- a/library/GTPv2_Emulation.ttcn
+++ b/library/GTPv2_Emulation.ttcn
@@ -560,7 +560,12 @@
/* route inbound GTP2-C based on TEID, SEQ or IMSI */
[] GTP2C.receive(Gtp2cUnitdata:?) -> value g2c_ud {
var template hexstring imsi_t := f_gtp2c_extract_imsi(g2c_ud.gtpc);
- if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) {
+ /* if this is a response, route by SEQ: */
+ if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses))
+ and f_seq_known(g2c_ud.gtpc.sequenceNumber)) {
+ vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber);
+ CLIENT.send(g2c_ud.gtpc) to vc_conn;
+ }else if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) {
vc_conn := f_comp_by_imsi(valueof(imsi_t));
CLIENT.send(g2c_ud.gtpc) to vc_conn;
} else if ((ispresent(g2c_ud.gtpc.tEID) and g2c_ud.gtpc.tEID != '00000000'O)
@@ -571,13 +576,11 @@
and f_teid_known('00000000'O)) {
vc_conn := f_comp_by_teid(g2c_ud.gtpc.tEID);
CLIENT.send(g2c_ud.gtpc) to vc_conn;
- /* if this is a response, route by SEQ: */
- } else if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses))
- and f_seq_known(g2c_ud.gtpc.sequenceNumber)) {
- vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber);
- CLIENT.send(g2c_ud.gtpc) to vc_conn;
} else {
SendToUdMsgTable(g2c_ud);
+ if (not ispresent(g2c_ud.gtpc.tEID) or g2c_ud.gtpc.tEID == '00000000'O) {
+ TEID0.send(g2c_ud.gtpc);
+ }
}
/* remove sequence number if response was received */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35515?usp=email
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: Ie96d65085fb352489150183415dbd6cc8237a47c
Gerrit-Change-Number: 35515
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35514?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes()
......................................................................
GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes()
The TEID field is optional, based on t_Bit. Hence, we also want to
match by type if there's no TEID.
Change-Id: I65044b8758046704e22f9057f34ce5fdbb7aabfe
---
M library/GTPv2_Templates.ttcn
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 5dea7e9..afe0138 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -106,7 +106,7 @@
version := '010'B,
messageType := types,
lengthf := ?,
- tEID := ?,
+ tEID := *,
sequenceNumber := ?,
spare3 := '00'O,
gtpcv2_pdu := ?,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35514?usp=email
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: I65044b8758046704e22f9057f34ce5fdbb7aabfe
Gerrit-Change-Number: 35514
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: jolly, lynxis lazus.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35567?usp=email )
Change subject: VTY: Add command `show bts online`
......................................................................
Patch Set 1:
(2 comments)
File src/osmo-bsc/bsc_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/35567/comment/893773ba_ff87bb28
PS1, Line 262: Display availability status of all BTS
`online` in the command name suggests that the command is supposed to show only those BTS instances, which are online. However, it's actually more like `brief`.
https://gerrit.osmocom.org/c/osmo-bsc/+/35567/comment/3c2438f5_47eee87a
PS1, Line 268: for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++)
Not a performance critical path, but I would still suggest doing this:
```
llist_for_each_entry(bts, &net->bts_list, list)
```
instead. This is what `gsm_bts_num()` does internally. The problem with the current approach is that the higher `bts_nr` you pass it, the more iterations it takes to find the BTS instance.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35567?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I003fd32e589ddf53b7dd42089f904cfb598e3625
Gerrit-Change-Number: 35567
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Mon, 15 Jan 2024 18:27:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge, tnt.
jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/35558?usp=email )
Change subject: Add functions to events from server to client
......................................................................
Patch Set 2:
(4 comments)
File src/e1d.h:
https://gerrit.osmocom.org/c/osmo-e1d/+/35558/comment/405fdac9_7b1c7b6c
PS1, Line 199: void *srv;
> Ok, I see it used in further patches, but then I'd use the proper type struct osmo_e1dp_server. […]
It is required for future patches to refer to the server.
File src/osmo-e1gen.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/35558/comment/e02eb6be_7b03e0f1
PS1, Line 440: void osmo_e1dp_server_event(void) {}
> Why do we need this ?
the server is only available for osmo-e1d binary, not for osmo-e1gen binary. The dummy function just ignores the events for the non-existent protocol server.
File src/proto_clnt.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/35558/comment/98295107_1f6eca29
PS1, Line 72: void (*event_cb)(enum osmo_e1dp_msg_type event, uint8_t intf, uint8_t line, uint8_t ts, uint8_t *data, int len);
> Maybe typedef some type osmo_e1dp_event_cb_t or something ?
Done
https://gerrit.osmocom.org/c/osmo-e1d/+/35558/comment/03c6905e_5fb6dcfd
PS1, Line 85: clnt->event_cb(hdr->type, hdr->intf, hdr->line, hdr->ts, msgb_l1(msgb) + sizeof(*hdr), msgb_l1len(msgb) - sizeof(*hdr));
> Shouldn't msgb_l2() work ? And if not, having the l2h set by earlier code would probably be good.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35558?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I5ee3268f8349b611c3cf3fa0572dc5eab280ab2e
Gerrit-Change-Number: 35558
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Mon, 15 Jan 2024 18:27:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: comment
Attention is currently required from: laforge, tnt.
jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/35557?usp=email )
Change subject: Add new protocol command and events for Sa bits and line states
......................................................................
Patch Set 2:
(2 comments)
File include/osmocom/e1d/proto.h:
https://gerrit.osmocom.org/c/osmo-e1d/+/35557/comment/0db4c6c8_0679e6d7
PS1, Line 83: E1DP_EVT_SABITS = 0x7f,
> any specific reason to go with 0x7f rather than the next free +1, i.e. […]
If new line events are added in the future, I don't want to have Sa-bits event between line events.
File src/proto.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/35557/comment/d74259ac_3abdb1ce
PS1, Line 44: { E1DP_CMD_SABITS, "E1DP_CMD_SABITS" },
> Remove E1DP_ prefix for consistency
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35557?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I4c20ec19fa3d9cce82c8199b38d173aa272fb07d
Gerrit-Change-Number: 35557
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Mon, 15 Jan 2024 18:26:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: comment
Attention is currently required from: laforge, tnt.
jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/35559?usp=email )
Change subject: Indicate framing alignment error as loss of framing signal
......................................................................
Patch Set 1:
(1 comment)
File src/usb.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/35559/comment/22ba72d1_a9cddc93
PS1, Line 401: if ((errcnt->flags & ICE1USB_ERR_F_ALIGN_ERR)) {
> I might be misremembering but that's not AIS […]
change it to LOF (loss of framing)
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35559?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Iaad3adb6afb9e1d8a002fa4a04ba4ab8e51671a3
Gerrit-Change-Number: 35559
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Mon, 15 Jan 2024 18:26:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: comment
Attention is currently required from: jolly, tnt.
Hello Jenkins Builder, laforge, tnt,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: Add support for sending and receiving Sa bits, as well as some line signals
......................................................................
Add support for sending and receiving Sa bits, as well as some line signals
The Sa bits are required for osmo-v5. V5.2 interface must alter and
detect Sa7 bit on time slot 0. 'Fastlink' multiplexers do not allow to
disable link check with Sa7, so that it must be supported by osmo-v5.
Requires: osmo-e1d Change-Id I2608af7bbb8092fddd68d4f3bb36b10a1100ce0f
Change-Id: Ie7643693c2daac99f5747591decd60e982b8052a
---
M include/osmocom/abis/e1_input.h
M src/e1_input.c
M src/input/e1d.c
3 files changed, 97 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/63/35563/3
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Ie7643693c2daac99f5747591decd60e982b8052a
Gerrit-Change-Number: 35563
Gerrit-PatchSet: 3
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: newpatchset
Attention is currently required from: jolly, laforge.
Hello Jenkins Builder, laforge, tnt,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-e1d/+/35559?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: Indicate framing alignment error as loss of framing signal
......................................................................
Indicate framing alignment error as loss of framing signal
Change-Id: Iaad3adb6afb9e1d8a002fa4a04ba4ab8e51671a3
---
M src/usb.c
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/59/35559/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35559?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Iaad3adb6afb9e1d8a002fa4a04ba4ab8e51671a3
Gerrit-Change-Number: 35559
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: jolly, laforge.
Hello Jenkins Builder, laforge, tnt,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-e1d/+/35557?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: Add new protocol command and events for Sa bits and line states
......................................................................
Add new protocol command and events for Sa bits and line states
Change-Id: I4c20ec19fa3d9cce82c8199b38d173aa272fb07d
---
M include/osmocom/e1d/proto.h
M src/proto.c
2 files changed, 51 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/57/35557/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35557?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I4c20ec19fa3d9cce82c8199b38d173aa272fb07d
Gerrit-Change-Number: 35557
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset