Configurable services

.gitignore

@@ -1,7 +1,9 @@
 *~
 .gdb_history
+/.backup
 /.ccache
 /dl
 /output*
+/x-*
 /test/.venv
 /local.mk

board/netconf/rootfs/etc/auto-factory.d/10-system.json

@@ -1,5 +1,14 @@
 {
     "ietf-system:system": {
 	"hostname": "infix"
+    },
+    "ieee802-dot1ab-lldp:lldp": {
+	"infix-lldp:enabled": true
+    },
+    "infix-services:mdns": {
+	"enabled": true
+    },
+    "infix-services:ssdp": {
+	"enabled": true
     }
 }

board/netconf/rootfs/lib/infix/cfg-bootstrap

@@ -32,4 +32,4 @@ chmod 444 $CFG_D/auto-factory-config.cfg
     ln -sf auto-factory-config.cfg $CFG_D/factory-config.cfg
 
 # Bootstrap sysrepo db with all modules required by confd
-sysrepo-bootstrap.sh $CFG_D/factory-config.cfg $CFG_D/startup-config.cfg
+/usr/libexec/confd/confd-bootstrap.sh $CFG_D/factory-config.cfg $CFG_D/startup-config.cfg

package/Config.in

@@ -8,6 +8,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/ifupdown-ng/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-infix/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-sysrepo/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/libsrx/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/lowdown/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/mdnsd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/net/Config.in"

package/confd/Config.in

@@ -5,6 +5,7 @@ config BR2_PACKAGE_CONFD
 	select BR2_PACKAGE_LIBITE
 	select BR2_PACKAGE_NETOPEER2
 	select BR2_PACKAGE_SYSREPO
+	select BR2_PACKAGE_LIBSRX
 	help
 	  A plugin to sysrepo that provides the core YANG models used to
 	  manage an Infix based system.  Configuration can be done using

package/confd/confd.mk

@@ -10,7 +10,7 @@ CONFD_SITE_METHOD = local
 CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd
 CONFD_LICENSE = BSD-3
 CONFD_LICENSE_FILES = LICENSE
-CONFD_DEPENDENCIES = augeas jansson libite sysrepo
+CONFD_DEPENDENCIES = augeas jansson libite sysrepo libsrx
 CONFD_AUTORECONF = YES
 
 define CONFD_INSTALL_EXTRA

package/libsrx/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBSRX
+	bool "libsrx"
+	select BR2_PACKAGE_SYSREPO
+	help
+	  Extensions and helper APIs for sysrepo plugins.
+
+	  https://github.com/kernelkit/infix

package/libsrx/libsrx.mk

@@ -0,0 +1,16 @@
+################################################################################
+#
+# libsrx
+#
+################################################################################
+
+LIBSRX_VERSION = 1.0.0
+LIBSRX_SITE_METHOD = local
+LIBSRX_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/libsrx
+LIBSRX_LICENSE = BSD-3-Clause
+LIBSRX_LICENSE_FILES = LICENSE
+LIBSRX_INSTALL_STAGING = YES
+LIBSRX_DEPENDENCIES = sysrepo
+LIBSRX_AUTORECONF = YES
+
+$(eval $(autotools-package))

package/skeleton-init-finit/skeleton-init-finit.mk

@@ -39,7 +39,6 @@ ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 define SKELETON_INIT_FINIT_SET_AVAHI
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/avahi.conf $(FINIT_D)/available/
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/avahi-dnsconfd.conf $(FINIT_D)/available/
-	ln -sf ../available/avahi.conf $(FINIT_D)/enabled/avahi.conf
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_AVAHI
 endif
@@ -103,7 +102,6 @@ endif
 ifeq ($(BR2_PACKAGE_LLDPD),y)
 define SKELETON_INIT_FINIT_SET_LLDPD
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/lldpd.conf $(FINIT_D)/available/
-	ln -sf ../available/lldpd.conf $(FINIT_D)/enabled/lldpd.conf
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_LLDPD
 endif
@@ -118,15 +116,13 @@ endif
 ifeq ($(BR2_PACKAGE_NETSNMP),y)
 define SKELETON_INIT_FINIT_SET_NETSNMP
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/snmpd.conf $(FINIT_D)/available/
-	ln -sf ../available/snmpd.conf $(FINIT_D)/enabled/snmpd.conf
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_NETSNMP
 endif
 
 ifeq ($(BR2_PACKAGE_NGINX),y)
 define SKELETON_INIT_FINIT_SET_NGINX
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/nginx.conf $(FINIT_D)/available/
-	ln -sf ../available/nginx.conf $(FINIT_D)/enabled/nginx.conf
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_NGINX
 endif
@@ -215,8 +211,7 @@ endif
 # SSDP Responder
 ifeq ($(BR2_PACKAGE_SSDP_RESPONDER),y)
 define SKELETON_INIT_FINIT_SET_SSDP_RESPONDER
