- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-python-tests[master]: fix "SyntaxWarning: invalid escape sequence '\('"

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36707?usp=email ) Change subject: fix "SyntaxWarning: invalid escape sequence '\('" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I7a9f546dc7cdf9bc250516a58f35b50b46017dc3 Gerrit-Change-Number: 36707 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 04 May 2024 13:44:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 days, 21 hours

1
0
0 0

[S] Change in osmo-e1d[master]: iCE1usb: Transmit AIS events to clients

by jolly

Attention is currently required from: tnt. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36690?usp=email ) Change subject: iCE1usb: Transmit AIS events to clients ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36690?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: I4a35a2ab2537cbc9ecec381ab5078c1b08067925 Gerrit-Change-Number: 36690 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 04 May 2024 10:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 days, 1 hour

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by jolly

Attention is currently required from: laforge, tnt. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email ) Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?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: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 04 May 2024 10:14:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 days, 1 hour

1
0
0 0

[S] Change in osmo-e1d[master]: Update ice1usb_proto.h

by jolly

Attention is currently required from: tnt. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36688?usp=email ) Change subject: Update ice1usb_proto.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36688?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: I8e041b3d94723eba9d3d30b9f03815d46dacf995 Gerrit-Change-Number: 36688 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 04 May 2024 10:13:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 days, 1 hour

1
0
0 0

[S] Change in osmo-e1d[master]: ctl: When setting Sa bits, other bits must remain set to '1'

by jolly

Attention is currently required from: tnt. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36691?usp=email ) Change subject: ctl: When setting Sa bits, other bits must remain set to '1' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36691?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: Id482c6a114e7bf051d157e81038f015e9d26fa99 Gerrit-Change-Number: 36691 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 04 May 2024 10:13:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 days, 1 hour

1
0
0 0

[S] Change in osmo-e1d[master]: iCE1usb: Transmit LOS events to clients

by jolly

