From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] allow remote syslog via TCP in syslogdctrl.c
Date: Sun, 12 Nov 2017 08:13:28 +0100
Message-ID: <20171112081328.6a4b3621.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5902765928118232917=="
List-Id: <development.lists.ipfire.org>

--===============5902765928118232917==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Make syslogctrl.c use TCP as remote logging file if specified so.

NOTE: This patch likely contains errors, since I do not know anything
about C at all. Please have a close look at it. Sorry.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 src/misc-progs/syslogdctrl.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 52719023e..b356ebe49 100644
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -32,13 +32,14 @@
=20
 int main(void)
 {
-   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE];
+   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], pr=
otocol[STRING_SIZE];
    char varmessages[STRING_SIZE], asynclog[STRING_SIZE];
    int config_fd,rc,fd,pid;
    struct stat st;
    struct keyvalue *kv =3D NULL;
    memset(buffer, 0, STRING_SIZE);
    memset(hostname, 0, STRING_SIZE);
+   memset(protocol, 0, STRING_SIZE);
    memset(varmessages, 0, STRING_SIZE);
    memset(asynclog, 0, STRING_SIZE);
=20
@@ -73,6 +74,12 @@ int main(void)
       exit(ERR_SETTINGS);
    }
=20
+   if (!findkey(kv, "REMOTELOG_PROTOCOL", protocol))
+   {
+      fprintf(stderr, "Cannot read REMOTELOG_PROTOCOL\n");
+      exit(ERR_SETTINGS);
+   }
+
    freekeyvalues(kv);
=20
=20
@@ -105,9 +112,22 @@ int main(void)
       exit(ERR_CONFIG);
    }
=20
+   /* differ between UDP and TCP as rsyslog protocol */
    if (!strcmp(buffer,"on"))
-      snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:=
blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+      if ( protocol =3D=3D "udp" )
+      {
+         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*=
[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+      }
+      elif ( protocol =3D=3D "tcp" )
+      {
+         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*=
[[:blank:]]\\+@@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd =
);
+      }
+      else
+      {
+         fprintf(stderr, "Received invalid protocol for remote log\n");
+      }
    else
+      /* turn off remote syslog if specified */
       snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:=
blank:]]\\+(a).\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
=20
      /* if the return code isn't 0 failsafe */
--=20
2.13.6

--===============5902765928118232917==--