Initial syslog support in XRDP

1 files changed, 113 insertions, 28 deletions

diff --git a/common/log.h b/common/log.h
index acb10fea..ac3b97c9 100644
--- a/common/log.h
+++ b/common/log.h
@@ -28,29 +28,41 @@
 #define LOG_BUFFER_SIZE      1024
 
 /* logging levels */
-#define LOG_LEVEL_ALWAYS        0
-#define LOG_LEVEL_ERROR         1
-#define LOG_LEVEL_WARNING       2
-#define LOG_LEVEL_INFO          3
-#define LOG_LEVEL_DEBUG         4
+enum logLevels{
+  LOG_LEVEL_ALWAYS = 0,
+  LOG_LEVEL_ERROR,
+  LOG_LEVEL_WARNING,
+  LOG_LEVEL_INFO,
+  LOG_LEVEL_DEBUG
+};
 
 /* startup return values */
-#define LOG_STARTUP_OK          0
-#define LOG_ERROR_MALLOC        1
-#define LOG_ERROR_NULL_FILE     2
-#define LOG_ERROR_FILE_OPEN     3
-#define LOG_ERROR_NO_CFG        4
-#define LOG_ERROR_FILE_NOT_OPEN 5
+enum logReturns{
+  LOG_STARTUP_OK = 0,
+  LOG_ERROR_MALLOC,
+  LOG_ERROR_NULL_FILE,
+  LOG_ERROR_FILE_OPEN,
+  LOG_ERROR_NO_CFG,
+  LOG_ERROR_FILE_NOT_OPEN,
+  LOG_GENERAL_ERROR
+};
+
+#define SESMAN_CFG_LOGGING           "Logging"
+#define SESMAN_CFG_LOG_FILE          "LogFile"
+#define SESMAN_CFG_LOG_LEVEL         "LogLevel"
+#define SESMAN_CFG_LOG_ENABLE_SYSLOG "EnableSyslog"
+#define SESMAN_CFG_LOG_SYSLOG_LEVEL  "SyslogLevel"
 
 /* enable threading */
 /*#define LOG_ENABLE_THREAD*/
 
 #ifdef DEBUG
-  #define LOG_DBG(lcfg,args...) log_message((lcfg), LOG_LEVEL_DEBUG, args);
+  #define LOG_DBG(args...) log_message(LOG_LEVEL_DEBUG, args);
 #else
-  #define LOG_DBG(lcfg,args...)
+  #define LOG_DBG(args...)
 #endif
 
+
 struct log_config
 {
   char* program_name;
@@ -63,16 +75,8 @@ struct log_config
   pthread_mutexattr_t log_lock_attr;
 };
 
-/**
- *
- * @brief Logs a message. Optionally logs the same message on syslog
- * @param lvl The level of the logged message
- * @param msg The message to be logged
- * @return
- *
- */
-int DEFAULT_CC
-log_message(struct log_config* l_cfg, const unsigned int lvl, const char* msg, ...);
+/* internal functions, only used in log.c if this ifdef is defined.*/
+#ifdef LOGINTERNALSTUFF
 
 /**
  *
@@ -81,8 +85,8 @@ log_message(struct log_config* l_cfg, const unsigned int lvl, const char* msg, .
  * @return
  *
  */
-int DEFAULT_CC
-log_start(struct log_config* l_cfg);
+enum logReturns DEFAULT_CC
+internal_log_start(struct log_config* l_cfg);
 
 /**
  *
@@ -90,8 +94,16 @@ log_start(struct log_config* l_cfg);
  * @param l_cfg pointer to the logging subsystem to stop
  *
  */
+enum logReturns DEFAULT_CC
+internal_log_end(struct log_config* l_cfg);
+
+/**
+ * Converts a log level to a string
+ * @param lvl, the loglevel 
+ * @param str pointer where the string will be stored.
+ */
 void DEFAULT_CC
-log_end(struct log_config* l_cfg);
+internal_log_lvl2str(const enum logLevels lvl, char* str);
 
 /**
  *
@@ -100,8 +112,81 @@ log_end(struct log_config* l_cfg);
  * @return The corresponding level or LOG_LEVEL_DEBUG if error
  *
  */
-int DEFAULT_CC
-log_text2level(char* s);
+enum logLevels DEFAULT_CC
+internal_log_text2level(char* s);
+
+/**
+ * A function that init our struct that holds all state and 
+ * also init its content.
+ * @return  LOG_STARTUP_OK or LOG_ERROR_MALLOC
+ */
+enum logReturns DEFAULT_CC
+internalInitAndAllocStruct();
+
+/**
+ * Read configuration from a file and store the values in lists.
+ * @param file
+ * @param lc
+ * @param param_n
+ * @param param_v
+ * @param applicationName, the application name used in the log events.
+ * @return 
+ */
+enum logReturns DEFAULT_CC
+internal_config_read_logging(int file, struct log_config* lc, struct list* param_n,
+                    struct list* param_v,const char *applicationName) ;
+/*End of internal functions*/
+#endif
+/**
+ * This function initialize the log facilities according to the configuration 
+ * file, that is described by the in parameter.
+ * @param iniFile
+ * @param applicationName, the name that is used in the log for the running application
+ * @return LOG_STARTUP_OK on success
+ */
+enum logReturns DEFAULT_CC 
+log_start(const char *iniFile, const char *applicationName) ;
+
+/**
+ * An alternative log_start where the caller gives the params directly.
+ * @param iniParams
+ * @return 
+ */
+enum logReturns DEFAULT_CC
+log_start_from_param(const struct log_config *iniParams);
+/**
+ * Function that terminates all logging
+ * @return 
+ */
+enum logReturns DEFAULT_CC 
+log_end() ;
+
+/**
+ * the log function that all files use to log an event.
+ * @param lvl, the loglevel
+ * @param msg, the logtext.
+ * @param ...
+ * @return 
+ */
+enum logReturns DEFAULT_CC 
+log_message(const enum logLevels lvl, const char* msg, ...) ;
+
+/**
+ *
+ * @brief Reads configuration
+ * @param s translates the strings "1", "true" and "yes" in 1 (true) and 
+ * other strings in 0
+ * @return 0 on success, 1 on failure
+ *
+ */
+int APP_CC text2bool(char* s);
 
+/**
+ * This function returns the configured file name for the logfile
+ * @param replybuf the buffer where the reply is stored
+ * @param bufsize how big is the reply buffer.
+ * @return 
+ */
+char *getLogFile(char *replybuf, int bufsize);
 #endif