Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions board/common/rootfs/etc/bash.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ log()
{
local fn="/var/log/syslog"
[ -n "$1" ] && fn="/var/log/$1"
less +G "$fn"
less +G -r "$fn"
}

follow()
{
local fn="/var/log/syslog"
[ -n "$1" ] && fn="/var/log/$1"
tail -F "$fn"
less +F -r "$fn"
}

_logfile_completions()
Expand Down
3 changes: 3 additions & 0 deletions board/common/rootfs/etc/finit.d/available/netconf.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
service name:netopeer notify:none log env:/etc/default/confd \
[12345] <pid/confd> netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \
-- NETCONF server
2 changes: 1 addition & 1 deletion board/common/rootfs/etc/finit.d/available/sysklogd.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Use <pid/syslogd> as barrier for other system tasks and service that
# rely on modules, firmware, and device nodes to be ready.
service if:udevd nowarn env:-/etc/default/sysklogd <run/udevadm:post/success> \
[S0123456789] syslogd -F $SYSLOGD_ARGS -- System log daemon
[S0123456789] syslogd -8 -F $SYSLOGD_ARGS -- System log daemon
1 change: 1 addition & 0 deletions board/common/rootfs/etc/finit.d/enabled/netconf.conf
3 changes: 2 additions & 1 deletion board/common/rootfs/usr/bin/pager
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
# -K :: exit immediately when an interrupt character (usually ^C) is typed
# -R :: Almost raw control charachters, only ANSI color escape sequences and
# OSC 8 hyperlink sequences are output. Allows veritcal scrolling
# -r :: Causes "raw" control characters to be displayed, including unicode.
# -X :: No termcap initialization and deinitialization set to the terminal.
# This is what leaves the contents of the output on screen.

export LESS="-P %f (press h for help or q to quit)"
export LANG=en_US.UTF-8

less -RIKd -FX "$@"
less -rIKd -FX "$@"
2 changes: 2 additions & 0 deletions doc/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ All notable changes to the project are documented in this file.
- Add neofetch system information tool for system introspection, issue #1143
- Add mtr and iperf3 network diagnostic tools, issue #1144
- Improve default bash settings with better history handling and tab completion
- cli: new `terminal reset` and `terminal resize` convenience commands

### Fixes
- Fix #1100: Reduce DHCP client logging verbosity by 70% and include interface
names in log messages for easier troubleshooting
- Fix #1119: CLI UX regression, restore proper behavior for `no enabled` command
- Fix #1155: `show ospf` commands regression
- Fix #1150: show-legacy wrapper permissions
- Fixes for unicode translation in log and pager outputs as well as `syslogd`

[BPI-R3]: https://wiki.banana-pi.org/Banana_Pi_BPI-R3

Expand Down
4 changes: 0 additions & 4 deletions package/confd/confd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ run name:failure log:prio:user.crit norestart env:/etc/default/confd \
run name:error :2 log:console norestart \
if:<run/failure/failure> \
[S] /usr/libexec/confd/error --

service name:netopeer notify:none log env:/etc/default/confd \
[12345] <pid/confd> netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \
-- NETCONF server
5 changes: 5 additions & 0 deletions package/nghttp2-asio/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ config BR2_PACKAGE_NGHTTP2_ASIO
select BR2_PACKAGE_BOOST
help
C++ bindings for nghttp2

This is the CESNET fork of nghttp2-asio, introduced here:
https://github.com/CESNET/rousette/commit/fff3429

https://github.com/CESNET/nghttp2-asio
3 changes: 1 addition & 2 deletions package/nghttp2-asio/nghttp2-asio.hash
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Locally calculated
sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING
sha256 d971c538a31eae5714d2434d90f86794f267615e85e8d2bb0c383e83c300e1ce nghttp2-asio-e877868abe06a83ed0a6ac6e245c07f6f20866b5-git4.tar.gz

