Initial syslog support in XRDP

1 files changed, 19 insertions, 17 deletions

diff --git a/sesman/scp_v1.c b/sesman/scp_v1.c
index 5c303bb2..d1509224 100644
--- a/sesman/scp_v1.c
+++ b/sesman/scp_v1.c
@@ -56,7 +56,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
 
   while ((!data) && ((retries == 0) || (current_try > 0)))
   {
-    LOG_DBG(&(g_cfg->log), "data %d - retry %d - currenttry %d - expr %d", data, retries, current_try, ((!data) && ((retries==0) || (current_try>0))));
+    LOG_DBG("data %d - retry %d - currenttry %d - expr %d", data, retries, current_try, ((!data) && ((retries==0) || (current_try>0))));
 
     e=scp_v1s_request_password(c,s,"Wrong username and/or password");
 
@@ -83,7 +83,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
   if (!data)
   {
     scp_v1s_deny_connection(c, "Login failed");
-    log_message(&(g_cfg->log), LOG_LEVEL_INFO,
+    log_message( LOG_LEVEL_INFO,
       "Login failed for user %s. Connection terminated", s->username);
     scp_session_destroy(s);
     return;
@@ -93,7 +93,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
   if (0 == access_login_allowed(s->username))
   {
     scp_v1s_deny_connection(c, "Access to Terminal Server not allowed.");
-    log_message(&(g_cfg->log), LOG_LEVEL_INFO,
+    log_message(LOG_LEVEL_INFO,
       "User %s not allowed on TS. Connection terminated", s->username);
     scp_session_destroy(s);
     return;
@@ -107,24 +107,26 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
   if (scount == 0)
   {
     /* no disconnected sessions - start a new one */
+    log_message(LOG_LEVEL_DEBUG,"No disconnected sessions for this user"
+            "- we create a new one");  
     if (0 != s->client_ip)
     {
-      log_message(&(g_cfg->log), LOG_LEVEL_INFO, "++ created session (access granted): username %s, ip %s", s->username, s->client_ip);
+      log_message(LOG_LEVEL_INFO, "++ created session (access granted): username %s, ip %s", s->username, s->client_ip);
     }
     else
     {
-      log_message(&(g_cfg->log), LOG_LEVEL_INFO, "++ created session (access granted): username %s", s->username);
+      log_message(LOG_LEVEL_INFO, "++ created session (access granted): username %s", s->username);
     }
     if (SCP_SESSION_TYPE_XVNC == s->type)
     {
-      log_message(&(g_cfg->log), LOG_LEVEL_INFO, "starting Xvnc session...");
+      log_message(LOG_LEVEL_INFO, "starting Xvnc session...");
       display = session_start(s->width, s->height, s->bpp, s->username,
                               s->password, data, SESMAN_SESSION_TYPE_XVNC,
                               s->domain, s->program, s->directory, s->client_ip);
     }
     else
     {
-      log_message(&(g_cfg->log), LOG_LEVEL_INFO, "starting X11rdp session...");
+      log_message(LOG_LEVEL_INFO, "starting X11rdp session...");
       display = session_start(s->width, s->height, s->bpp, s->username,
                               s->password, data, SESMAN_SESSION_TYPE_XRDP,
                               s->domain, s->program, s->directory, s->client_ip);
@@ -152,7 +154,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
       /*case SCP_SERVER_STATE_FORCE_NEW:*/
       /* we should check for MaxSessions */
       case SCP_SERVER_STATE_SELECTION_CANCEL:
-        log_message(&(g_cfg->log), LOG_LEVEL_INFO, "Connection cancelled after session listing");
+        log_message( LOG_LEVEL_INFO, "Connection cancelled after session listing");
         break;
       case SCP_SERVER_STATE_OK:
         /* ok, reconnecting... */
@@ -160,7 +162,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
         if (0==sitem)
         {
           e=scp_v1s_connection_error(c, "Internal error");
-          log_message(&(g_cfg->log), LOG_LEVEL_INFO, "Cannot find session item on the chain");
+          log_message(LOG_LEVEL_INFO, "Cannot find session item on the chain");
         }
         else
         {
@@ -169,11 +171,11 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
           e=scp_v1s_reconnect_session(c, display);
           if (0 != s->client_ip)
           {
-            log_message(&(g_cfg->log), LOG_LEVEL_INFO, "++ reconnected session: username %s, display :%d.0, session_pid %d, ip %s", s->username, display, sitem->pid, s->client_ip);
+            log_message(LOG_LEVEL_INFO, "++ reconnected session: username %s, display :%d.0, session_pid %d, ip %s", s->username, display, sitem->pid, s->client_ip);
           }
           else
           {
-            log_message(&(g_cfg->log), LOG_LEVEL_INFO, "++ reconnected session: username %s, display :%d.0, session_pid %d", s->username, display, sitem->pid);
+            log_message(LOG_LEVEL_INFO, "++ reconnected session: username %s, display :%d.0, session_pid %d", s->username, display, sitem->pid);
           }
           g_free(sitem);
         }
@@ -202,27 +204,27 @@ static void parseCommonStates(enum SCP_SERVER_STATES_E e, char* f)
   switch (e)
   {
     case SCP_SERVER_STATE_VERSION_ERR:
-      LOG_DBG(&(g_cfg->log), "version error")
+      LOG_DBG("version error")
     case SCP_SERVER_STATE_SIZE_ERR:
       /* an unknown scp version was requested, so we shut down the */
       /* connection (and log the fact)                             */
-      log_message(&(g_cfg->log), LOG_LEVEL_WARNING,
+      log_message(LOG_LEVEL_WARNING,
         "protocol violation. connection closed.");
       break;
     case SCP_SERVER_STATE_NETWORK_ERR:
-      log_message(&(g_cfg->log), LOG_LEVEL_WARNING, "libscp network error.");
+      log_message(LOG_LEVEL_WARNING, "libscp network error.");
       break;
     case SCP_SERVER_STATE_SEQUENCE_ERR:
-      log_message(&(g_cfg->log), LOG_LEVEL_WARNING, "libscp sequence error.");
+      log_message(LOG_LEVEL_WARNING, "libscp sequence error.");
       break;
     case SCP_SERVER_STATE_INTERNAL_ERR:
       /* internal error occurred (eg. malloc() error, ecc.) */
-      log_message(&(g_cfg->log), LOG_LEVEL_ERROR, "libscp internal error occurred.");
+      log_message(LOG_LEVEL_ERROR, "libscp internal error occurred.");
       break;
     default:
       /* dummy: scp_v1s_request_password won't generate any other */
       /* error other than the ones before                         */
-      log_message(&(g_cfg->log), LOG_LEVEL_ALWAYS, "unknown return from %s", f);
+      log_message(LOG_LEVEL_ALWAYS, "unknown return from %s", f);
       break;
   }
 }