Attention is currently required from: tnt. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36689?usp=email ) Change subject: iCE1usb: Transmit LOS events to clients ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36689?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: I8822d24c25f8ba0bb70e9f717ca04dbf0e656e71 Gerrit-Change-Number: 36689 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 04 May 2024 10:12:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 days, 1 hour

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Always define NUM_E1_PORTS in Makefile

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36681?usp=email ) Change subject: icE1usb fw: Always define NUM_E1_PORTS in Makefile ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36681?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: I0b434cef7a662c19e5f48072285c013e8c02e254 Gerrit-Change-Number: 36681 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 02 May 2024 11:26:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 days, 23 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Fix some formatting (tab vs space)

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36682?usp=email ) Change subject: icE1usb fw: Fix some formatting (tab vs space) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36682?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: Id47025320e65a27fc46e9204e050c57d108dab56 Gerrit-Change-Number: 36682 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 02 May 2024 11:26:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 days, 23 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Use NUM_E1_PORTS in e1.c

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36683?usp=email ) Change subject: icE1usb fw: Use NUM_E1_PORTS in e1.c ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36683?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: Id69b4429a67ccb8834fee26b83839539a5ad8b31 Gerrit-Change-Number: 36683 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 02 May 2024 11:25:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 days, 23 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... icE1usb: Configure the RX mode according to CRC4 mode Previously only the TX side would be configured for CRC4 enable/disable, because the RX side hardware didn't support a no-CRC4 mode. Now that it's implemented, make sure to configure it if requested. Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 61 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 2262deb..06ec443 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -108,6 +108,7 @@ } ep; struct { struct ice1usb_tx_config tx; + struct ice1usb_rx_config rx; } cfg; /* last received error interrupt */ struct ice1usb_irq_err last_err; @@ -220,10 +221,23 @@ } } +static const char *rx_mode_str(enum ice1usb_rx_mode rx_mode) +{ + switch (rx_mode) { + case ICE1USB_RX_MODE_FRAME: + return "FRAME"; + case ICE1USB_RX_MODE_MULTIFRAME: + return "MULTIFRAME"; + default: + return "unknown"; + } +} + + #define USB_RT_VEND_IF (USB_TYPE_VENDOR | USB_RECIP_INTERFACE) #define USB_RT_VEND_DEV (USB_TYPE_VENDOR | USB_RECIP_DEVICE) -/* synchronous request, may block up to 1s, only called from process context! */ +/* synchronous requests, may block up to 1s, only called from process context! */ static int ice1usb_tx_config(struct ice1usb *ieu) { int rc; @@ -244,6 +258,25 @@ return 0; } +static int ice1usb_rx_config(struct ice1usb *ieu) +{ + int rc; + uint8_t if_num = ieu->usb_intf->cur_altsetting->desc.bInterfaceNumber; + + ieu_info(ieu, "RX-CONFIG (mode=%s)\n", + rx_mode_str(ieu->cfg.rx.mode)); + + rc = usb_control_msg(ieu->usb_dev, usb_sndctrlpipe(ieu->usb_dev, 0), + ICE1USB_INTF_SET_RX_CFG, USB_RT_VEND_IF, + 0, if_num, &ieu->cfg.rx, sizeof(ieu->cfg.rx), + USB_CTRL_SET_TIMEOUT); + if (rc < 0) + return rc; + if (rc != sizeof(ieu->cfg.rx)) + return -EIO; + return 0; +} + /*********************************************************************** * ISOCHRONOUS transfers @@ -685,10 +718,13 @@ lc->sync = 0; } - if (span->lineconfig & DAHDI_CONFIG_CRC4) + if (span->lineconfig & DAHDI_CONFIG_CRC4) { ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4_E; - else + ieu->cfg.rx.mode = ICE1USB_RX_MODE_MULTIFRAME; + } else { ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0; + ieu->cfg.rx.mode = ICE1USB_RX_MODE_FRAME; + } if (lc->sync > 0) ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_REMOTE; @@ -713,9 +749,16 @@ rc = ice1usb_tx_config(ieu); if (rc < 0) return rc; + rc = ice1usb_rx_config(ieu); + if (rc < 0) + return rc; rc = e1u_d_startup(file, span); - } else + } else { rc = ice1usb_tx_config(ieu); + if (rc < 0) + return rc; + rc = ice1usb_rx_config(ieu); + } return rc; } -- 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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

4 days, 23 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically

by laforge

laforge has submitted 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 ...................................................................... icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically We want the hardware to take care of the CRC4 error bit autonomously without us having to do anything ... Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 7ab751e..2262deb 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -686,7 +686,7 @@ } if (span->lineconfig & DAHDI_CONFIG_CRC4) - ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4; + ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0_CRC4_E; else ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0; -- 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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

4 days, 23 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Fix "typo" in ALL_RY_ALARMS

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email ) Change subject: icE1usb: Fix "typo" in ALL_RY_ALARMS ...................................................................... icE1usb: Fix "typo" in ALL_RY_ALARMS Obviously it's the DADHDI constant that should be used, not the ICE1USB one ... Change-Id: Ib0ef30f629d3e463871a0ee3ab6b0b94cb511804 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 06ec443..1656b3a 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -592,7 +592,7 @@ } #define ALL_RY_ALARMS (DAHDI_ALARM_RED | DAHDI_ALARM_YELLOW | \ - DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA | ICE1USB_ERR_F_LOS) + DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA | DAHDI_ALARM_LOS) /* interrupt EP completes: Process and resubmit */ static void ice1usb_irq_complete(struct urb *urb) -- 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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

4 days, 23 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by laforge

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+2 -- 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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 02 May 2024 11:25:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 days, 23 hours

1
0
0 0

