Fix divert_cap in FreeBSD.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_message.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp
index 18767320340720152a9f8ddff6bba56dfc474b9b..161190f548acdd39e0894258fc6ca858d0d89071 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_message.cpp
@@ -22,15 +22,17 @@
 #include "parser_message.h"
 
 #include "stg/users.h"
 #include "parser_message.h"
 
 #include "stg/users.h"

-#include "stg/common.h"
+#include "stg/user.h"

 
 

-extern volatile time_t stgTime; // So sad...
+#include <cstring>

 
 using STG::PARSER::SEND_MESSAGE;
 
 
 using STG::PARSER::SEND_MESSAGE;
 

+const char * SEND_MESSAGE::tag = "Message";
+

 int SEND_MESSAGE::Start(void *, const char *el, const char **attr)
 {
 int SEND_MESSAGE::Start(void *, const char *el, const char **attr)
 {

-    if (strcasecmp(el, tag.c_str()) != 0)
+    if (strcasecmp(el, m_tag.c_str()) != 0)

         return -1;
 
     for (size_t i = 0; i < 14; i++)
         return -1;
 
     for (size_t i = 0; i < 14; i++)


@@ -85,7 +87,7 @@ int SEND_MESSAGE::Start(void *, const char *el, const char **attr)
 
 int SEND_MESSAGE::End(void *, const char *el)
 {
 
 int SEND_MESSAGE::End(void *, const char *el)
 {

-    if (strcasecmp(el, tag.c_str()) != 0)
+    if (strcasecmp(el, m_tag.c_str()) != 0)

         return -1;
 
     m_result = res_unknown;
         return -1;
 
     m_result = res_unknown;


@@ -96,7 +98,7 @@ int SEND_MESSAGE::End(void *, const char *el)
             printfd(__FILE__, "User not found. %s\n", m_logins[i].c_str());
             continue;
         }
             printfd(__FILE__, "User not found. %s\n", m_logins[i].c_str());
             continue;
         }

-        m_msg.header.creationTime = static_cast<unsigned int>(stgTime);
+        m_msg.header.creationTime = static_cast<unsigned int>(time(NULL));

         m_user->AddMessage(&m_msg);
         m_result = res_ok;
     }
         m_user->AddMessage(&m_msg);
         m_result = res_ok;
     }


@@ -126,13 +128,13 @@ void SEND_MESSAGE::CreateAnswer()
     switch (m_result)
     {
         case res_ok:
     switch (m_result)
     {
         case res_ok:

-            answer = "<SendMessageResult value=\"ok\"/>";
+            m_answer = "<SendMessageResult value=\"ok\"/>";

             break;
         case res_params_error:
             break;
         case res_params_error:

-            answer = "<SendMessageResult value=\"Parameters error.\"/>";
+            m_answer = "<SendMessageResult value=\"Parameters error.\"/>";

             break;
         case res_unknown:
             break;
         case res_unknown:

-            answer = "<SendMessageResult value=\"Unknown user.\"/>";
+            m_answer = "<SendMessageResult value=\"Unknown user.\"/>";

             break;
     }
 }
             break;
     }
 }