sha256 883af672c1d210398170749a8ccda30103b2894bcd4eccd80f36771aad0b15c3 nghttp2-asio-2173b82e6caa85950c769eecc5da6809faadf61a-git4.tar.gz
4 changes: 2 additions & 2 deletions package/nghttp2-asio/nghttp2-asio.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NGHTTP2_ASIO_VERSION = e877868abe06a83ed0a6ac6e245c07f6f20866b5
NGHTTP2_ASIO_SITE = https://github.com/kernelkit/nghttp2-asio.git
NGHTTP2_ASIO_VERSION = 2173b82e6caa85950c769eecc5da6809faadf61a
NGHTTP2_ASIO_SITE = https://github.com/CESNET/nghttp2-asio
NGHTTP2_ASIO_SITE_METHOD = git
NGHTTP2_ASIO_LICENSE = MIT
NGHTTP2_ASIO_LICENSE_FILES = COPYING
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a4136d889237dadb9253ea7eb668a525dd779e6d Mon Sep 17 00:00:00 2001
From c0d13b8e426608a30b1eea382f908fb6447fd01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]>
Date: Thu, 12 Jun 2025 10:33:42 +0100
Subject: [PATCH 01/17] Log HTTP headers and the input data payload
Subject: [PATCH 01/13] Log HTTP headers and the input data payload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Expand All @@ -11,7 +11,7 @@ Organization: Wires
Hažlinský just found.

Change-Id: I2a930a02c7d30c051390fe73e6af9849edd580b4
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/restconf/Server.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
From 6c5b482ea5c9fbc1149a0864b05d1bb1fa7100bf Mon Sep 17 00:00:00 2001
From 027a47ac3ff6c369caab7c007a5a171a68270829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <[email protected]>
Date: Fri, 13 Jun 2025 10:47:55 +0200
Subject: [PATCH 02/17] restconf: prevent throwing exception in
Subject: [PATCH 02/13] restconf: prevent throwing exception in
withRestconfExceptions wrapper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Wires

In case the catch block of withRestconfExceptions is reached and an
Expand All @@ -22,7 +19,7 @@ handle such situations.

Bug: https://github.com/CESNET/rousette/issues/19
Change-Id: Ifbd74b9bdc0ca66c4e5449a7673ef2f12ae9215e
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/restconf/Server.cpp | 2 +-
tests/restconf-plain-patch.cpp | 24 ++++++++++++++++++++++++
Expand Down
31 changes: 0 additions & 31 deletions package/rousette/0003-CI-switch-to-the-new-cloud-s-Swift-URL.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ec8673126929b6459fcd99c84a79993a725b40e1 Mon Sep 17 00:00:00 2001
From d1c56f14b54b113df8fba759924bb47cfa27366c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <[email protected]>
Date: Fri, 13 Jun 2025 10:47:55 +0200
Subject: [PATCH 04/17] restconf: crash instead of a deadlock when the handler
Subject: [PATCH 03/13] restconf: crash instead of a deadlock when the handler
throws
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Expand Down Expand Up @@ -37,7 +37,7 @@ called twice [3].
Signed-off-by: Jan Kundrát <[email protected]>
Bug: https://github.com/CESNET/rousette/issues/19
Change-Id: I2c090b9a76b062101ba422a7d50e8e699779e203
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/restconf/Server.cpp | 28 ++++++++++++++++++++++++++++
src/restconf/Server.h | 4 ++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
From 4eae6200aa812950ebbac1660a1899f4edf41e11 Mon Sep 17 00:00:00 2001
From db64d7b3fc0a0373067e6c5ac9e41b93351778a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]>
Date: Wed, 7 Aug 2024 19:07:35 +0200
Subject: [PATCH 06/17] close long-lived connections on SIGTERM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 04/13] close long-lived connections on SIGTERM
Organization: Wires

Without this patch, all the ongoing SSE streams would be left alive for
Expand All @@ -23,7 +20,7 @@ hope it is).