-	cp $(SKELETON_INIT_FINIT_AVAILABLE)/ssdpd.conf $(FINIT_D)/available/
-	ln -sf ../available/ssdpd.conf $(FINIT_D)/enabled/ssdpd.conf
+	cp $(SKELETON_INIT_FINIT_AVAILABLE)/ssdp-responder.conf $(FINIT_D)/available/
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_SSDP_RESPONDER
 endif
@@ -252,11 +247,9 @@ endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_WATCHDOGD
 endif
 
-# Enable gdbserver when running in Qemu mode
-ifeq ($(QEMU_GDB),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),y)
 define SKELETON_INIT_FINIT_SET_GDBSERVER
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/gdbserver.conf $(FINIT_D)/available/
-	ln -sf ../available/gdbserver.conf $(FINIT_D)/enabled/gdbserver.conf
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_GDBSERVER
 endif

package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf

@@ -1 +1 @@
-service [2345789] avahi-daemon -s -- Avahi mDNS-SD daemon
+service [2345789] name:mdns avahi-daemon -s -- Avahi mDNS-SD daemon

package/skeleton-init-finit/skeleton/etc/finit.d/available/ssdp-responder.conf

@@ -0,0 +1 @@
+service [2345] name:ssdp ssdpd -r 5 -i 30 -ns -- SSDP Responder

package/statd/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_STATD
 	select BR2_PACKAGE_JANSSON
 	select BR2_PACKAGE_LIBEV
 	select BR2_PACKAGE_SYSREPO
+	select BR2_PACKAGE_LIBSRX
 	help
 	  Operational Status Daemon. Responsible for handling sysrepo
 	  operational run-time info. Such as interface state and address.

package/statd/statd.mk

@@ -3,11 +3,12 @@
 # statd
 #
 ################################################################################
+
 STATD_VERSION = 1.0
 STATD_LICENSE = MIT
 STATD_SITE_METHOD = local
 STATD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/statd
-STATD_DEPENDENCIES = sysrepo libev jansson
+STATD_DEPENDENCIES = sysrepo libev libsrx jansson
 
 define STATD_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \

patches/netcalc/2.1.6/colorize-over-pipes.patch

@@ -0,0 +1,13 @@
+diff -ruN netcalc-2.1.6.orig/src/netcalc.c netcalc-2.1.6/src/netcalc.c
+--- netcalc-2.1.6.orig/src/netcalc.c	2020-06-07 00:07:47.000000000 +0200
++++ netcalc-2.1.6/src/netcalc.c	2023-07-17 20:46:27.798167801 +0200
+@@ -615,9 +615,6 @@
+ 	if (!abox_start)
+ 		err(1, "Fatal error");
+
+-	if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO))
+-		colorize = 0;
+-
+ 	if (split_errv4 || split_errv6 || range_err) {
+  nothing:
+ 		warnx("No (valid) commands received, nothing to do.");

patches/tcpdump/silence.patch

@@ -0,0 +1,17 @@
+diff -ruN tcpdump-4.99.4.orig/tcpdump.c tcpdump-4.99.4/tcpdump.c
+--- tcpdump-4.99.4.orig/tcpdump.c	2023-04-07 20:30:58.000000000 +0200
++++ tcpdump-4.99.4/tcpdump.c	2023-07-17 18:08:51.322519509 +0200
+@@ -2535,12 +2535,7 @@
+ 		 * to a file from the -V file).  Print a message to
+ 		 * the standard error on UN*X.
+ 		 */
+-		if (!ndo->ndo_vflag && !WFileName) {
+-			(void)fprintf(stderr,
+-			    "%s: verbose output suppressed, use -v[v]... for full protocol decode\n",
+-			    program_name);
+-		} else
+-			(void)fprintf(stderr, "%s: ", program_name);
++		(void)fprintf(stderr, "%s: ", program_name);
+ 		dlt = pcap_datalink(pd);
+ 		dlt_name = pcap_datalink_val_to_name(dlt);
+ 		(void)fprintf(stderr, "listening on %s", device);

src/confd/LICENSE

@@ -26,4 +26,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

src/confd/Makefile.am

@@ -1,4 +1,5 @@
-SUBDIRS         = src yang
-DISTCLEANFILES  = *~ *.d
-ACLOCAL_AMFLAGS = -I m4
-dist_bin_SCRIPTS= sysrepo-bootstrap.sh
+SUBDIRS             = src yang
+dist_doc_DATA       = README.md LICENSE
+pkglibexec_SCRIPTS  = confd-bootstrap.sh
+DISTCLEANFILES      = *~ *.d
+ACLOCAL_AMFLAGS     = -I m4

src/confd/sysrepo-bootstrap.sh → src/confd/confd-bootstrap.sh

