Merge branch 'master' of github.com:gtkevemon/gtkevemon

Author: simonfuhrmann

src/api/evetime.cc

@@ -72,27 +72,39 @@ EveTime::get_local_time_string (void)
 /* ---------------------------------------------------------------- */
 
 std::string
-EveTime::get_local_time_string (time_t time, bool slim)
+EveTime::get_time_string (struct tm *tm, bool slim)
 {
+  // If we wind up with an invalid time, we don't want to crash,
+  // so we return a string indicating something has gone wrong.
+  if (!tm)
+  {
+    return "INVALID TIME";
+  }
+
   static ConfValuePtr lf = Config::conf.get_value("evetime.time_format");
   static ConfValuePtr sf = Config::conf.get_value("evetime.time_short_format");
 
   char buffer[128];
-  strftime(buffer, 128, (slim ? **sf : **lf).c_str(), ::localtime(&time));
+  strftime(buffer, 128, (slim ? **sf : **lf).c_str(), tm);
   return std::string(buffer);
 }
 
 /* ---------------------------------------------------------------- */
 
 std::string
-EveTime::get_gm_time_string (time_t time, bool slim)
+EveTime::get_local_time_string (time_t time, bool slim)
 {
-  static ConfValuePtr lf = Config::conf.get_value("evetime.time_format");
-  static ConfValuePtr sf = Config::conf.get_value("evetime.time_short_format");
+  struct tm tm;
+  return EveTime::get_time_string(::localtime_r(&time, &tm), slim);
+}
 
-  char buffer[128];
-  strftime(buffer, 128, (slim ? **sf : **lf).c_str(), ::gmtime(&time));
-  return std::string(buffer);
+/* ---------------------------------------------------------------- */
+
+std::string
+EveTime::get_gm_time_string (time_t time, bool slim)
+{
+  struct tm tm;
+  return EveTime::get_time_string(::gmtime_r(&time, &tm), slim);
 }
 
 /* ---------------------------------------------------------------- */

src/api/evetime.h

@@ -30,6 +30,8 @@ class EveTime
     static time_t timediff;
     static bool initialized;
 
+    static std::string get_time_string (struct tm *tm, bool slim);
+
   public:
     /* Calculate the time difference from a string. */
     static void init_from_eveapi_string (std::string const& evetime);

src/net/networking.cc

@@ -1,6 +1,8 @@
 #include <iostream>
 #include <openssl/err.h>
 
+#include "util/thread.h"
+
 #include "certificates.h"
 #include "networking.h"
 
@@ -55,6 +57,22 @@ unload (void)
 
 /* ---------------------------------------------------------------- */
 
+static Semaphore *ssl_locks;
+
+static void locking_callback(int mode, int type, const char *file, int line)
+{
+  (void)file; (void)line;
+
+  if (mode & CRYPTO_LOCK)
+  {
+    ssl_locks[type].wait();
+  }
+  else
+  {
+    ssl_locks[type].post();
+  }
+}
+
 SSL_CTX*
 ssl_context (void)
 {
@@ -106,6 +124,11 @@ ssl_context (void)
     SSL_CTX_set_verify_depth(ctx, 2);
 
     ssl_ctx = ctx;
+
+    /* Set up locks so that openssl is thread safe. */
+    ssl_locks = new Semaphore[CRYPTO_num_locks()];
+    CRYPTO_set_locking_callback(locking_callback);
+
     return ssl_ctx;
 }