Change-Id: If442134783ba1d699de47c51a9068378f53e8339
Co-authored-by: Tomas Pecka <[email protected]>
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
CMakeLists.txt | 1 +
src/clock.cpp | 7 +--
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
From ca2894d4888c673d227fc196a25f83ded20e8f04 Mon Sep 17 00:00:00 2001
From 5c8a139d04d9b3dfb28b8c0e1a4aa7b945a1e8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <[email protected]>
Date: Mon, 30 Jun 2025 15:38:02 +0200
Subject: [PATCH 07/17] restconf: refactor server stop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 05/13] restconf: refactor server stop
Organization: Wires

In 94b24795 ("server: simplify listening/stopping") we needed to call
Expand All @@ -20,7 +17,7 @@ does not seem like it should be called from *every* io_service.)
[2] https://www.boost.org/doc/libs/1_85_0/doc/html/boost_asio/reference/post.html

Change-Id: I2f33c38a78dce4081a03326c9a9bb25817fc9d2f
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/restconf/Server.cpp | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
From 5becffe8a1dd47c8836ce1800a1b72acdf86021f Mon Sep 17 00:00:00 2001
From 086cfe1847e406df90852dc3cb52ece3d0cbe22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <[email protected]>
Date: Mon, 12 May 2025 14:56:54 +0200
Subject: [PATCH 10/17] http: send keep-alive pings from EventStream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 06/13] http: send keep-alive pings from EventStream
Organization: Wires

The nghttp2-asio server disconnects client after 60 seconds of no
Expand All @@ -31,7 +28,7 @@ to the server when the server sends these "keep-alive comments".
[3] https://html.spec.whatwg.org/multipage/server-sent-events.html#authoring-notes

Change-Id: I57e510d0b61ac7ed032c582779780c64768b7d53
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/clock.cpp | 4 +-
src/http/EventStream.cpp | 44 +++++++++++++--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
From ff4ff1c193083feca76d9f0f4485e4b175c373c2 Mon Sep 17 00:00:00 2001
From 06e2751e4da052195db96aaa90549fba398208bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <[email protected]>
Date: Wed, 23 Jul 2025 14:27:26 +0200
Subject: [PATCH 11/17] refactor: event streams use named constructors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 07/13] refactor: event streams use named constructors
Organization: Wires

This commit refactors the EventStream and NotificationStream to use
Expand All @@ -17,7 +14,7 @@ named constructors which perform the double initialization themselves.
This way, the code is more readable and the intention should be clearer.

Change-Id: Iac96c49c20670dfe924d7c8db33328ed9c2fc9dd
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/clock.cpp | 3 +--
src/http/EventStream.cpp | 20 ++++++++++++++++++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
From f4602a03adc9134a9b7a9d338e900b40557da6c4 Mon Sep 17 00:00:00 2001
From e98e079d0fdedf48facbfcf187950946c1ffed7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]>
Date: Thu, 7 Aug 2025 12:14:02 +0200
Subject: [PATCH 12/17] refactor: a better convention for weak_from_this->lock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 08/13] refactor: a better convention for weak_from_this->lock
Organization: Wires

It is not a "client", so let's stop calling it a "client". My bad.

Change-Id: Id8dc4d92c3ade8d86697366d0102e84bd466f504
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/http/EventStream.cpp | 44 ++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 22 deletions(-)
Expand Down
33 changes: 0 additions & 33 deletions package/rousette/0008-tests-use-std-string-starts_with.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
From 4e9b535a59861f25c0602eaa1fc39126d7cd9899 Mon Sep 17 00:00:00 2001
From de7c55a1e8d3dda20ee3dc408612f2ddb309e888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]>
Date: Thu, 7 Aug 2025 12:21:54 +0200
Subject: [PATCH 13/17] fix a possible bad_weak_ptr exception
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 09/13] fix a possible bad_weak_ptr exception
Organization: Wires

Change-Id: I8c7f7a943a1d848f15527988cb76c2a0a10089e6
Fixes: 4eae6200 (close long-lived connections on SIGTERM)
Signed-off-by: Mattias Walström <lazzer@gmail.com>
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
src/http/EventStream.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Expand Down
Loading