Blinker

@@ -8,7 +8,6 @@

 #include <iostream>

 #include <mutex>

 #include <sstream>

-#include <stdarg.h>

 #include <stdio.h>

 #include <string>

 #include <string.h>

@@ -42,16 +41,15 @@ namespace linphone {

 /// interlock for liblinphone, higher in mutex hierarchy than shared data mutex

 static std::mutex g_mtx;

-static char const *loglevel2str(OrtpLogLevel lev)

+static char const *loglevel2str(LinphoneLogLevel lev)

 {

   switch(lev) {

-  case ORTP_DEBUG: return "DEBUG";

-  case ORTP_MESSAGE: return "MESSAGE";

-  case ORTP_WARNING: return "WARNING";

-  case ORTP_ERROR: return "ERROR";

-  case ORTP_FATAL: return "FATAL";

-  case ORTP_TRACE: return "TRACE";

-  case ORTP_LOGLEV_END: return "LOGLEV_END";

+  case LinphoneLogLevelDebug: return "DEBUG";

+  case LinphoneLogLevelTrace: return "TRACE";

+  case LinphoneLogLevelMessage: return "MESSAGE";

+  case LinphoneLogLevelWarning: return "WARNING";

+  case LinphoneLogLevelError: return "ERROR";

+  case LinphoneLogLevelFatal: return "FATAL";

   default: return "?";

   }

 }

@@ -105,19 +103,21 @@ static char const *cstate2str(LinphoneCallState cstate)

   }

 }

+LinphoneLoggingService *glLogSrv; ///< logging service

+LinphoneLoggingServiceCbs *glLogCbs; ///< logging callbacks

 std::string glLogFileName; ///< name of global log file

 std::ofstream glLogStream; ///< stream to open global log file

 unsigned int glLogLineCnt; ///< number of lines already logged

 /**

  * @brief log information from linphone library

+ * @param[in] log_srv logging service - ignored

  * @param[in] domain log domain - ignored

  * @param[in] lev log level

- * @param[in] fmt format string

- * @param[in] args arguments to insert into format string

+ * @param[in] msg message string

  */

-void log_handler(const char *domain, OrtpLogLevel lev, const char *fmt,

-                 va_list args)

+static void log_msg_wr(LinphoneLoggingService *log_srv, const char *domain,

+                       LinphoneLogLevel lev, const char *msg)

 {

   // (re-)open logfile on first line

   if (glLogLineCnt == 0) {

@@ -130,11 +130,8 @@ void log_handler(const char *domain, OrtpLogLevel lev, const char *fmt,

     glLogStream.open(glLogFileName.c_str(), std::ios::out);

   }

   // write log line

-  char buffer[4096];

-  vsnprintf(buffer, sizeof(buffer) - 1, fmt, args);

-  buffer[sizeof(buffer) - 1] = 0;

   glLogStream << Time::now().toStr() << " "

-              << loglevel2str(lev) << " " << buffer << std::endl;

+              << loglevel2str(lev) << " " << msg << std::endl;

   // count lines

   ++glLogLineCnt;

   // close file if maximum line count reached

@@ -145,6 +142,7 @@ void log_handler(const char *domain, OrtpLogLevel lev, const char *fmt,

     // reset line count, so new file is opened on next line

     glLogLineCnt = 0;

   }

+  (void)log_srv;

   (void)domain;

 }

@@ -153,7 +151,18 @@ void init(std::string const &logFileName)

 {

   glLogFileName = logFileName;

   glLogLineCnt = 0;

-  linphone_core_set_log_handler(log_handler);

+  glLogSrv = linphone_logging_service_get();

+  linphone_logging_service_ref(glLogSrv);

+  LinphoneFactory *factory = linphone_factory_get();

+  glLogCbs = linphone_factory_create_logging_service_cbs(factory);

+  linphone_logging_service_cbs_set_log_message_written(glLogCbs, log_msg_wr);

+}

+

+/// global cleanup

+void exit()

+{

+  linphone_logging_service_cbs_unref(glLogCbs);

+  linphone_logging_service_unref(glLogSrv);

 }

 /// data of SIP client worker thread

@@ -423,13 +432,14 @@ void do_register(Data &data, std::string const &server,

   linphone_core_cbs_set_dtmf_received(data.callbacks, dtmf_received);

   // create linphone core object

-  data.lc = linphone_factory_create_core(factory, data.callbacks, NULL, NULL);

+  data.lc = linphone_factory_create_core_3(factory, NULL, NULL, NULL);

   if (! data.lc) {

     log(data, "failed to create linphone core");

     linphone_core_cbs_unref(data.callbacks);

     data.callbacks = nullptr;

     return;

   }

+  linphone_core_add_callbacks(data.lc, data.callbacks);

   linphone_core_set_user_data(data.lc, &data);

   log(data, "linphone core created");

@@ -490,7 +500,7 @@ void do_register(Data &data, std::string const &server,

   // tell linphone not to rind and to use files instead of sound card

   linphone_core_set_ring(data.lc, nullptr);

-  linphone_core_use_files(data.lc, TRUE);

+  linphone_core_set_use_files(data.lc, TRUE);

   linphone_core_set_play_file(data.lc, nullptr);

 }

@@ -505,6 +515,7 @@ void do_deregister(Data &data)

   }

   log(data, "unreferencing...");

+  linphone_core_remove_callbacks(data.lc, data.callbacks);

   linphone_core_unref(data.lc);

   data.lc = nullptr;

   linphone_core_cbs_unref(data.callbacks);

@@ -648,6 +659,16 @@ void SipPhone::init(const Directory &globalLogDir)

 #endif

 }

+/**

+ * @brief global cleanup (call once after finishing using this class)

+ */

+void SipPhone::exit()

+{

+#ifdef BLINKER_CFG_LINPHONE

+  linphone::exit();

+#endif

+}

+

 /**

  * @brief constructor

  * @param[in] name module name

@@ -64,6 +64,11 @@ public:

    */

   static void init(const Directory &globalLogDir);

+  /**

+   * @brief global cleanup (call once after finishing using this class)

+   */

+  static void exit();

+

 public:

   /**

    * @brief constructor

@@ -85,6 +85,8 @@ void run(const std::string &dirConfig)

 #undef MODULEMGR

   mgrs.m_callMgr.run();

+

+  SipPhone::exit();

 }

 int main(int argc, const char *argv[])