-From b25ace7f70786bce4b75909047c574053e02e17b Mon Sep 17 00:00:00 2001
+From d516f2e75367c5be55452238e871162c1c3dd757 Mon Sep 17 00:00:00 2001
 From: Tobias Hintze <thintze+git@tpip.net>
-Date: Thu, 7 Jan 2016 15:09:44 +0100
+Date: Thu, 27 Oct 2016 19:24:50 +0200
 Subject: [PATCH] native rfc5424 syslog forwarding per udp
 
 ---
  src/journal/journald-gperf.gperf |   2 +
  src/journal/journald-native.c    |   2 +-
- src/journal/journald-server.c    |  64 ++++++++++++-
+ src/journal/journald-server.c    |  61 ++++++++++++
  src/journal/journald-server.h    |  12 +++
  src/journal/journald-stream.c    |   2 +-
  src/journal/journald-syslog.c    | 200 +++++++++++++++++++++++++++++++++------
  src/journal/journald-syslog.h    |  23 +++++
- 7 files changed, 271 insertions(+), 34 deletions(-)
+ 7 files changed, 269 insertions(+), 33 deletions(-)
 
 diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
-index 74554c1..3451d1a 100644
+index c154610..1bfc35e 100644
 --- a/src/journal/journald-gperf.gperf
 +++ b/src/journal/journald-gperf.gperf
-@@ -30,6 +30,8 @@ Journal.RuntimeKeepFree,    config_parse_iec_off,    0, offsetof(Server, runtime
+@@ -32,6 +32,8 @@ Journal.RuntimeMaxFiles,    config_parse_uint64,     0, offsetof(Server, runtime
  Journal.MaxRetentionSec,    config_parse_sec,        0, offsetof(Server, max_retention_usec)
  Journal.MaxFileSec,         config_parse_sec,        0, offsetof(Server, max_file_usec)
  Journal.ForwardToSyslog,    config_parse_bool,       0, offsetof(Server, forward_to_syslog)

 typedef enum Storage {
         STORAGE_AUTO,
         STORAGE_VOLATILE,
@@ -52,6 +54,7 @@ typedef struct StdoutStream StdoutStream;
 
 typedef struct Server {
         int syslog_fd;
+        int remote_syslog_fd;
         int native_fd;
         int stdout_fd;
         int dev_kmsg_fd;
@@ -94,9 +97,11 @@ typedef struct Server {
 
         bool forward_to_kmsg;
         bool forward_to_syslog;

 
 int server_open_syslog_socket(Server *s) {
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
index 46ad715..cadffb6 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -21,6 +21,29 @@
 
 #include "journald-server.h"
 
