Update the Microsoft Visual Studio build to match the MinGW32 build.

[bacula/bacula] / bacula / src / wx-console / console_thread.cpp

diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp
index 0085d6b40e5897f5b50815e7a43fa63da08f329a..b580b9ee0969d09455c4ac6711553e9d2c502b77 100644 (file)
--- a/bacula/src/wx-console/console_thread.cpp
+++ b/bacula/src/wx-console/console_thread.cpp
@@ -7,11 +7,11 @@
  *    Version $Id$
  */
 /*
  *    Version $Id$
  */
 /*

-   Copyright (C) 2004-2005 Kern Sibbald
+   Copyright (C) 2004-2006 Kern Sibbald

 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

-   version 2 as ammended with additional clauses defined in the
+   version 2 as amended with additional clauses defined in the

    file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,


@@ -23,21 +23,24 @@
 
 // http://66.102.9.104/search?q=cache:Djc1mPF3hRoJ:cvs.sourceforge.net/viewcvs.py/audacity/audacity-src/src/AudioIO.cpp%3Frev%3D1.102+macos+x+wxthread&hl=fr
 
 
 // http://66.102.9.104/search?q=cache:Djc1mPF3hRoJ:cvs.sourceforge.net/viewcvs.py/audacity/audacity-src/src/AudioIO.cpp%3Frev%3D1.102+macos+x+wxthread&hl=fr
 

+/* _("...") macro returns a wxChar*, so if we need a char*, we need to convert it with:
+ * wxString(_("...")).mb_str(*wxConvCurrent) */
+
+#undef _DEBUG
+
+#include "bacula.h"
+#include "console_conf.h"
+

 #include "console_thread.h" // class's header file
 
 #include <wx/wxprec.h>
 
 #include <wx/thread.h>
 #include <wx/file.h>
 #include "console_thread.h" // class's header file
 
 #include <wx/wxprec.h>
 
 #include <wx/thread.h>
 #include <wx/file.h>

-#include <bacula.h>
-#include <jcr.h>
-
-#include "console_conf.h"

 
 #include "csprint.h"
 
 #ifdef HAVE_WIN32
 
 #include "csprint.h"
 
 #ifdef HAVE_WIN32

-#include <windows.h>

 char OK_msg[]   = "2000 OK\n";
 char TERM_msg[] = "2999 Terminate\n";
 #endif
 char OK_msg[]   = "2000 OK\n";
 char TERM_msg[] = "2999 Terminate\n";
 #endif


@@ -49,6 +52,90 @@ bool console_thread::inited = false;
 bool console_thread::configloaded = false;
 wxString console_thread::working_dir = wxT(".");
 
 bool console_thread::configloaded = false;
 wxString console_thread::working_dir = wxT(".");
 

