Implemented charset conversion in each log path.

Fixed bugs in configuration reader.

1 files changed, 3 insertions, 2 deletions

diff --git a/daemon/syslogd.h b/daemon/syslogd.h
index a70b326..d2bb056 100644
--- a/daemon/syslogd.h
+++ b/daemon/syslogd.h
@@ -66,8 +66,6 @@ extern void log_internal( int pri, char* fmt, ... );
 
 /* options and their default values */
 extern gboolean use_dns;
-extern gchar *source_encoding;
-extern gchar *destination_encoding;
 extern int mark_interval;
 extern gchar *mark_message;
 extern int hold;
@@ -126,6 +124,7 @@ struct source
 {
     gchar *name;
     enum source_type type;
+    gchar *encoding;
     struct sockaddr_in udp;
 };
 
@@ -174,6 +173,7 @@ struct destination
 {
     gchar *name;
     enum destination_type type;
+    gchar *encoding;
     union
     {
       struct destination_file file;
@@ -197,6 +197,7 @@ struct logpath
     struct source *source;
     struct filter *filter;
     struct destination *destination;
+    GIConv message_cd;
 };
 
 extern GList *sources;