[S] Change in ...osmo-python-tests[master]: fix "SyntaxWarning: invalid escape sequence '\('"

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36707?usp=email ) Change subject: fix "SyntaxWarning: invalid escape sequence '$'" ...................................................................... fix "SyntaxWarning: invalid escape sequence '\('" This is a new warning introduced in Python 3.12: https://docs.python.org/dev/whatsnew/3.12.html#other-language-changes Python 3 interprets string literals as Unicode strings, and so '\(' is treated as an escaped Unicode character. Fix this by prefixing the regexp strings with 'r' and thus converting them to raw strings. Change-Id: I7a9f546dc7cdf9bc250516a58f35b50b46017dc3 --- M osmopy/obscvty.py M osmopy/osmo_interact/ctrl.py M osmopy/osmo_interact/vty.py 3 files changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/07/36707/1 diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index 6b7d56c..5789f98 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -65,8 +65,8 @@ self.port = port self.socket = None - self.norm_end = re.compile('\r\n%s(?:\(([\w-]*)$)?> $' % self.name) - self.priv_end = re.compile('\r\n%s(?:$([\w-]*)$)?# $' % self.name) + self.norm_end = re.compile(r'\r\n%s(?:$([\w-]*)$)?> $' % self.name) + self.priv_end = re.compile(r'\r\n%s(?:$([\w-]*)$)?# $' % self.name) self.last_node = '' def _connect_socket(self): diff --git a/osmopy/osmo_interact/ctrl.py b/osmopy/osmo_interact/ctrl.py index 85e7554..375920b 100755 --- a/osmopy/osmo_interact/ctrl.py +++ b/osmopy/osmo_interact/ctrl.py @@ -32,7 +32,7 @@ class InteractCtrl(Interact): next_id = 1 keep_ids = True - re_command = re.compile('^(SET|GET) ([^ ]*) (.*)$') + re_command = re.compile(r'^(SET|GET) ([^ ]*) (.*)$') class CtrlStep(Interact.StepBase): diff --git a/osmopy/osmo_interact/vty.py b/osmopy/osmo_interact/vty.py index 1cc299c..851b0eb 100755 --- a/osmopy/osmo_interact/vty.py +++ b/osmopy/osmo_interact/vty.py @@ -95,7 +95,7 @@ if not self.prompt: raise Exception('Could not find application name; needed to decode prompts.' ' Initial data was: %r' % data) - self.re_prompt = re.compile('^%s(?:$([\w-]*)$)?([#>]) (.*)$' % re.escape(self.prompt)) + self.re_prompt = re.compile(r'^%s(?:$([\w-]*)$)?([#>]) (.*)$' % re.escape(self.prompt)) def _command(self, command_str, timeout=10): self.socket.send(command_str.encode()) -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I7a9f546dc7cdf9bc250516a58f35b50b46017dc3 Gerrit-Change-Number: 36707 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

5 days

1
0
0 0

[S] Change in osmo-upf[master]: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email ) Change subject: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN ...................................................................... contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN Set CAP_NET_ADMIN so osmo-upf can set up GTP tunends and tunmaps even if running as user. Fix for: Operation not permitted (you must be root) netlink: Error: cache initialization failed: Operation not permitted 20240430095022378 DNFT ERROR error running nft ruleset: rc=-1 ruleset="add table inet osmo-upf { flags owner; };\n" (upf_nft.c:79) 20240430095022378 DNFT ERROR Failed to create nft table "osmo-upf" (upf_nft.c:111) Fixes: OS#6444 Change-Id: I17b21ad92837ad360d667248f3f002d44251891c --- M contrib/systemd/osmo-upf.service 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/contrib/systemd/osmo-upf.service b/contrib/systemd/osmo-upf.service index 93dd84f..ccb4f4f 100644 --- a/contrib/systemd/osmo-upf.service +++ b/contrib/systemd/osmo-upf.service @@ -12,6 +12,7 @@ Group=osmocom ExecStart=/usr/bin/osmo-upf -c /etc/osmocom/osmo-upf.cfg RestartSec=2 +AmbientCapabilities=CAP_NET_ADMIN [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I17b21ad92837ad360d667248f3f002d44251891c Gerrit-Change-Number: 36670 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