@@ -79,8 +79,12 @@ sysrepoctl -s $SEARCH							\
 	   -i infix-if-type@2023-08-21.yang	-g wheel -p 0660	\
 	   -i infix-interfaces@2023-08-21.yang	-g wheel -p 0660	\
 		-e vlan-filtering					\
+	   -i ieee802-dot1ab-lldp@2022-03-15.yang -g wheel -p 0660	\
+	   -i infix-lldp@2023-08-23.yang	-g wheel -p 0660	\
+	   -i infix-dhcp-client@2023-05-22.yang -g wheel -p 0660	\
 	   -i infix-shell-type@2023-08-21.yang	-g wheel -p 0660	\
 	   -i infix-system@2023-08-15.yang	-g wheel -p 0660	\
+	   -i infix-services@2023-08-22.yang	-g wheel -p 0660	\
 	   -I "${INIT_DATA}"
 rc=$?
 

src/confd/configure.ac

@@ -1,20 +1,17 @@
 AC_PREREQ(2.61)
-AC_INIT([confd], [1.0.0],
-	[https://github.com/kernelkit/infix/issues])
+AC_INIT([confd], [1.0.0], [https://github.com/kernelkit/infix/issues])
 AM_INIT_AUTOMAKE(1.11 foreign subdir-objects)
 AM_SILENT_RULES(yes)
 
-LT_INIT
-
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
-	src/confd/Makefile
 	yang/Makefile
 ])
 
 AC_PROG_CC
 AC_PROG_INSTALL
+LT_INIT
 
 AC_CONFIG_LIBOBJ_DIR(lib)
 AC_REPLACE_FUNCS(vasprintf)
@@ -38,6 +35,7 @@ PKG_CHECK_MODULES([glib],    [glib-2.0 >= 2.50 gio-2.0 gio-unix-2.0])
 PKG_CHECK_MODULES([jansson], [jansson >= 2.0.0])
 PKG_CHECK_MODULES([libite],  [libite >= 2.5.0])
 PKG_CHECK_MODULES([sysrepo], [sysrepo >= 2.2.36])
+PKG_CHECK_MODULES([libsrx],  [libsrx >= 1.0.0])
 
 # Plugin installation path for sysrepo-plugind
 PKG_CHECK_VAR([srpdplugindir], [sysrepo], [SRPD_PLUGINS_PATH])

src/confd/src/Makefile.am

@@ -1,3 +1,51 @@
-AUTOMAKE_OPTIONS = subdir-objects
+CFLAGS                 += -Wall -Wextra -Werror -Wno-unused-parameter
+AM_CPPFLAGS             = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG_PATH_=\"$(YANGDIR)\"
 
-SUBDIRS = confd
+plugindir               = $(srpdplugindir)
+plugin_LTLIBRARIES      = confd-plugin.la
+
+confd_plugin_la_LDFLAGS = -module -avoid-version -shared
+
+confd_plugin_la_CFLAGS  =			\
+	$(augeas_CFLAGS)			\
+	$(glib_CFLAGS)				\
+	$(jansson_CFLAGS)			\
+	$(libite_CFLAGS)			\
+	$(sysrepo_CFLAGS)			\
+	$(libsrx_CFLAGS)			\
+	$(CFLAGS)
+
+confd_plugin_la_LIBADD  =			\
+	$(augeas_LIBS)				\
+	$(glib_LIBS)				\
+	$(jansson_LIBS)				\
+	$(libite_LIBS)				\
+	$(sysrepo_LIBS)				\
+	$(libsrx_LIBS)
+
+confd_plugin_la_SOURCES =			\
+	core.c		core.h			\
+	dagger.c	dagger.h		\
+	ietf-interfaces.c			\
+	ietf-system.c				\
+	infix-dhcp.c				\
+	infix-services.c			\
+	infix-factory.c				\
+	infix-system-software.c
+
+rauc_installer_sources = \
+	rauc-installer.c rauc-installer.h
+
+BUILT_SOURCES = $(rauc_installer_sources)
+EXTRA_DIST    = de.pengutronix.rauc.Installer.xml
+
+$(rauc_installer_sources): de.pengutronix.rauc.Installer.xml
+	$(AM_V_GEN) gdbus-codegen			\
+		--generate-c-code rauc-installer	\
+		--c-generate-autocleanup all		\
+		--c-namespace Rauc			\
+		--interface-prefix de.pengutronix.rauc.	\
+		$<
+
+nodist_confd_plugin_la_SOURCES = \
+	$(rauc_installer_sources)

src/confd/src/confd/core.c → src/confd/src/core.c

@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
+#include <srx/srx_module.h>
+#include <srx/common.h>
+
 #include "core.h"
-#include "../lib/srx_module.h"
-#include "../lib/common.h"
 
 static struct confd confd;
 
@@ -116,6 +117,9 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 	if (rc)
 		goto err;
 	rc = infix_system_sw_init(&confd);
+	if (rc)
+		goto err;
+	rc = infix_services_init(&confd);
 	if (rc)
 		goto err;