From 136e8178d2d96b4672d359f61cff610af7068360 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 21 May 2024 10:02:45 +0200
Subject: [PATCH] Services: DHCRelay - add logging into its own space

---
 plist                                                    | 1 +
 src/etc/inc/plugins.inc.d/dhcrelay.inc                   | 9 ++++++++-
 .../mvc/app/models/OPNsense/DHCRelay/Menu/Menu.xml       | 5 ++++-
 .../templates/OPNsense/Syslog/local/dhcrelay.conf        | 6 ++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/opnsense/service/templates/OPNsense/Syslog/local/dhcrelay.conf

diff --git a/plist b/plist
index 9be0169d4..b04f17fdf 100644
--- a/plist
+++ b/plist
@@ -1299,6 +1299,7 @@
 /usr/local/opnsense/service/templates/OPNsense/Syslog/local/audit.conf
 /usr/local/opnsense/service/templates/OPNsense/Syslog/local/configd.conf
 /usr/local/opnsense/service/templates/OPNsense/Syslog/local/dhcpd.conf
+/usr/local/opnsense/service/templates/OPNsense/Syslog/local/dhcrelay.conf
 /usr/local/opnsense/service/templates/OPNsense/Syslog/local/dnsmasq.conf
 /usr/local/opnsense/service/templates/OPNsense/Syslog/local/filter.conf
 /usr/local/opnsense/service/templates/OPNsense/Syslog/local/firewall.conf
diff --git a/src/etc/inc/plugins.inc.d/dhcrelay.inc b/src/etc/inc/plugins.inc.d/dhcrelay.inc
index 84cf311b6..1c913b49a 100644
--- a/src/etc/inc/plugins.inc.d/dhcrelay.inc
+++ b/src/etc/inc/plugins.inc.d/dhcrelay.inc
@@ -42,6 +42,13 @@ function dhcrelay_run()
     ];
 }
 
+function  dhcrelay_syslog()
+{
+    return [
+        'dhcrelay' => ['facility' => ['dhcrelay']]
+    ];
+}
+
 function dhcrelay_services()
 {
     $mdl = new \OPNsense\DHCRelay\DHCRelay();
@@ -132,7 +139,7 @@ function dhcrelay_configure_do($verbose = false, $id = null)
             continue;
         }
 
-        $cmd = [exec_safe('daemon -f -p %s', "/var/run/dhcrelay-{$relay->getAttribute('uuid')}.pid")];
+        $cmd = [exec_safe('daemon -S -T dhcrelay -f -p %s', "/var/run/dhcrelay-{$relay->getAttribute('uuid')}.pid")];
         $cmd[] = sprintf('/usr/local/sbin/dhcrelay%s -d', $family == 'inet6' ? '6' : '');
         if (!empty((string)$relay->agent_info)) {
             $cmd[] = sprintf('-o%s', $family == 'inet' ? 'r' : '');
diff --git a/src/opnsense/mvc/app/models/OPNsense/DHCRelay/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/DHCRelay/Menu/Menu.xml
index 5243271d3..11174f722 100644
--- a/src/opnsense/mvc/app/models/OPNsense/DHCRelay/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/DHCRelay/Menu/Menu.xml
@@ -1,5 +1,8 @@
 <menu>
     <Services>
-        <DHCRelay cssClass="fa fa-bullseye fa-fw" url="/ui/dhcrelay/relay"/>
+        <DHCRelay cssClass="fa fa-bullseye fa-fw">
+            <Administration url="/ui/dhcrelay/relay"/>
+            <Log order="40" VisibleName="Log File" url="/ui/diagnostics/log/core/dhcrelay"/>
+        </DHCRelay>
     </Services>
 </menu>
diff --git a/src/opnsense/service/templates/OPNsense/Syslog/local/dhcrelay.conf b/src/opnsense/service/templates/OPNsense/Syslog/local/dhcrelay.conf
new file mode 100644
index 000000000..a68d50aa1
--- /dev/null
+++ b/src/opnsense/service/templates/OPNsense/Syslog/local/dhcrelay.conf
@@ -0,0 +1,6 @@
+###################################################################
+# Local syslog-ng configuration filter definition [dhcrelay].
+###################################################################
+filter f_local_dhcrelay {
+    program("dhcrelay");
+};