+int numdir = 0;
+
+/*
+ * Call-back for reading a passphrase for an encrypted PEM file
+ * This function uses getpass(), which uses a static buffer and is NOT thread-safe.
+ */
+static int tls_pem_callback(char *buf, int size, const void *userdata)
+{
+#if defined(HAVE_TLS) && !defined(HAVE_WIN32)
+   const char *prompt = (const char *) userdata;
+   char *passwd;
+
+   passwd = getpass(prompt);
+   bstrncpy(buf, passwd, size);
+   return (strlen(buf));
+#else
+   buf[0] = 0;
+   return 0;
+#endif
+}
+
+
+/*
+ * Make a quick check to see that we have all the
+ * resources needed.
+ */
+static int check_resources()
+{
+   int xOK = true;
+   DIRRES *director;
+
+   LockRes();
+
+   numdir = 0;
+   foreach_res(director, R_DIRECTOR) {
+      numdir++;
+      /* tls_require implies tls_enable */
+      if (director->tls_require) {
+         if (have_tls) {
+            director->tls_enable = true;
+         } else {
+            Jmsg(NULL, M_FATAL, 0, wxString(_("TLS required but not configured in Bacula.\n")).mb_str(*wxConvCurrent));
+            xOK = false;
+            continue;
+         }
+      }
+
+      if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && director->tls_enable) {
+         Jmsg(NULL, M_FATAL, 0, wxString(_("Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in config file.\nAt least one CA certificate store is required.\n")).mb_str(*wxConvCurrent),
+                             director->hdr.name);
+         xOK = false;
+      }
+   }
+   
+   if (numdir == 0) {
+      Jmsg(NULL, M_FATAL, 0, wxString(_("No Director resource defined in config file.\nWithout that I don't how to speak to the Director :-(\n")).mb_str(*wxConvCurrent));
+      xOK = false;
+   }
+
+   CONRES *cons;
+   /* Loop over Consoles */
+   foreach_res(cons, R_CONSOLE) {
+      /* tls_require implies tls_enable */
+      if (cons->tls_require) {
+         if (have_tls) {
+            cons->tls_enable = true;
+         } else {
+            Jmsg(NULL, M_FATAL, 0, wxString(_("TLS required but not configured in Bacula.\n")).mb_str(*wxConvCurrent));
+            xOK = false;
+            continue;
+         }
+      }
+
+      if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && cons->tls_enable) {
+         Jmsg(NULL, M_FATAL, 0, wxString(_("Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in config file.\n")).mb_str(*wxConvCurrent),
+                             cons->hdr.name);
+         xOK = false;
+      }
+   }
+   UnlockRes();
+   return xOK;
+}
+
+

 void console_thread::SetWorkingDirectory(wxString w_dir) {
    if ((w_dir.Last() == '/') || (w_dir.Last() == '\\')) {
       console_thread::working_dir = w_dir.Mid(0, w_dir.Length()-1);
 void console_thread::SetWorkingDirectory(wxString w_dir) {
    if ((w_dir.Last() == '/') || (w_dir.Last() == '\\')) {
       console_thread::working_dir = w_dir.Mid(0, w_dir.Length()-1);


@@ -58,25 +145,26 @@ void console_thread::SetWorkingDirectory(wxString w_dir) {
    }
 }
 
    }
 }
 

-void console_thread::InitLib() {
+void console_thread::InitLib() 
+{

    if (WSA_Init() != 0) {
    if (WSA_Init() != 0) {

-      csprint("Error while initializing windows sockets...\n");
+      csprint(_("Error while initializing windows sockets...\n"));

       inited = false;
       return;
    }
    
    init_stack_dump();
    my_name_is(0, NULL, "wx-console");
       inited = false;
       return;
    }
    
    init_stack_dump();
    my_name_is(0, NULL, "wx-console");

-   //textdomain("bacula-console");

    working_directory = (const char*) console_thread::working_dir.GetData();
    
    inited = true;
 }
 
    working_directory = (const char*) console_thread::working_dir.GetData();
    
    inited = true;
 }
 

-void console_thread::FreeLib() {
+void console_thread::FreeLib() 
+{

    if (inited) {
       if (WSACleanup() != 0) {
    if (inited) {
       if (WSACleanup() != 0) {

-         csprint("Error while cleaning up windows sockets...\n");
+         csprint(_("Error while cleaning up windows sockets...\n"));

       }
    }
 }
       }
    }
 }


@@ -99,30 +187,31 @@ static void scan_err(const char *file, int line, LEX *lc, const char *msg, ...)
 
    if (lc->line_no > lc->begin_line_no) {
       bsnprintf(more, sizeof(more),
 
    if (lc->line_no > lc->begin_line_no) {
       bsnprintf(more, sizeof(more),

-                _("Problem probably begins at line %d.\n"), lc->begin_line_no);
+                wxString(_("Problem probably begins at line %d.\n")).mb_str(*wxConvCurrent), lc->begin_line_no);

    } else {
       more[0] = 0;
    }
 
    } else {
       more[0] = 0;
    }
 

-   err.Format(wxT("Config error: %s\n            : line %d, col %d of file %s\n%s\n%s"),
+   err.Format(_("Config error: %s\n            : line %d, col %d of file %s\n%s\n%s"),

       buf, lc->line_no, lc->col_no, lc->fname, lc->line, more);
      
    errmsg << err; 
 }
 
       buf, lc->line_no, lc->col_no, lc->fname, lc->line, more);
      
    errmsg << err; 
 }
 