5 days, 3 hours

1
0
0 0

[S] Change in osmo-bts[master]: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS

by falconia

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 | <<RSL_IE_IPAC_SPEECH_MODE>> | O | TV | 2 | RTP Payload Type 2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> | O | TV | 2 | RTP CSD Format | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | O | TV | 2 +| RTP Extensions | <<RSL_IE_OSMO_RTP_EXTENSIONS>> | O | TLV | 3 |=== [[rsl_crcx_msg_ack]] @@ -579,6 +580,7 @@ | IP Speech Mode | <<RSL_IE_IPAC_SPEECH_MODE>> | O | TV | 2 | RTP Payload Type 2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> | O | TV | 2 | RTP CSD Format | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | O | TV | 2 +| RTP Extensions | <<RSL_IE_OSMO_RTP_EXTENSIONS>> | O | TLV | 3 |=== [[rsl_mdcx_msg_ack]] @@ -867,6 +869,9 @@ | 0x01 | RSL_IE_CHAN_NR | <<RSL_IE_CHAN_NR>> | 0x60 | RSL_IE_OSMO_REP_ACCH_CAP | <<RSL_IE_OSMO_REP_ACCH_CAP>> | 0x61 | RSL_IE_OSMO_TRAINING_SEQUENCE | <<RSL_IE_OSMO_TRAINING_SEQUENCE>> +| 0x62 | RSL_IE_OSMO_TEMP_OVP_ACCH_CAP | <<RSL_IE_OSMO_TEMP_OVP_ACCH_CAP>> +| 0x63 | RSL_IE_OSMO_OSMUX_CID | <<RSL_IE_OSMO_OSMUX_CID>> +| 0x64 | RSL_IE_OSMO_RTP_EXTENSIONS | <<RSL_IE_OSMO_RTP_EXTENSIONS>> | 0xf0 | RSL_IE_IPAC_REMOTE_IP | <<RSL_IE_IPAC_REMOTE_IP>> | 0xf1 | RSL_IE_IPAC_REMOTE_PORT | <<RSL_IE_IPAC_REMOTE_PORT>> | 0xf3 | RSL_IE_IPAC_LOCAL_PORT | <<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 <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

5 days, 11 hours

1
0
0 0

[S] Change in libosmocore[master]: rsl: define RSL_IE_OSMO_RTP_EXTENSIONS

by falconia

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 <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

5 days, 11 hours

1
0
0 0

