[S] Change in osmo-bts[master]: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/36706?usp=email ) Change subject: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS .. rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS This addition to Abis RSL is an Osmocom-specific IE, intended for Osmocom flavor of Abis over IP. It requests the use of non-standard enhanced RTP transport formats. Change-Id: I6117049b17ced5fb6635ac70d9238169033af4de --- M doc/manuals/abis/rsl.adoc 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/36706/1 diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc index e627f5c..09c7207 100644 --- a/doc/manuals/abis/rsl.adoc +++ b/doc/manuals/abis/rsl.adoc @@ -518,6 +518,7 @@ | IP Speech Mode | <> | O | TV | 2 | RTP Payload Type 2 | <> | O | TV | 2 | RTP CSD Format | <> | O | TV | 2 +| RTP Extensions | <> | O | TLV | 3 |=== [[rsl_crcx_msg_ack]] @@ -579,6 +580,7 @@ | IP Speech Mode | <> | O | TV | 2 | RTP Payload Type 2 | <> | O | TV | 2 | RTP CSD Format | <> | O | TV | 2 +| RTP Extensions | <> | O | TLV | 3 |=== [[rsl_mdcx_msg_ack]] @@ -867,6 +869,9 @@ | 0x01 | RSL_IE_CHAN_NR | <> | 0x60 | RSL_IE_OSMO_REP_ACCH_CAP | <> | 0x61 | RSL_IE_OSMO_TRAINING_SEQUENCE | <> +| 0x62 | RSL_IE_OSMO_TEMP_OVP_ACCH_CAP | <> +| 0x63 | RSL_IE_OSMO_OSMUX_CID | <> +| 0x64 | RSL_IE_OSMO_RTP_EXTENSIONS | <> | 0xf0 | RSL_IE_IPAC_REMOTE_IP | <> | 0xf1 | RSL_IE_IPAC_REMOTE_PORT | <> | 0xf3 | RSL_IE_IPAC_LOCAL_PORT | <> @@ -1089,6 +1094,30 @@ | 8..255 | reserved values |=== +[[RSL_IE_OSMO_TEMP_OVP_ACCH_CAP]] + RSL_IE_OSMO_TEMP_OVP_ACCH_CAP + +FIXME. + +[[RSL_IE_OSMO_OSMUX_CID]] + RSL_IE_OSMO_OSMUX_CID + +FIXME. + +[[RSL_IE_OSMO_RTP_EXTENSIONS]] + RSL_IE_OSMO_RTP_EXTENSIONS + +This information element requests the use of non-standard enhanced RTP +transport formats, currently TW-TS-001 and TW-TS-002, but possibly +other formats in the future. +Only the first octet is currently defined, any additional octets +are for future expansion. + +The first octet of this IE has the same bit definitions as in TW-TS-003: +the least significant bit indicates the use of TW-TS-001, the second +least significant bit indicates the use of TW-TS-002, and all other bits +are reserved. + [[RSL_IE_IPAC_RTP_CSD_FORMAT]] RSL_IE_IPAC_RTP_CSD_FORMAT -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36706?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6117049b17ced5fb6635ac70d9238169033af4de Gerrit-Change-Number: 36706 Gerrit-PatchSet: 1 Gerrit-Owner: falconia Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: rsl: define RSL_IE_OSMO_RTP_EXTENSIONS
falconia has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/36705?usp=email )
Change subject: rsl: define RSL_IE_OSMO_RTP_EXTENSIONS
..
rsl: define RSL_IE_OSMO_RTP_EXTENSIONS
This addition to Abis RSL is an Osmocom-specific IE, intended for
Osmocom flavor of Abis over IP. It requests the use of non-standard
enhanced RTP transport formats. Complete description of this new IE
appears in the accompanying patch to OsmoBTS Abis Protocol Specification
document in osmo-bts repository.
Change-Id: I9ac692062e05f859ba56235375bdc10f212cb2c0
---
M include/osmocom/gsm/protocol/gsm_08_58.h
M src/gsm/rsl.c
2 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/36705/1
diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h
b/include/osmocom/gsm/protocol/gsm_08_58.h
index e8758df..13e84ba 100644
--- a/include/osmocom/gsm/protocol/gsm_08_58.h
+++ b/include/osmocom/gsm/protocol/gsm_08_58.h
@@ -373,6 +373,7 @@
RSL_IE_OSMO_TRAINING_SEQUENCE = 0x61,
RSL_IE_OSMO_TEMP_OVP_ACCH_CAP = 0x62,
RSL_IE_OSMO_OSMUX_CID = 0x63,
+ RSL_IE_OSMO_RTP_EXTENSIONS = 0x64,
/* ip.access */
RSL_IE_IPAC_SRTP_CONFIG = 0xe0,
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index fbba982..c7d69a1 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -126,6 +126,7 @@
[RSL_IE_OSMO_TRAINING_SEQUENCE] = { TLV_TYPE_TLV },
[RSL_IE_OSMO_TEMP_OVP_ACCH_CAP] = { TLV_TYPE_TLV },
[RSL_IE_OSMO_OSMUX_CID] = { TLV_TYPE_TLV },
+ [RSL_IE_OSMO_RTP_EXTENSIONS]= { TLV_TYPE_TLV },
[RSL_IE_IPAC_SRTP_CONFIG] = { TLV_TYPE_TLV },
[RSL_IE_IPAC_PROXY_UDP] = { TLV_TYPE_FIXED, 2 },
[RSL_IE_IPAC_BSCMPL_TOUT] = { TLV_TYPE_TV },
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36705?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9ac692062e05f859ba56235375bdc10f212cb2c0
Gerrit-Change-Number: 36705
Gerrit-PatchSet: 1
Gerrit-Owner: falconia
Gerrit-MessageType: newchange
[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode
Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode .. Patch Set 2: (1 comment) Patchset: PS2: > just to be clear: this will not break backwards compatibility between new > DAHDI driver and old firmw […] No, it will do the exact same thing as before. In the old firmware the 'rx mode' does nothing. -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 01 May 2024 12:57:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: icE1usb: Report BLUE alarm when receiving AIS
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email ) Change subject: icE1usb: Report BLUE alarm when receiving AIS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I75ae15d3b8e13ca6b82a20209ee9ca163a729020 Gerrit-Change-Number: 36694 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:54:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: icE1usb: Show accumulated error count from GPSDO state in sysfs
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email ) Change subject: icE1usb: Show accumulated error count from GPSDO state in sysfs .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Idc4ff2a3a7411df758a432fc4c6fe5a88963b626 Gerrit-Change-Number: 36695 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:54:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: icE1usb: Update ice1usb_proto.h
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email ) Change subject: icE1usb: Update ice1usb_proto.h .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I17a1bbf27cfb423ba09146e2cc57b585d511ec49 Gerrit-Change-Number: 36693 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:53:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode .. Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: just to be clear: this will not break backwards compatibility between new DAHDI driver and old firmware, right? -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:53:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: icE1usb: Fix "typo" in ALL_RY_ALARMS
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email ) Change subject: icE1usb: Fix "typo" in ALL_RY_ALARMS .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib0ef30f629d3e463871a0ee3ab6b0b94cb511804 Gerrit-Change-Number: 36692 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:52:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email ) Change subject: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Gerrit-Change-Number: 36654 Gerrit-PatchSet: 2 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:52:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: Fix build against linux >= 6.5.12
laforge has submitted this change. (
https://gerrit.osmocom.org/c/dahdi-linux/+/36700?usp=email )
Change subject: Fix build against linux >= 6.5.12
..
Fix build against linux >= 6.5.12
adapted from
https://github.com/asterisk/dahdi-linux/commit/a370c800599b8ee0ca1a843920452941e4d4dadc
see
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c4f135d643823a86
https://lore.kernel.org/all/49925af7-78a8-a3dd-bce6-cfc02e1a9...@i-love.sakura.ne.jp/T/#u
Change-Id: I992eccc503a19e348d3575147edcb9c2e78845eb
---
M include/dahdi/kernel.h
1 file changed, 26 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 0a25854..b707753 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1426,6 +1426,16 @@
/*! Maximum audio mask */
#define DAHDI_FORMAT_AUDIO_MASK((1 << 16) - 1)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(6,5,12)
+#undef flush_scheduled_work
+#define flush_scheduled_work() \
+({ \
+ if (0) \
+ __warn_flushing_systemwide_wq();\
+ __flush_workqueue(system_wq); \
+})
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
#ifndef TIMER_DATA_TYPE
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36700?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: I992eccc503a19e348d3575147edcb9c2e78845eb
Gerrit-Change-Number: 36700
Gerrit-PatchSet: 2
Gerrit-Owner: roox
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration
laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email ) Change subject: frame_fifo: add missing declaration .. frame_fifo: add missing declaration /build/drivers/dahdi/trunkdev/frame_fifo.c:32:6: error: no previous prototype for 'fifo_dump' [-Werror=missing-prototypes] 32 | void fifo_dump(struct frame_fifo *fifo) | ^ cc1: all warnings being treated as errors Change-Id: I02eccb9c404157352d6c317b02d742b90c229deb --- M drivers/dahdi/trunkdev/frame_fifo.h 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/drivers/dahdi/trunkdev/frame_fifo.h b/drivers/dahdi/trunkdev/frame_fifo.h index b07cddc..daf7b01 100644 --- a/drivers/dahdi/trunkdev/frame_fifo.h +++ b/drivers/dahdi/trunkdev/frame_fifo.h @@ -56,3 +56,6 @@ /* pull multiple frames out of the FIFO */ int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count); + +/* dump FIFO state to kernel log */ +void fifo_dump(struct frame_fifo *fifo); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I02eccb9c404157352d6c317b02d742b90c229deb Gerrit-Change-Number: 36703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email ) Change subject: frame_fifo: add missing declaration .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I02eccb9c404157352d6c317b02d742b90c229deb Gerrit-Change-Number: 36703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote
[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email ) Change subject: frame_fifo: add missing declaration .. Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: builds only after https://gerrit.osmocom.org/c/dahdi-linux/+/36700/2 is applied - either single one of those patches still fails to build. -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I02eccb9c404157352d6c317b02d742b90c229deb Gerrit-Change-Number: 36703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 01 May 2024 12:43:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: Fix build against linux >= 6.5.12
Attention is currently required from: roox. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36700?usp=email ) Change subject: Fix build against linux >= 6.5.12 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36700?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I992eccc503a19e348d3575147edcb9c2e78845eb Gerrit-Change-Number: 36700 Gerrit-PatchSet: 2 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: roox Gerrit-Comment-Date: Wed, 01 May 2024 12:42:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email ) Change subject: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically .. Patch Set 1: (1 comment) Patchset: PS1: > Mark as verified since build failure is vs linux master and unrelated proposed fix is in https://gerrit.osmocom.org/c/dahdi-linux/+/36703 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Gerrit-Change-Number: 36654 Gerrit-PatchSet: 1 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 12:40:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt Gerrit-MessageType: comment
[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email ) Change subject: frame_fifo: add missing declaration .. frame_fifo: add missing declaration /build/drivers/dahdi/trunkdev/frame_fifo.c:32:6: error: no previous prototype for 'fifo_dump' [-Werror=missing-prototypes] 32 | void fifo_dump(struct frame_fifo *fifo) | ^ cc1: all warnings being treated as errors Change-Id: I02eccb9c404157352d6c317b02d742b90c229deb --- M drivers/dahdi/trunkdev/frame_fifo.h 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/03/36703/1 diff --git a/drivers/dahdi/trunkdev/frame_fifo.h b/drivers/dahdi/trunkdev/frame_fifo.h index b07cddc..daf7b01 100644 --- a/drivers/dahdi/trunkdev/frame_fifo.h +++ b/drivers/dahdi/trunkdev/frame_fifo.h @@ -56,3 +56,6 @@ /* pull multiple frames out of the FIFO */ int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count); + +/* dump FIFO state to kernel log */ +void fifo_dump(struct frame_fifo *fifo); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I02eccb9c404157352d6c317b02d742b90c229deb Gerrit-Change-Number: 36703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email )
Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use
strscpy() instead.
..
strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy()
instead.
https:
//git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d26270061ae6
https: //www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782
---
M drivers/dahdi/dahdi-base.c
M drivers/dahdi/dahdi_dynamic.c
M drivers/dahdi/dahdi_dynamic_eth.c
M drivers/dahdi/dahdi_dynamic_ethmf.c
M drivers/dahdi/dahdi_transcode.c
M drivers/dahdi/xpp/card_global.c
6 files changed, 38 insertions(+), 27 deletions(-)
Approvals:
tnt: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index d8e6268..ef29c4b 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -4410,7 +4410,7 @@
param.pulsebreaktime = chan->pulsebreaktime;
param.pulseaftertime = chan->pulseaftertime;
param.spanno = (chan->span) ? chan->span->spanno : 0;
- strlcpy(param.name, chan->name, sizeof(param.name));
+ strscpy(param.name, chan->name, sizeof(param.name));
param.chanpos = chan->chanpos;
param.sigcap = chan->sigcap;
/* Return current law */
@@ -4498,8 +4498,8 @@
spaninfo.spanno = s->spanno; /* put the span # in here */
spaninfo.totalspans = span_count();
- strlcpy(spaninfo.desc, s->desc, sizeof(spaninfo.desc));
- strlcpy(spaninfo.name, s->name, sizeof(spaninfo.name));
+ strscpy(spaninfo.desc, s->desc, sizeof(spaninfo.desc));
+ strscpy(spaninfo.name, s->name, sizeof(spaninfo.name));
spaninfo.alarms = s->alarms;/* get alarm status */
spaninfo.rxlevel = s->rxlevel; /* get rx level */
spaninfo.txlevel = s->txlevel; /* get tx level */
@@ -4526,18 +4526,18 @@
spaninfo.lineconfig = s->lineconfig;
spaninfo.irq = 0;
spaninfo.linecompat = s->linecompat;
- strlcpy(spaninfo.lboname, dahdi_lboname(s->lbo),
+ strscpy(spaninfo.lboname, dahdi_lboname(s->lbo),
sizeof(spaninfo.lboname));
if (s->parent->manufacturer) {
- strlcpy(spaninfo.manufacturer, s->parent->manufacturer,
+ strscpy(spaninfo.manufacturer, s->parent->manufacturer,
sizeof(spaninfo.manufacturer));
}
if (s->parent->devicetype) {
- strlcpy(spaninfo.devicetype, s->parent->devicetype,
+ strscpy(spaninfo.devicetype, s->parent->devicetype,
sizeof(spaninfo.devicetype));
}
if (s->parent->location) {
- strlcpy(spaninfo.location, s->parent->location,
+ strscpy(spaninfo.location, s->parent->location,
sizeof(spaninfo.location));
}
if (s->spantype) {
@@ -4556,11 +4556,11 @@
const char *st = dahdi_spantype2str(s->spantype);
switch (s->spantype) {
case SPANTYPE_DIGITAL_BRI_NT:
- strlcpy(spaninfo.spantype, "NT",
+ strscpy(spaninfo.spantype, "NT",
sizeof(spaninfo.spantype));
break;
case SPANTYPE_DIGITAL_BRI_TE:
- strlcpy(spaninfo.spantype, "TE",
+ strscpy(spaninfo.spantype, "TE",
sizeof(spaninfo.spantype));
break;
default:
@@ -4570,7 +4570,7 @@
* so no backward compatibility for this
* broken interface.
*/
- strlcpy(spaninfo.spantype, st,
+ strscpy(spaninfo.spantype, st,
sizeof(spaninfo.spantype));
break;
}
@@ -4619,10 +4619,10 @@
spaninfo_v1.spanno = s->spanno; /* put the span # in here */
spaninfo_v1.totalspans = 0;
spaninfo_v1.totalspans = span_count();
- strlcpy(spaninfo_v1.desc,
+ strscpy(spaninfo_v1.desc,
s->desc,
sizeof(spaninfo_v1.desc));
- strlcpy(spaninfo_v1.name,
+ strscpy(spaninfo_v1.name,
s->name,
sizeof(spaninfo_v1.name));
spaninfo_v1.alarms = s->alarms;
@@ -4644,25 +4644,25 @@
spaninfo_v1.lineconfig = s->lineconfig;
spaninfo_v1.irq = 0;
spaninfo_v1.linecompat = s->linecompat;
- strlcpy(spaninfo_v1.lboname,
+ strscpy(spaninfo_v1.lboname,
[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...
Attention is currently required from: roox. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email ) Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 Gerrit-Change-Number: 36697 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: roox Gerrit-Reviewer: tnt Gerrit-Attention: roox Gerrit-Comment-Date: Wed, 01 May 2024 12:37:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: VTY: sync default UMTS UEA config with osmo-msc
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email ) Change subject: VTY: sync default UMTS UEA config with osmo-msc .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4eb9451b4267fc1436ed90a55ff200cf36f16bf6 Gerrit-Change-Number: 36702 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 01 May 2024 09:50:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: VTY: move default settings to sgsn_instance_alloc()
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email ) Change subject: VTY: move default settings to sgsn_instance_alloc() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1a439dcc76272a181986b6ec9368ef16441dc098 Gerrit-Change-Number: 36701 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 01 May 2024 09:50:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: VTY: sync default UMTS UEA config with osmo-msc
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email ) Change subject: VTY: sync default UMTS UEA config with osmo-msc .. VTY: sync default UMTS UEA config with osmo-msc As was reported in OS#6442, nano3g S16 is unhappy when CS and PS domains use different UEA configuration for simultaneous RANAP connections. Bring osmo-sgsn in sync with osmo-msc to avoid this. Change-Id: I4eb9451b4267fc1436ed90a55ff200cf36f16bf6 Related: OS#6442 --- M src/sgsn/sgsn.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/02/36702/1 diff --git a/src/sgsn/sgsn.c b/src/sgsn/sgsn.c index c3b7fda..57a2c38 100644 --- a/src/sgsn/sgsn.c +++ b/src/sgsn/sgsn.c @@ -166,7 +166,7 @@ inst->cfg.gtp_statedir = talloc_strdup(inst, "./"); inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; inst->cfg.gea_encryption_mask = (1 << GPRS_ALGO_GEA0); /* no encryption */ - inst->cfg.uea_encryption_mask = (1 << OSMO_UTRAN_UEA0); /* no encryption */ + inst->cfg.uea_encryption_mask = (1 << OSMO_UTRAN_UEA2) | (1 << OSMO_UTRAN_UEA1); inst->cfg.require_authentication = true; /* only applies if auth_policy is REMOTE */ inst->cfg.gsup_server_port = OSMO_GSUP_PORT; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4eb9451b4267fc1436ed90a55ff200cf36f16bf6 Gerrit-Change-Number: 36702 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[S] Change in osmo-sgsn[master]: VTY: move default settings to sgsn_instance_alloc()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email )
Change subject: VTY: move default settings to sgsn_instance_alloc()
..
VTY: move default settings to sgsn_instance_alloc()
Change-Id: I1a439dcc76272a181986b6ec9368ef16441dc098
Related: OS#6443
---
M src/sgsn/sgsn.c
M src/sgsn/sgsn_vty.c
2 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/01/36701/1
diff --git a/src/sgsn/sgsn.c b/src/sgsn/sgsn.c
index 6619bf2..c3b7fda 100644
--- a/src/sgsn/sgsn.c
+++ b/src/sgsn/sgsn.c
@@ -36,6 +36,9 @@
#include
#include
+#include
+#include
+
#include
#include
#include
@@ -162,6 +165,8 @@
inst->cfg.gtp_statedir = talloc_strdup(inst, "./");
inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED;
+ inst->cfg.gea_encryption_mask = (1 << GPRS_ALGO_GEA0); /* no encryption
*/
+ inst->cfg.uea_encryption_mask = (1 << OSMO_UTRAN_UEA0); /* no
encryption */
inst->cfg.require_authentication = true; /* only applies if auth_policy
is REMOTE */
inst->cfg.gsup_server_port = OSMO_GSUP_PORT;
diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index 29f9cd6..6837e71 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -1868,9 +1868,6 @@
/* make sure sgsn_vty_init() was called before this */
OSMO_ASSERT(g_cfg);
- g_cfg->gea_encryption_mask = 0x1; /* support GEA0 by default unless
specific encryption config exists */
- g_cfg->uea_encryption_mask = (1 << OSMO_UTRAN_UEA0); /* support UEA0 by
default unless specific encryption config exists */
-
rc = vty_read_config_file(config_file, NULL);
if (rc < 0) {
fprintf(stderr, "Failed to parse the config file: '%s'\n",
config_file);
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I1a439dcc76272a181986b6ec9368ef16441dc098
Gerrit-Change-Number: 36701
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in dahdi-linux[master]: Fix build against linux >= 6.5.12
roox has uploaded this change for review. (
https://gerrit.osmocom.org/c/dahdi-linux/+/36700?usp=email )
Change subject: Fix build against linux >= 6.5.12
..
Fix build against linux >= 6.5.12
adapted from
https://github.com/asterisk/dahdi-linux/commit/a370c800599b8ee0ca1a843920452941e4d4dadc
see
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c4f135d643823a86
https://lore.kernel.org/all/49925af7-78a8-a3dd-bce6-cfc02e1a9...@i-love.sakura.ne.jp/T/#u
Change-Id: I992eccc503a19e348d3575147edcb9c2e78845eb
---
M include/dahdi/kernel.h
1 file changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/00/36700/1
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 0a25854..b707753 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1426,6 +1426,16 @@
/*! Maximum audio mask */
#define DAHDI_FORMAT_AUDIO_MASK((1 << 16) - 1)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(6,5,12)
+#undef flush_scheduled_work
+#define flush_scheduled_work() \
+({ \
+ if (0) \
+ __warn_flushing_systemwide_wq();\
+ __flush_workqueue(system_wq); \
+})
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
#ifndef TIMER_DATA_TYPE
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36700?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: I992eccc503a19e348d3575147edcb9c2e78845eb
Gerrit-Change-Number: 36700
Gerrit-PatchSet: 1
Gerrit-Owner: roox
Gerrit-MessageType: newchange
[S] Change in osmo-sgsn[master]: gmm: mmctx_timer_stop(): warn about timer not running
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36699?usp=email )
Change subject: gmm: mmctx_timer_stop(): warn about timer not running
..
gmm: mmctx_timer_stop(): warn about timer not running
This turns errors like:
DMM ERROR MM(2624238/e2ff704e) Stopping MM timer 3350 but 0 is running
into warnings with a more accurate reason:
DMM NOTICE MM(2624237/e2ff704e) Stopping *inactive* MM timer 3350
Change-Id: I56ecad9d8f1049974b0896f6d0e7fc61580155ec
---
M src/sgsn/gprs_gmm.c
1 file changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/99/36699/1
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 768b321..653c425 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -111,9 +111,14 @@
static void mmctx_timer_stop(struct sgsn_mm_ctx *mm, unsigned int T)
{
- if (mm->T != T)
+ if (!osmo_timer_pending(>timer)) {
+ LOGMMCTXP(LOGL_NOTICE, mm, "Stopping *inactive* MM timer %u\n",
T);
+ return;
+ }
+ if (mm->T != T) {
LOGMMCTXP(LOGL_ERROR, mm, "Stopping MM timer %u but "
"%u is running\n", T, mm->T);
+ }
osmo_timer_del(>timer);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36699?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I56ecad9d8f1049974b0896f6d0e7fc61580155ec
Gerrit-Change-Number: 36699
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmo-sgsn[master]: gmm: cosmetic: fix preprocessor macro formatting
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36698?usp=email )
Change subject: gmm: cosmetic: fix preprocessor macro formatting
..
gmm: cosmetic: fix preprocessor macro formatting
Change-Id: I77171d65db23794d8fd9872e0cc4d6f3b50dda0d
---
M src/sgsn/gprs_gmm.c
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/98/36698/1
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index c3f5cd3..768b321 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1391,11 +1391,11 @@
/* only in case SGSN offered new P-TMSI */
LOGMMCTXP(LOGL_INFO, mmctx, "-> GMM ATTACH COMPLETE\n");
- #ifdef BUILD_IU
+#ifdef BUILD_IU
if (mmctx->iu.ue_ctx) {
ranap_iu_tx_release(mmctx->iu.ue_ctx, NULL);
}
- #endif
+#endif
mmctx_timer_stop(mmctx, 3350);
mmctx->t3350_mode = GMM_T3350_MODE_NONE;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36698?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I77171d65db23794d8fd9872e0cc4d6f3b50dda0d
Gerrit-Change-Number: 36698
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...
roox has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email ) Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. .. Removed Code-Review+2 by roox -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 Gerrit-Change-Number: 36697 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roox Gerrit-Reviewer: tnt Gerrit-MessageType: deleteVote
[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...
roox has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email ) Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 Gerrit-Change-Number: 36697 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roox Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 01 May 2024 08:18:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...
Attention is currently required from: roox. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email ) Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. .. Patch Set 1: Verified+1 Code-Review+1 (1 comment) Patchset: PS1: Manually added verify since build failures on linus master only are unrelated to the change. -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 Gerrit-Change-Number: 36697 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-Attention: roox Gerrit-Comment-Date: Wed, 01 May 2024 08:08:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...
Attention is currently required from: roox. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email ) Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 Gerrit-Change-Number: 36697 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: roox Gerrit-MessageType: deleteVote
[S] Change in osmo-e1-hardware[master]: icE1usb fw: Fix OIS -> AIS typo
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36678?usp=email ) Change subject: icE1usb fw: Fix OIS -> AIS typo .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36678?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I23f242c31483533adb9cb60b4aac9b95a7b807e8 Gerrit-Change-Number: 36678 Gerrit-PatchSet: 3 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 08:06:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2e1
Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email ) Change subject: gateware/cores: Update no2e1 .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 Gerrit-Change-Number: 36677 Gerrit-PatchSet: 3 Gerrit-Owner: tnt Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: tnt Gerrit-Comment-Date: Wed, 01 May 2024 08:06:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-e1-hardware[master]: icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode
Attention is currently required from: tnt.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36676?usp=email )
Change subject: icE1usb fw: Avoid casting random pointer to struct in
set_{rx,tx}_mode
..
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36676?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1-hardware
Gerrit-Branch: master
Gerrit-Change-Id: I110ee4c014e8cfe058f7fc357decb7ab99e0be64
Gerrit-Change-Number: 36676
Gerrit-PatchSet: 1
Gerrit-Owner: tnt
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Attention: tnt
Gerrit-Comment-Date: Wed, 01 May 2024 08:05:59 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for CtxParams1
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36673?usp=email )
Change subject: RSPDefinitions: add separate template for CtxParams1
..
RSPDefinitions: add separate template for CtxParams1
Fields of type CtxParams1 are used in other messages too, so it might be
helpful to add a separate template for them.
Related: SYS#6824
Change-Id: Iba6c3780f9f3aec5742d53b3bd7b0c0392b25761
---
M library/euicc/RSPDefinitions_Templates.ttcn
1 file changed, 68 insertions(+), 52 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index 7c1707d..ae1ea78 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -93,6 +93,59 @@
serverChallenge := serverChallenge
}
+template (present) CtxParams1 tr_ctxParams1 := {
+ctxParamsForCommonAuthentication := {
+ matchingId := *,
+ deviceInfo := {
+ tac := ?,
+ deviceCapabilities := {
+ gsmSupportedRelease := *,
+ utranSupportedRelease := *,
+ cdma2000onexSupportedRelease := *,
+ cdma2000hrpdSupportedRelease := *,
+ cdma2000ehrpdSupportedRelease := *,
+ eutranEpcSupportedRelease := *,
+ contactlessSupportedRelease := *,
+ rspCrlSupportedVersion := *,
+ nrEpcSupportedRelease := *,
+ nr5gcSupportedRelease := *,
+ eutran5gcSupportedRelease := *,
+ lpaSvn := *,
+ catSupportedClasses := *,
+ euiccFormFactorType := *,
+ deviceAdditionalFeatureSupport := *
+ },
+ imei := *
+ }
+ }
+}
+template (value) CtxParams1 ts_ctxParams1 := {
+ ctxParamsForCommonAuthentication := {
+ matchingId := omit,
+ deviceInfo := {
+ tac := '12345678'O,
+ deviceCapabilities := {
+ gsmSupportedRelease := omit,
+ utranSupportedRelease := omit,
+ cdma2000onexSupportedRelease := omit,
+ cdma2000hrpdSupportedRelease := omit,
+ cdma2000ehrpdSupportedRelease := omit,
+ eutranEpcSupportedRelease := omit,
+ contactlessSupportedRelease := omit,
+ rspCrlSupportedVersion := omit,
+ nrEpcSupportedRelease := omit,
+ nr5gcSupportedRelease := omit,
+ eutran5gcSupportedRelease := omit,
+ lpaSvn := omit,
+ catSupportedClasses := omit,
+ euiccFormFactorType := omit,
+ deviceAdditionalFeatureSupport := omit
+ },
+ imei := omit
+ }
+ }
+}
+
/* GSMA SGP.22, section 2.5.6 */
template (present) ProfileInstallationResult
tr_profileInstallationResult := {
@@ -481,32 +534,7 @@
serverAddress := ?,
serverChallenge := ?,
euiccInfo2 := ?,
- ctxParams1 := {
- ctxParamsForCommonAuthentication := {
- matchingId := *,
- deviceInfo := {
- tac := ?,
- deviceCapabilities := {
- gsmSupportedRelease :=
*,
- utranSupportedRelease
:= *,
-
cdma2000onexSupportedRelease := *,
-
cdma2000hrpdSupportedRelease := *,
-
cdma2000ehrpdSupportedRelease := *,
-
eutranEpcSupportedRelease := *,
-
contactlessSupportedRelease := *,
- rspCrlSupportedVersion
:= *,
-
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults values to ts_authenticateClientResponseEs9
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36674?usp=email )
Change subject: RSPDefinitions: add defaults values to
ts_authenticateClientResponseEs9
..
RSPDefinitions: add defaults values to ts_authenticateClientResponseEs9
The template ts_authenticateClientResponseEs9 has no default values,
let's add some default values to make it easier to use
Related: SYS#6824
Change-Id: I07d942a58a3c1c29c37fcaa50d3a274ce8b026bc
---
M library/euicc/RSPDefinitions_Templates.ttcn
1 file changed, 58 insertions(+), 5 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index ae1ea78..9e64083 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -146,6 +146,46 @@
}
}
+template (present) StoreMetadataRequest tr_storeMetadataRequest := {
+ iccid := ?,
+ serviceProviderName := ?,
+ profileName := ?,
+ iconType := *,
+ icon := *,
+ profileClass := ?,
+ notificationConfigurationInfo := *,
+ profileOwner := *,
+ profilePolicyRules := *,
+ serviceSpecificDataStoredInEuicc := *,
+ serviceSpecificDataNotStoredInEuicc := *
+}
+template (value) StoreMetadataRequest ts_storeMetadataRequest := {
+ iccid := '123456789ABCDEFF'O,
+ serviceProviderName := "testsuite",
+ profileName := "testprofile",
+ iconType := omit,
+ icon := omit,
+ profileClass := 2, /* operational */
+ notificationConfigurationInfo := omit,
+ profileOwner := omit,
+ profilePolicyRules := omit,
+ serviceSpecificDataStoredInEuicc := omit,
+ serviceSpecificDataNotStoredInEuicc := omit
+}
+
+template (present) SmdpSigned2 tr_smdpSigned2(template (present) octetstring
transactionId := ?,
+ template (present) boolean
ccRequiredFlag := ?) := {
+transactionId := transactionId,
+ccRequiredFlag := ccRequiredFlag,
+bppEuiccOtpk := ?
+}
+template (value) SmdpSigned2 ts_smdpSigned2(template (value) octetstring
transactionId := 'ABCDEF'O,
+ template (value) boolean
ccRequiredFlag := false) := {
+transactionId := transactionId,
+ccRequiredFlag := ccRequiredFlag,
+bppEuiccOtpk := omit
+}
+
/* GSMA SGP.22, section 2.5.6 */
template (present) ProfileInstallationResult
tr_profileInstallationResult := {
@@ -310,11 +350,11 @@
}
}
template (value) RemoteProfileProvisioningResponse
-ts_authenticateClientResponseEs9(template (value) octetstring transactionId,
-template (value) StoreMetadataRequest
profileMetaData,
-template (value) SmdpSigned2 smdpSigned2,
-template (value) octetstring smdpSignature2,
-template (value) Certificate smdpCertificate)
:= {
+ts_authenticateClientResponseEs9(template (value) octetstring transactionId :=
'ABCDEF'O,
+template (value) StoreMetadataRequest
profileMetaData := ts_storeMetadataRequest,
+template (value) SmdpSigned2 smdpSigned2 :=
ts_smdpSigned2,
+template (value) octetstring smdpSignature2 :=
'BB'O,
+template (value) Certificate smdpCertificate
:= ts_cert_s_sm_dpauth_nist) := {
authenticateClientResponseEs9 := {
authenticateClientOk := {
transactionId := transactionId,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36674?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: I07d942a58a3c1c29c37fcaa50d3a274ce8b026bc
Gerrit-Change-Number: 36674
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions: add ts template for authenticateClientRequestEsipa
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36675?usp=email )
Change subject: SGP32Definitions: add ts template for
authenticateClientRequestEsipa
..
SGP32Definitions: add ts template for authenticateClientRequestEsipa
The template ts_authenticateClientRequestEsipa is still missing, let's
add one.
Related: SYS#6824
Change-Id: I9490a2ee59a89511876bb1055a056a43fbf172bb
---
M library/euicc/RSPDefinitions_Templates.ttcn
M library/euicc/SGP32Definitions_Templates.ttcn
2 files changed, 50 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index 9e64083..7e0884f 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -146,6 +146,29 @@
}
}
+template (present) EuiccSigned1 tr_euiccSigned1(template (present) octetstring
transactionId := ?,
+ template (present) universal
charstring serverAddress := ?,
+ template (present) octetstring
serverChallenge := ?,
+ template (present) EUICCInfo2
euiccInfo2 := ?,
+ template (present) CtxParams1
ctxParams1 := ?) := {
+transactionId := transactionId,
+serverAddress := serverAddress,
+serverChallenge := serverChallenge,
+euiccInfo2 := euiccInfo2,
+ctxParams1 := ctxParams1
+}
+template (value) EuiccSigned1 ts_euiccSigned1(template (value) octetstring
transactionId := 'ABCDEF'O,
+ template (value) universal
charstring serverAddress := "smdp.example.com",
+ template (value) octetstring
serverChallenge := '01020304050607080910111213141516'O,
+ template (value) EUICCInfo2
euiccInfo2 := ts_EUICCInfo2,
+ template (value) CtxParams1
ctxParams1 := ts_ctxParams1) := {
+transactionId := transactionId,
+serverAddress := serverAddress,
+serverChallenge := serverChallenge,
+euiccInfo2 := euiccInfo2,
+ctxParams1 := ctxParams1
+}
+
template (present) StoreMetadataRequest tr_storeMetadataRequest := {
iccid := ?,
serviceProviderName := ?,
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index 98a2bba..26ded29 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -87,7 +87,20 @@
}
}
}
-/* TODO: create coresponding ts_ template */
+template (value) EsipaMessageFromIpaToEim
+ts_authenticateClientRequestEsipa(template (value) octetstring transactionId
:= 'ABCDEF'O) := {
+ authenticateClientRequestEsipa := {
+ transactionId := transactionId,
+ authenticateServerResponse := {
+ authenticateResponseOk := {
+ euiccSigned1 := ts_euiccSigned1,
+ euiccSignature1 := '1234567890'O,
+ euiccCertificate := ts_cert_eum_nist,
+ eumCertificate := ts_cert_s_sm_dpauth_nist
+ }
+ }
+ }
+}
/* GSMA SGP.32, section 6.3.2.2 */
template (present) EsipaMessageFromEimToIpa
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36675?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: I9490a2ee59a89511876bb1055a056a43fbf172bb
Gerrit-Change-Number: 36675
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?usp=email )
Change subject: RSPDefinitions: add defaults for
initiateAuthenticationResponse/Request
..
RSPDefinitions: add defaults for initiateAuthenticationResponse/Request
Related: SYS#6824
Change-Id: I3842569f36dfb94e61afffaa03353b552e001c72
---
M library/euicc/RSPDefinitions_Templates.ttcn
1 file changed, 18 insertions(+), 8 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index 52e1788..7c1707d 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -143,9 +143,9 @@
}
}
template (value) RemoteProfileProvisioningRequest
-ts_initiateAuthenticationRequest(template (value) octetstring euiccChallenge,
-template (value) charstring smdpAddress,
-template (value) EUICCInfo1 euiccInfo1) := {
+ts_initiateAuthenticationRequest(template (value) octetstring euiccChallenge
:= '00112233445566778899aabbccddeeff'O,
+template (value) charstring smdpAddress :=
"smdp.example.com",
+template (value) EUICCInfo1 euiccInfo1 :=
ts_EUICCInfo1) := {
initiateAuthenticationRequest := {
euiccChallenge := euiccChallenge,
smdpAddress := smdpAddress,
@@ -169,11 +169,11 @@
}
}
template (value) RemoteProfileProvisioningResponse
-ts_initiateAuthenticationResponse(template (value) octetstring transactionId,
- template (value) ServerSigned1 serverSigned1,
- template (value) octetstring serverSignature1,
- template (value) SubjectKeyIdentifier
euiccCiPKIdToBeUsed,
- template (value) Certificate
serverCertificate) := {
+ts_initiateAuthenticationResponse(template (value) octetstring transactionId
:= 'ABCDEF'O,
+ template (value) ServerSigned1 serverSigned1
:= ts_serverSigned1,
+ template (value) octetstring serverSignature1
:= '01020304'O,
+ template (value) SubjectKeyIdentifier
euiccCiPKIdToBeUsed := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O, /* NIST */
+ template (value) Certificate
serverCertificate := ts_cert_s_sm_dpauth_nist) := {
initiateAuthenticationResponse := {
initiateAuthenticationOk := {
transactionId := transactionId,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?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: I3842569f36dfb94e61afffaa03353b552e001c72
Gerrit-Change-Number: 36672
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for serverSigned1
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?usp=email )
Change subject: RSPDefinitions: add separate template for serverSigned1
..
RSPDefinitions: add separate template for serverSigned1
The field serverSigned1 is used in many messages, so it might be helpful
to add a separate template for it.
Change-Id: Ic50676ac2863173b72765afc44794a56d03413a5
Related: SYS#6824
---
M library/euicc/RSPDefinitions_EncDec.cc
M library/euicc/RSPDefinitions_Templates.ttcn
M library/euicc/RSPDefinitions_Types.ttcn
M library/euicc/SGP32Definitions_Templates.ttcn
4 files changed, 75 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/library/euicc/RSPDefinitions_EncDec.cc
b/library/euicc/RSPDefinitions_EncDec.cc
index 6441201..b46a73c 100644
--- a/library/euicc/RSPDefinitions_EncDec.cc
+++ b/library/euicc/RSPDefinitions_EncDec.cc
@@ -278,4 +278,38 @@
return msg;
}
+OCTETSTRING enc__RemoteProfileProvisioningResponse(const
RemoteProfileProvisioningResponse ) {
+ TTCN_Buffer buf;
+
+ buf.clear();
+ msg.encode(RemoteProfileProvisioningResponse_descr_, buf,
TTCN_EncDec::CT_BER, BER_ENCODE_DER);
+ return OCTETSTRING(buf.get_len(), buf.get_data());
+}
+
+RemoteProfileProvisioningResponse dec__RemoteProfileProvisioningResponse(const
OCTETSTRING ) {
+ TTCN_Buffer buf;
+ RemoteProfileProvisioningResponse msg;
+ buf.put_os(stream);
+
+ msg.decode(RemoteProfileProvisioningResponse_descr_, buf,
TTCN_EncDec::CT_BER, BER_ACCEPT_ALL);
+ return msg;
+}
+
+OCTETSTRING enc__RemoteProfileProvisioningRequest(const
RemoteProfileProvisioningRequest ) {
+ TTCN_Buffer buf;
+
+ buf.clear();
+ msg.encode(RemoteProfileProvisioningRequest_descr_, buf,
TTCN_EncDec::CT_BER, BER_ENCODE_DER);
+ return OCTETSTRING(buf.get_len(), buf.get_data());
+}
+
+RemoteProfileProvisioningRequest dec__RemoteProfileProvisioningRequest(const
OCTETSTRING ) {
+ TTCN_Buffer buf;
+ RemoteProfileProvisioningRequest msg;
+ buf.put_os(stream);
+
+ msg.decode(RemoteProfileProvisioningRequest_descr_, buf,
TTCN_EncDec::CT_BER, BER_ACCEPT_ALL);
+ return msg;
+}
+
}
diff --git a/library/euicc/RSPDefinitions_Templates.ttcn
b/library/euicc/RSPDefinitions_Templates.ttcn
index 86cdb0c..52e1788 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -74,6 +74,25 @@
'515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151'O}
}
+template (present) ServerSigned1 tr_serverSigned1(template (present)
octetstring transactionId := ?,
+ template (present)
octetstring euiccChallenge := ?,
+ template (present) universal
charstring serverAddress := ?,
+ template (present)
octetstring serverChallenge := ?) := {
+transactionId := transactionId,
+euiccChallenge := euiccChallenge,
+serverAddress := serverAddress,
+serverChallenge := serverChallenge
+}
+template (value) ServerSigned1 ts_serverSigned1(template (value) octetstring
transactionId := 'ABCDEF'O,
+ template (value) octetstring
euiccChallenge := '00112233445566778899AABBCCDDEEFF'O,
+ template (value) universal
charstring serverAddress := "smdp.example.com",
+ template (value) octetstring
serverChallenge := '01020304050607080910111213141516'O) := {
+transactionId := transactionId,
+euiccChallenge := euiccChallenge,
+serverAddress := serverAddress,
+serverChallenge := serverChallenge
+}
+
/* GSMA SGP.22, section 2.5.6 */
template (present) ProfileInstallationResult
tr_profileInstallationResult := {
@@ -576,4 +595,4 @@
eidValue := eidValue
}
-}
\ No newline at end of file
+}
diff --git a/library/euicc/RSPDefinitions_Types.ttcn
b/library/euicc/RSPDefinitions_Types.ttcn
index b031aa3..5bb3925 100644
--- a/library/euicc/RSPDefinitions_Types.ttcn
+++ b/library/euicc/RSPDefinitions_Types.ttcn
@@ -51,4 +51,10 @@
external function dec_SmdpSigned2(in octetstring stream) return SmdpSigned2;
external function enc_SmdpSigned2(in SmdpSigned2 msg) return octetstring;
+external function dec_RemoteProfileProvisioningResponse(in octetstring stream)
return RemoteProfileProvisioningResponse;
+external function enc_RemoteProfileProvisioningResponse(in
RemoteProfileProvisioningResponse msg) return octetstring;
+
+external function dec_RemoteProfileProvisioningRequest(in octetstring stream)
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions: add ts template for authenticateClientRequestEsipa
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36675?usp=email ) Change subject: SGP32Definitions: add ts template for authenticateClientRequestEsipa .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36675?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: I9490a2ee59a89511876bb1055a056a43fbf172bb Gerrit-Change-Number: 36675 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:05:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults values to ts_authenticateClientResponseEs9
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36674?usp=email ) Change subject: RSPDefinitions: add defaults values to ts_authenticateClientResponseEs9 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36674?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: I07d942a58a3c1c29c37fcaa50d3a274ce8b026bc Gerrit-Change-Number: 36674 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:05:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for CtxParams1
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36673?usp=email ) Change subject: RSPDefinitions: add separate template for CtxParams1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36673?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: Iba6c3780f9f3aec5742d53b3bd7b0c0392b25761 Gerrit-Change-Number: 36673 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:05:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?usp=email ) Change subject: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?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: I3842569f36dfb94e61afffaa03353b552e001c72 Gerrit-Change-Number: 36672 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:05:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for serverSigned1
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?usp=email ) Change subject: RSPDefinitions: add separate template for serverSigned1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?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: Ic50676ac2863173b72765afc44794a56d03413a5 Gerrit-Change-Number: 36671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:04:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add support for binary messages
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email )
Change subject: HTTP_Adapter: add support for binary messages
..
HTTP_Adapter: add support for binary messages
The HTTP_Adapter currently only supports text only HTTP messages. However,
the HTTPmsg testport API also has a way to deal with binary HTTP messages.
Related: SYS#6824
Change-Id: I18340f19ed462bf80af683dc9f2831b602f4bdf7
---
M library/HTTP_Adapter.ttcn
1 file changed, 76 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn
index d26cce5..c78c40a 100644
--- a/library/HTTP_Adapter.ttcn
+++ b/library/HTTP_Adapter.ttcn
@@ -71,11 +71,17 @@
}
function f_ts_HTTP_Header(template (omit) charstring body := omit,
+ template (omit) octetstring binary_body := omit,
template (omit) charstring host := omit,
HeaderLines custom_hdr := { })
return template (value) HeaderLines {
var HeaderLines hdr := { };
+ /* Make sure we never use body or binary_body at the same time */
+ if (not istemplatekind(body, "omit") and not
istemplatekind(binary_body, "omit")) {
+ setverdict(fail, "use wither (ascii) body or binary_body");
+ }
+
/* Build default header */
if (not istemplatekind(host, "omit")) {
hdr := hdr & {valueof(ts_HeaderLine("Host", valueof(host)))};
@@ -84,6 +90,9 @@
if (not istemplatekind(body, "omit")) {
hdr := hdr & {valueof(ts_HeaderLine("Content-Length",
int2str(lengthof(body};
}
+ else if (not istemplatekind(binary_body, "omit")) {
+ hdr := hdr & {valueof(ts_HeaderLine("Content-Length",
int2str(lengthof(binary_body};
+ }
return f_overlay_HTTP_Header(hdr, custom_hdr);
}
@@ -107,11 +116,36 @@
uri := url,
version_major := v_maj,
version_minor := v_min,
- header := f_ts_HTTP_Header(body, host, custom_hdr),
+ header := f_ts_HTTP_Header(body, omit, host, custom_hdr),
body := f_ts_body_or_empty(body)
}
}
+function f_ts_body_or_empty_bin(template (omit) octetstring body) return
template (value) octetstring {
+ if (istemplatekind(body, "omit")) {
+ return ''O;
+ }
+ return body;
+}
+
+template (value) HTTPMessage ts_HTTP_Req_Bin(charstring url,
+charstring method := "GET",
+template (omit) octetstring body
:= omit,
+integer v_maj := 1, integer v_min
:= 1,
+charstring host,
+HeaderLines custom_hdr := { }) := {
+ request_binary := {
+ client_id := omit,
+ method := method,
+ uri := url,
+ version_major := v_maj,
+ version_minor := v_min,
+ header := f_ts_HTTP_Header(omit, body, host, custom_hdr),
+ body := f_ts_body_or_empty_bin(body)
+ }
+}
+
+
template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := {
response := {
client_id := ?,
@@ -124,14 +158,33 @@
}
};
+template HTTPMessage tr_HTTP_Resp_Bin(template integer sts := ?) := {
+ response_binary := {
+ client_id := ?,
+ version_major := ?,
+ version_minor := ?,
+ statuscode := sts,
+ statustext := ?,
+ header := ?,
+ body := ?
+ }
+};
+
template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299));
-function f_http_tx_request(charstring url, charstring method := "GET",
template charstring body := omit,
+function f_http_tx_request(charstring url, charstring method := "GET",
+ template charstring body := omit,
+ template octetstring binary_body := omit,
HeaderLines custom_hdr := { })
runs on http_CT {
HTTP.send(ts_HTTP_Connect(g_pars.http_host, g_pars.http_port,
g_pars.use_ssl));
HTTP.receive(Connect_result:?);
- HTTP.send(ts_HTTP_Req(url, method, body, host := g_pars.http_host & ":"
& int2str(g_pars.http_port), custom_hdr := custom_hdr));
+
+ if (not istemplatekind(body, "omit")) {
+ HTTP.send(ts_HTTP_Req(url, method, body, host :=
g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr));
+ } else if (not istemplatekind(binary_body, "omit")) {
+ HTTP.send(ts_HTTP_Req_Bin(url, method, binary_body, host :=
[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adaptor: allow keeping an HTTP client connection
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email )
Change subject: HTTP_Adaptor: allow keeping an HTTP client connection
..
HTTP_Adaptor: allow keeping an HTTP client connection
At the moment the HTTP_Adaptor automatically creates a new connection,
performs the HTTP request and closes the connection again. This means
the connection lives only for a single request. Let's add some
flexibility so that we can perform multiple consecutive requests
through the same connection.
Change-Id: Ic6994c504143820dde498c1a2bad2ad6a523dd70
Related: SYS#6824
---
M library/HTTP_Adapter.ttcn
1 file changed, 78 insertions(+), 15 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn
index c78c40a..f408ee4 100644
--- a/library/HTTP_Adapter.ttcn
+++ b/library/HTTP_Adapter.ttcn
@@ -40,7 +40,7 @@
portnumber := http_port,
use_ssl := use_ssl
}
-template (value) Close ts_HTTP_Close := { client_id := omit };
+template (value) Close ts_HTTP_Close(template (omit) integer client_id :=
omit) := { client_id := client_id };
/* function to add HeaderLines to a an existing set of HeaderLines.
HeaderLines that are already present, are updated. */
function f_overlay_HTTP_Header(HeaderLines hdr, HeaderLines additional_hdr)
return template (value) HeaderLines
@@ -109,9 +109,10 @@
template (omit) charstring body :=
omit,
integer v_maj := 1, integer v_min := 1,
charstring host,
-HeaderLines custom_hdr := { }) := {
+HeaderLines custom_hdr := { },
+template (omit) integer client_id :=
omit) := {
request := {
- client_id := omit,
+ client_id := client_id,
method := method,
uri := url,
version_major := v_maj,
@@ -133,9 +134,10 @@
template (omit) octetstring body
:= omit,
integer v_maj := 1, integer v_min
:= 1,
charstring host,
-HeaderLines custom_hdr := { }) := {
+HeaderLines custom_hdr := { },
+template (omit) integer client_id
:= omit) := {
request_binary := {
- client_id := omit,
+ client_id := client_id,
method := method,
uri := url,
version_major := v_maj,
@@ -175,19 +177,48 @@
function f_http_tx_request(charstring url, charstring method := "GET",
template charstring body := omit,
template octetstring binary_body := omit,
- HeaderLines custom_hdr := { })
+ HeaderLines custom_hdr := { },
+ float tout := 2.0,
+ template integer client_id := omit)
runs on http_CT {
- HTTP.send(ts_HTTP_Connect(g_pars.http_host, g_pars.http_port,
g_pars.use_ssl));
- HTTP.receive(Connect_result:?);
+ var Connect_result rc;
+ timer T := tout;
+ var template integer use_client_id := omit;
+
+ /* In case the caller didn't specify a client_id, we will create a new
connection. */
+ if (istemplatekind(client_id, "omit")) {
+ HTTP.send(ts_HTTP_Connect(g_pars.http_host, g_pars.http_port,
g_pars.use_ssl));
+ T.start;
+ alt {
+ [] HTTP.receive(Connect_result:?) -> value rc;
+ [] HTTP.receive {
+ setverdict(fail, "HTTP connection to client failed");
+ self.stop;
+ }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for completion of
HTTP connection");
+ self.stop;
+ }
+ }
+ use_client_id := rc.client_id;
+ } else {
+ use_client_id := client_id;
+ }
if (not istemplatekind(body, "omit")) {
- HTTP.send(ts_HTTP_Req(url, method, body, host :=
g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr));
+ HTTP.send(ts_HTTP_Req(url, method, body, host :=
g_pars.http_host & ":" & int2str(g_pars.http_port),
+ custom_hdr := custom_hdr, client_id :=
use_client_id));
} else if (not istemplatekind(binary_body, "omit")) {
- HTTP.send(ts_HTTP_Req_Bin(url, method, binary_body, host :=
[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add support for binary messages
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email ) Change subject: HTTP_Adapter: add support for binary messages .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?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: I18340f19ed462bf80af683dc9f2831b602f4bdf7 Gerrit-Change-Number: 36645 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:04:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 01 May 2024 08:03:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Rename component id
Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email ) Change subject: SIP_Emulation: Rename component id .. Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/afb8a90b_3c668488 PS1, Line 9: it makes it impossible to reference the : component name under TESTPORT_PARAMETERS > So does that mean you also insist I should drop this patch and redo my other > patches to use quotes i […] I think both options are fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8 Gerrit-Change-Number: 36641 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 01 May 2024 08:02:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Rename component id
Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email ) Change subject: SIP_Emulation: Rename component id .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8 Gerrit-Change-Number: 36641 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 01 May 2024 08:01:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