-wxString console_thread::LoadConfig(wxString configfile) {
+wxString console_thread::LoadConfig(wxString configfile) 
+{

    if (!inited) {
       InitLib();
       if (!inited)
    if (!inited) {
       InitLib();
       if (!inited)

-         return wxT("Error while initializing library.");
+         return _("Error while initializing library.");

    }
    
    free_config_resources();
    
    }
    
    free_config_resources();
    

-   MSGS* msgs = (MSGS *)malloc(sizeof(MSGS));
+   MSGS* msgs = (MSGS *)bmalloc(sizeof(MSGS));

    memset(msgs, 0, sizeof(MSGS));
    for (int i=1; i<=M_MAX; i++) {
    memset(msgs, 0, sizeof(MSGS));
    for (int i=1; i<=M_MAX; i++) {

-#ifndef WIN32
+#ifndef HAVE_WIN32

       add_msg_dest(msgs, MD_STDOUT, i, NULL, NULL);
 #endif
 //    add_msg_dest(msgs, MD_SYSLOG, i, NULL, NULL);
       add_msg_dest(msgs, MD_STDOUT, i, NULL, NULL);
 #endif
 //    add_msg_dest(msgs, MD_SYSLOG, i, NULL, NULL);


@@ -130,7 +219,7 @@ wxString console_thread::LoadConfig(wxString configfile) {
    }
    
    init_msg(NULL, msgs);
    }
    
    init_msg(NULL, msgs);

-   init_console_msg(console_thread::working_dir.mb_str(*wxConvCurrent));
+   //init_console_msg(console_thread::working_dir.mb_str(*wxConvCurrent));

 
    errmsg = wxT("");
    if (!parse_config(configfile.mb_str(*wxConvCurrent), &scan_err)) {
 
    errmsg = wxT("");
    if (!parse_config(configfile.mb_str(*wxConvCurrent), &scan_err)) {


@@ -139,6 +228,14 @@ wxString console_thread::LoadConfig(wxString configfile) {
       return errmsg;
    }
    
       return errmsg;
    }
    

+   if (init_crypto() != 0) {
+      Jmsg(NULL, M_ERROR_TERM, 0, wxString(_("Cryptographic library initialization failed.\n")).mb_str(*wxConvCurrent));
+   }
+
+   if (!check_resources()) {
+      Jmsg(NULL, M_ERROR_TERM, 0, wxString(_("Please correct configuration file.\n")).mb_str(*wxConvCurrent));
+   }
+

    term_msg();
    wxRemoveFile(console_thread::working_dir + wxT("/wx-console.conmsg"));
    init_msg(NULL, NULL);
    term_msg();
    wxRemoveFile(console_thread::working_dir + wxT("/wx-console.conmsg"));
    init_msg(NULL, NULL);


@@ -167,35 +264,44 @@ console_thread::~console_thread() {
  * Thread entry point
  */
 void* console_thread::Entry() {
  * Thread entry point
  */
 void* console_thread::Entry() {

+#ifndef HAVE_WIN32
+   /* It seems we must redefine the locale on each thread on wxGTK. 
+    * On Win32 it makes wx-console crash. */
+   wxLocale m_locale;
+   m_locale.Init();
+   m_locale.AddCatalog(wxT("bacula"));
+   wxLocale::AddCatalogLookupPathPrefix(wxT(LOCALEDIR));
+#endif
+
+   DIRRES* dir;

    if (!inited) {
    if (!inited) {

-      csprint("Error : Library not initialized\n");
+      csprint(_("Error : Library not initialized\n"));

       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);
       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);

-      #ifdef HAVE_WIN32
-         Exit();
-      #endif
+#ifdef HAVE_WIN32
+      Exit();
+#endif

       return NULL;
    }
    
    if (!configloaded) {
       return NULL;
    }
    
    if (!configloaded) {

-      csprint("Error : No configuration file loaded\n");
+      csprint(_("Error : No configuration file loaded\n"));

       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);
       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);

-      #ifdef HAVE_WIN32
-         Exit();
-      #endif
+#ifdef HAVE_WIN32
+      Exit();
+#endif

       return NULL;
    }
    
       return NULL;
    }
    

-   csprint("Connecting...\n");
+   csprint(_("Connecting...\n"));

   
    int count = 0;
    DIRRES* res[16]; /* Maximum 16 directors */
    
    LockRes();
   
    int count = 0;
    DIRRES* res[16]; /* Maximum 16 directors */
    
    LockRes();

-   DIRRES* dir;

    foreach_res(dir, R_DIRECTOR) {
       res[count] = dir;
       count++;
    foreach_res(dir, R_DIRECTOR) {
       res[count] = dir;
       count++;


@@ -206,21 +312,19 @@ void* console_thread::Entry() {
    UnlockRes();
    
    if (count == 0) {
    UnlockRes();
    
    if (count == 0) {

-      csprint("Error : No director defined in config file.\n");
+      csprint(_("Error : No director defined in config file.\n"));

       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);
       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);

-      #ifdef HAVE_WIN32
-         Exit();
-      #endif
+#ifdef HAVE_WIN32
+      Exit();
+#endif

       return NULL;
       return NULL;

-   }
-   else if (count == 1) {
+   } else if (count == 1) {

       directorchoosen = 1;
       directorchoosen = 1;

-   }
-   else {
+   } else {

       while (true) {
       while (true) {

-         csprint("Multiple directors found in your config file.\n");
+         csprint(_("Multiple directors found in your config file.\n"));

          for (int i = 0; i < count; i++) {
             if (i < 9) {
                csprint(wxString(wxT("    ")) << (i+1) << wxT(": ") << wxString(res[i]->hdr.name,*wxConvCurrent) << wxT("\n"));
          for (int i = 0; i < count; i++) {
             if (i < 9) {
                csprint(wxString(wxT("    ")) << (i+1) << wxT(": ") << wxString(res[i]->hdr.name,*wxConvCurrent) << wxT("\n"));


@@ -229,7 +333,7 @@ void* console_thread::Entry() {
                csprint(wxString(wxT("   ")) <<  (i+1) << wxT(": ") << wxString(res[i]->hdr.name,*wxConvCurrent) << wxT("\n"));
             }
          }
                csprint(wxString(wxT("   ")) <<  (i+1) << wxT(": ") << wxString(res[i]->hdr.name,*wxConvCurrent) << wxT("\n"));
             }
          }

-         csprint(wxString(wxT("Please choose a director (1-")) << count << wxT(") : "),CS_DATA);
+         csprint(wxString::Format(_("Please choose a director (1-%d): "), count), CS_DATA);

          csprint(NULL, CS_PROMPT);
          choosingdirector = true;
          directorchoosen = -1;
          csprint(NULL, CS_PROMPT);
          choosingdirector = true;
          directorchoosen = -1;


@@ -243,68 +347,132 @@ void* console_thread::Entry() {
          }
       }
    }
          }
       }
    }

+   dir = res[directorchoosen-1];

 
    memset(&jcr, 0, sizeof(jcr));
    
    jcr.dequeuing = 1; /* TODO: catch messages */
 
 
    memset(&jcr, 0, sizeof(jcr));
    
    jcr.dequeuing = 1; /* TODO: catch messages */
 

-   UA_sock = bnet_connect(&jcr, 3, 3, "Director daemon",
-      res[directorchoosen-1]->address, NULL, res[directorchoosen-1]->DIRport, 0);
+   LockRes();
+   /* If cons==NULL, default console will be used */
+   CONRES *cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL);
+   UnlockRes();
+
+   char buf[1024];
+   /* Initialize Console TLS context */
+   if (cons && (cons->tls_enable || cons->tls_require)) {
+      /* Generate passphrase prompt */
+      bsnprintf(buf, sizeof(buf), wxString(_("Passphrase for Console \"%s\" TLS private key: ")).mb_str(*wxConvCurrent), cons->hdr.name);
+
+      /* Initialize TLS context:
+       * Args: CA certfile, CA certdir, Certfile, Keyfile,
+       * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
+      cons->tls_ctx = new_tls_context(cons->tls_ca_certfile,
+         cons->tls_ca_certdir, cons->tls_certfile,
+         cons->tls_keyfile, tls_pem_callback, &buf, NULL, true);
+
+      if (!cons->tls_ctx) {
+         bsnprintf(buf, sizeof(buf), wxString(_("Failed to initialize TLS context for Console \"%s\".\n")).mb_str(*wxConvCurrent),
+            dir->hdr.name);
+         csprint(buf);
+         return NULL;
+      }
+
+   }
+
+   /* Initialize Director TLS context */
+   if (dir->tls_enable || dir->tls_require) {
+      /* Generate passphrase prompt */
+      bsnprintf(buf, sizeof(buf), wxString(_("Passphrase for Director \"%s\" TLS private key: ")).mb_str(*wxConvCurrent), dir->hdr.name);
+
+      /* Initialize TLS context:
+       * Args: CA certfile, CA certdir, Certfile, Keyfile,
+       * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
+      dir->tls_ctx = new_tls_context(dir->tls_ca_certfile,
+         dir->tls_ca_certdir, dir->tls_certfile,
+         dir->tls_keyfile, tls_pem_callback, &buf, NULL, true);
+
+      if (!dir->tls_ctx) {
+         bsnprintf(buf, sizeof(buf), wxString(_("Failed to initialize TLS context for Director \"%s\".\n")).mb_str(*wxConvCurrent),
+            dir->hdr.name);
+         csprint(buf);
+         return NULL;
+      }
+   }
+
+
+   UA_sock = bnet_connect(&jcr, 3, 3, wxString(_("Director daemon")).mb_str(*wxConvCurrent),
+      dir->address, NULL, dir->DIRport, 0);

       
    if (UA_sock == NULL) {
       
    if (UA_sock == NULL) {

-      csprint("Failed to connect to the director\n");
+      csprint(_("Failed to connect to the director\n"));

       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);
       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);

-      #ifdef HAVE_WIN32
-         Exit();
-      #endif
+#ifdef HAVE_WIN32
+      Exit();
+#endif

       return NULL;
    }
 
       return NULL;
    }
 

-   csprint("Connected\n");
+   csprint(_("Connected\n"));

 
    jcr.dir_bsock = UA_sock;
 
    jcr.dir_bsock = UA_sock;

-   LockRes();
-   /* If cons==NULL, default console will be used */
-   CONRES *cons = (CONRES *)GetNextRes(R_CONSOLE, (RES *)NULL);
-   UnlockRes();
-   if (!authenticate_director(&jcr, res[directorchoosen-1], cons)) {
+   if (!authenticate_director(&jcr, dir, cons)) {

       csprint("ERR=");
       csprint(UA_sock->msg);
       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);
       csprint("ERR=");
       csprint(UA_sock->msg);
       csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);
       csprint(NULL, CS_TERMINATED);

-      #ifdef HAVE_WIN32
-         Exit();
-      #endif
+#ifdef HAVE_WIN32
+      Exit();
+#endif

       return NULL;
    }
    
    csprint(NULL, CS_CONNECTED);
    
       return NULL;
    }
    
    csprint(NULL, CS_CONNECTED);
    

+   Write("autodisplay on\n");

    Write(".messages\n");
 
    int stat;
 
    Write(".messages\n");
 
    int stat;
 

+   int last_is_eod = 0; /* Last packet received is BNET_EOD */
+   int do_not_forward_eod = 0; /* Last packet received/sent is .messages, so don't forward EOD. (so wx-console don't show the prompt again) */
+

    /* main loop */
    while(!TestDestroy()) {   /* Tests if thread has been ended */
    /* main loop */
    while(!TestDestroy()) {   /* Tests if thread has been ended */

+      stat = bnet_wait_data(UA_sock, 10);
+      if (stat == 0) {
+         if (last_is_eod) {
+            Write(".messages\n");
+            do_not_forward_eod = 1;
+         }
+         continue;
+      }
+      
+      last_is_eod = 0;

       if ((stat = bnet_recv(UA_sock)) >= 0) {
       if ((stat = bnet_recv(UA_sock)) >= 0) {

+         if (do_not_forward_eod) { /* .messages got data: remove the prompt */
+            csprint(NULL, CS_REMOVEPROMPT);
+         }

          csprint(UA_sock->msg);
       }
       else if (stat == BNET_SIGNAL) {
          if (UA_sock->msglen == BNET_PROMPT) {
             csprint(NULL, CS_PROMPT);
          csprint(UA_sock->msg);
       }
       else if (stat == BNET_SIGNAL) {
          if (UA_sock->msglen == BNET_PROMPT) {
             csprint(NULL, CS_PROMPT);

-         }
-         else if (UA_sock->msglen == BNET_EOD) {
-            csprint(NULL, CS_END);
-         }
-         else if (UA_sock->msglen == BNET_HEARTBEAT) {
+         } else if (UA_sock->msglen == BNET_EOD) {
+            last_is_eod = 1;
+            if (!do_not_forward_eod)
+               csprint(NULL, CS_END);
+         } else if (UA_sock->msglen == BNET_HEARTBEAT) {

             bnet_sig(UA_sock, BNET_HB_RESPONSE);
             bnet_sig(UA_sock, BNET_HB_RESPONSE);

-            csprint("<< Heartbeat signal received, answered. >>\n", CS_DEBUG);
-         }
-         else {
-            csprint("<< Unexpected signal received : ", CS_DEBUG);
+            csprint(_("<< Heartbeat signal received, answered. >>\n"), CS_DEBUG);
+         } else if (UA_sock->msglen == BNET_START_SELECT ||
+                    UA_sock->msglen == BNET_END_SELECT) {
+           /* Ignore start/end selections for now */
+         } else {
+            csprint(_("<< Unexpected signal received : "), CS_DEBUG);

             csprint(bnet_sig_to_ascii(UA_sock), CS_DEBUG);
             csprint(">>\n", CS_DEBUG);
          }
             csprint(bnet_sig_to_ascii(UA_sock), CS_DEBUG);
             csprint(">>\n", CS_DEBUG);
          }


@@ -318,40 +486,41 @@ void* console_thread::Entry() {
          csprint(NULL, CS_END);
          break;            /* error or term */
       }
          csprint(NULL, CS_END);
          break;            /* error or term */
       }

+      
+      do_not_forward_eod = 0;

    }
    
    csprint(NULL, CS_DISCONNECTED);
 
    }
    
    csprint(NULL, CS_DISCONNECTED);
 

-   csprint("Connection terminated\n");
+   csprint(_("Connection terminated\n"));

    
    UA_sock = NULL;
 
    csprint(NULL, CS_TERMINATED);
 
    
    UA_sock = NULL;
 
    csprint(NULL, CS_TERMINATED);
 

-   #ifdef HAVE_WIN32
-      Exit();
-   #endif
+#ifdef HAVE_WIN32
+   Exit();
+#endif

    
    return NULL;
 }
 
    
    return NULL;
 }
 

-void console_thread::Write(const char* str) {
+void console_thread::Write(const char* str) 
+{

    if (UA_sock) {
    if (UA_sock) {

-       UA_sock->msglen = strlen(str);
-       pm_strcpy(&UA_sock->msg, str);
-       bnet_send(UA_sock);
-   }
-   else if (choosingdirector) {
-
+      UA_sock->msglen = (int32_t)strlen(str);
+      pm_strcpy(&UA_sock->msg, str);
+      bnet_send(UA_sock);
+   } else if (choosingdirector) {

 //      wxString number = str;
 //      number.RemoveLast(); /* Removes \n */
       long val;
       
 //      if (number.ToLong(&val)) {
 //      wxString number = str;
 //      number.RemoveLast(); /* Removes \n */
       long val;
       
 //      if (number.ToLong(&val)) {

-      if (val = atol(str)) {
+      val = atol(str);
+      if (val) {

          directorchoosen = (int)val;
          directorchoosen = (int)val;

-      }
-      else {
+      } else {

          directorchoosen = 0;
       }
    }
          directorchoosen = 0;
       }
    }