[S] Change in libosmocore[master]: bts_features: add feature flags for TWTS001 and TWTS002

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36704?usp=email ) Change subject: bts_features: add feature flags for TWTS001 and TWTS002 ...................................................................... bts_features: add feature flags for TWTS001 and TWTS002 TW-TS-001 and TW-TS-002 (Themyscira Wireless Technical Specifications) are enhanced RTP payload formats that replicate the functionality and semantics of 3GPP TS 48.060 and 48.061 (respectively) over IP transport. Companion spec TW-TS-003 defines a BSSMAP extension whereby the CN tells the BSS that it wishes to use these otherwise non-standard RTP formats - but these RTP extensions need to originate at the BTS, as their main purpose is to pass along information that is otherwise lost in RTP transport with standard payload formats. Define feature flags whereby OsmoBTS can tell OsmoBSC that it supports these RTP extensions. Change-Id: Ia2cd1d5fa37e9d10927ca5d6cad79ec538fd0a11 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/36704/1 diff --git a/include/osmocom/gsm/bts_features.h b/include/osmocom/gsm/bts_features.h index cf1db4a..8da08d8 100644 --- a/include/osmocom/gsm/bts_features.h +++ b/include/osmocom/gsm/bts_features.h @@ -36,6 +36,8 @@ BTS_FEAT_OSMUX, /* Osmux (Osmocom RTP muxing) support */ BTS_FEAT_VBS, /* Voice Broadcast Service support, 3GPP TS 43.069 */ BTS_FEAT_VGCS, /* Voice Group Call Service support, 3GPP TS 44.068 */ + BTS_FEAT_TWTS001, /* TW-TS-001: enhanced RTP transport for FR & EFR */ + BTS_FEAT_TWTS002, /* TW-TS-002: enhanced RTP transport for HRv1 */ _NUM_BTS_FEAT }; diff --git a/src/gsm/bts_features.c b/src/gsm/bts_features.c index b6cd82e..158937a 100644 --- a/src/gsm/bts_features.c +++ b/src/gsm/bts_features.c @@ -47,6 +47,8 @@ { BTS_FEAT_OSMUX, "Osmux (Osmocom RTP multiplexing)" }, { BTS_FEAT_VBS, "Voice Broadcast Service" }, { BTS_FEAT_VGCS, "Voice Group Call Service" }, + { BTS_FEAT_TWTS001, "TW-TS-001 RTP format" }, + { BTS_FEAT_TWTS002, "TW-TS-002 RTP format" }, { 0, NULL } }; @@ -88,6 +90,8 @@ { BTS_FEAT_OSMUX, "OSMUX" }, { BTS_FEAT_VBS, "VBS" }, { BTS_FEAT_VGCS, "VGCS" }, + { BTS_FEAT_TWTS001, "TWTS001" }, + { BTS_FEAT_TWTS002, "TWTS002" }, {} }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36704?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: Ia2cd1d5fa37e9d10927ca5d6cad79ec538fd0a11 Gerrit-Change-Number: 36704 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

5 days, 11 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

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 <tnt(a)246tNt.com> 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-Comment-Date: Wed, 01 May 2024 12:57:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Report BLUE alarm when receiving AIS

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:54:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Show accumulated error count from GPSDO state in sysfs

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:54:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Update ice1usb_proto.h

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:53:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:53:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Fix "typo" in ALL_RY_ALARMS

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:52:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:52:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: Fix build against linux >= 6.5.12

by laforge

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/a370c800599b8ee0ca1a84392045… see https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… https://lore.kernel.org/all/49925af7-78a8-a3dd-bce6-cfc02e1a9236@I-love.SAK… 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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration

by laforge

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 <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration

by laforge

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 (1000002) -- 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 <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: deleteVote

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration

by laforge

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 <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 01 May 2024 12:43:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: Fix build against linux >= 6.5.12

by laforge

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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Wed, 01 May 2024 12:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 12:40:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in dahdi-linux[master]: frame_fifo: add missing declaration

by laforge

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 <laforge(a)osmocom.org> Gerrit-MessageType: newchange

5 days, 22 hours

1
0
0 0

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by laforge

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, dahdi_lboname(s->lbo), sizeof(spaninfo_v1.lboname)); if (s->parent->manufacturer) { - strlcpy(spaninfo_v1.manufacturer, s->parent->manufacturer, + strscpy(spaninfo_v1.manufacturer, s->parent->manufacturer, sizeof(spaninfo_v1.manufacturer)); } if (s->parent->devicetype) { - strlcpy(spaninfo_v1.devicetype, s->parent->devicetype, + strscpy(spaninfo_v1.devicetype, s->parent->devicetype, sizeof(spaninfo_v1.devicetype)); } - strlcpy(spaninfo_v1.location, s->parent->location, + strscpy(spaninfo_v1.location, s->parent->location, sizeof(spaninfo_v1.location)); if (s->spantype) { - strlcpy(spaninfo_v1.spantype, + strscpy(spaninfo_v1.spantype, dahdi_spantype2str(s->spantype), sizeof(spaninfo_v1.spantype)); } @@ -5340,7 +5340,7 @@ * always use it instead of any configured software * echocan. This matches the behavior in dahdi 2.4.1.2 * and earlier releases. */ - strlcpy(ae.echocan, hwec_def_name, sizeof(ae.echocan)); + strscpy(ae.echocan, hwec_def_name, sizeof(ae.echocan)); } else if (strcasecmp(ae.echocan, hwec_def_name) != 0) { chan_dbg(GENERAL, chan, @@ -5439,7 +5439,7 @@ bool have_hwec = dahdi_any_hwec_available(); memset(&vi, 0, sizeof(vi)); - strlcpy(vi.version, dahdi_version, sizeof(vi.version)); + strscpy(vi.version, dahdi_version, sizeof(vi.version)); spin_lock(&ecfactory_list_lock); list_for_each_entry(cur, &ecfactory_list, list) { const char * const ec_name = cur->ec->get_name(NULL); @@ -5696,7 +5696,7 @@ rv = -EBUSY; break; } - strlcpy(chan->txdialbuf + strlen(chan->txdialbuf), tdo->dialstr, + strscpy(chan->txdialbuf + strlen(chan->txdialbuf), tdo->dialstr, DAHDI_MAX_DTMF_BUF - strlen(chan->txdialbuf)); if (!chan->dialing) { chan->dialing = 1; diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 6643441..e33a021 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -622,8 +622,8 @@ } /* Setup parameters properly assuming we're going to be okay. */ - strlcpy(d->dname, dds->driver, sizeof(d->dname)); - strlcpy(d->addr, dds->addr, sizeof(d->addr)); + strscpy(d->dname, dds->driver, sizeof(d->dname)); + strscpy(d->addr, dds->addr, sizeof(d->addr)); d->timing = dds->timing; snprintf(d->span.name, sizeof(d->span.name), "DYN/%s/%s", dds->driver, dds->addr); diff --git a/drivers/dahdi/dahdi_dynamic_eth.c b/drivers/dahdi/dahdi_dynamic_eth.c index 0209489..c7a293d 100644 --- a/drivers/dahdi/dahdi_dynamic_eth.c +++ b/drivers/dahdi/dahdi_dynamic_eth.c @@ -292,12 +292,12 @@ memset(z, 0, sizeof(struct ztdeth)); /* Address should be <dev>/<macaddr>[/subaddr] */ - strlcpy(tmp, addr, sizeof(tmp)); + strscpy(tmp, addr, sizeof(tmp)); tmp2 = strchr(tmp, '/'); if (tmp2) { *tmp2 = '\0'; tmp2++; - strlcpy(z->ethdev, tmp, sizeof(z->ethdev)); + strscpy(z->ethdev, tmp, sizeof(z->ethdev)); } else { printk(KERN_NOTICE "Invalid TDMoE address (no device) '%s'\n", addr); kfree(z); diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c index 1ee8b0c..f98280c 100644 --- a/drivers/dahdi/dahdi_dynamic_ethmf.c +++ b/drivers/dahdi/dahdi_dynamic_ethmf.c @@ -570,7 +570,7 @@ z->rcvbuf = kmalloc(bufsize, GFP_KERNEL); /* Address should be <dev>/<macaddr>/subaddr */ - strlcpy(src, addr, sizeof(src)); + strscpy(src, addr, sizeof(src)); /* replace all / with space; otherwise kernel sscanf does not work */ src_ptr = src; while (*src_ptr) { diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c index 6021aac..7645e2f 100644 --- a/drivers/dahdi/dahdi_transcode.c +++ b/drivers/dahdi/dahdi_transcode.c @@ -329,7 +329,7 @@ return -ENOSYS; } - strlcpy(info.name, tc->name, sizeof(info.name)); + strscpy(info.name, tc->name, sizeof(info.name)); info.numchannels = tc->numchannels; info.srcfmts = tc->srcfmts; info.dstfmts = tc->dstfmts; diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c index 434d3e8..a6d8ff0 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -341,7 +341,7 @@ XBUS_DBG(GENERAL, xbus, "Dropped packet. Disconnected.\n"); return -EBUSY; } - strlcpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ + strscpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ if (buf[0] == '#' || buf[0] == ';') XPD_DBG(REGS, xpd, "Note: '%s'\n", buf); if ((p = strchr(buf, '#')) != NULL) /* Truncate comments */ -- 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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

5 days, 22 hours

1
0
0 0

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by laforge

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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Wed, 01 May 2024 12:37:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 days, 22 hours

1
0
0 0

[S] Change in osmo-sgsn[master]: VTY: sync default UMTS UEA config with osmo-msc

by laforge

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 <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 May 2024 09:50:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 1 hour

1
0
0 0

[S] Change in osmo-sgsn[master]: VTY: move default settings to sgsn_instance_alloc()

by laforge

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 <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 01 May 2024 09:50:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 1 hour

1
0
0 0

[S] Change in osmo-sgsn[master]: VTY: sync default UMTS UEA config with osmo-msc

by fixeria

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 <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 days, 1 hour

1
0
0 0

[S] Change in osmo-sgsn[master]: VTY: move default settings to sgsn_instance_alloc()

by fixeria

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 <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/gsup.h> +#include <osmocom/crypt/gprs_cipher.h> +#include <osmocom/crypt/utran_cipher.h> + #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> @@ -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 <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 days, 1 hour

1
0
0 0

[S] Change in dahdi-linux[master]: Fix build against linux >= 6.5.12

by roox

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/a370c800599b8ee0ca1a84392045… see https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… https://lore.kernel.org/all/49925af7-78a8-a3dd-bce6-cfc02e1a9236@I-love.SAK… 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 <mardnh(a)gmx.de> Gerrit-MessageType: newchange

6 days, 2 hours

1
0
0 0

[S] Change in osmo-sgsn[master]: gmm: cosmetic: fix preprocessor macro formatting

by fixeria

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 <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 days, 2 hours

1
0
0 0

[S] Change in osmo-sgsn[master]: gmm: mmctx_timer_stop(): warn about timer not running

by fixeria

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(262420000000038/e2ff704e) Stopping MM timer 3350 but 0 is running into warnings with a more accurate reason: DMM NOTICE MM(262420000000037/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(&mm->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(&mm->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 <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

6 days, 2 hours

1
0
0 0

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by roox

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 <mardnh(a)gmx.de> -- 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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

6 days, 3 hours

1
0
0 0

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by roox

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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 08:18:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 3 hours

1
0
0 0

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by tnt

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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Wed, 01 May 2024 08:08:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 3 hours

1
0
0 0

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by tnt

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 (1000002) -- 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 <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-MessageType: deleteVote

6 days, 3 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Fix OIS -> AIS typo

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 08:06:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 3 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2e1

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 08:06:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 3 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode

by laforge

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 <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 01 May 2024 08:05:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 days, 3 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions: add ts template for authenticateClientRequestEsipa

by laforge

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 <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 days, 3 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for CtxParams1

by laforge

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 := *, - nrEpcSupportedRelease := *, - nr5gcSupportedRelease := *, - eutran5gcSupportedRelease := *, - lpaSvn := *, - catSupportedClasses := *, - euiccFormFactorType := *, - deviceAdditionalFeatureSupport := * - }, - imei := * - } - } - } + ctxParams1 := tr_ctxParams1 }, euiccSignature1 := ?, euiccCertificate := ?, @@ -521,32 +549,7 @@ serverAddress := "smdp.example.com", serverChallenge := '01020304050607080910111213141516'O, euiccInfo2 := ts_EUICCInfo2, - 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 - } - } - } + ctxParams1 := ts_ctxParams1 }, euiccSignature1 := '12345678'O, euiccCertificate := ts_cert_euicc_nist, -- 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 <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 days, 3 hours

1
0
0 0

2024

2023

2022

gerrit-log