Blinker

@@ -107,11 +107,13 @@ unsigned int glLogLineCnt; ///< number of lines already logged

 /**

  * @brief log information from linphone library

+ * @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

  */

-void log_handler(OrtpLogLevel lev, const char *fmt, va_list args)

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

+                 va_list args)

 {

   // (re-)open logfile on first line

   if (glLogLineCnt == 0) {

@@ -139,6 +141,7 @@ void log_handler(OrtpLogLevel lev, const char *fmt, va_list args)

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

     glLogLineCnt = 0;

   }

+  (void)domain;

 }

 /// global init

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

 struct Data {

   SipPhone::ConfigData const *configData; ///< config data for worker thread

   SipPhone::SharedData *sharedData; ///< data shared with main Blinker thread

-  LinphoneCoreVTable callbacks; ///< callback table

+  LinphoneCoreCbs *callbacks; ///< callbacks object, if active

   LinphoneCore *lc; ///< linphone core object, if active

   LinphoneCall *call; ///< current call, if available

   std::string playback; ///< name of playback file

@@ -222,6 +225,9 @@ void global_state_changed(struct _LinphoneCore *lc,

                           const char *message)

 {

   Data *data = (Data*)linphone_core_get_user_data(lc);

+  if (data == nullptr) {

+    return; // still initializing -> ignore

+  }

   std::stringstream line;

   line << "global state changed to " << gstate2str(gstate) << ": " << message;

@@ -241,6 +247,9 @@ void registration_state_changed(struct _LinphoneCore *lc,

                                 const char *message)

 {

   Data *data = (Data*)linphone_core_get_user_data(lc);

+  if (data == nullptr) {

+    return; // still initializing -> ignore

+  }

   (void)cfg;

   std::stringstream line;

@@ -260,6 +269,9 @@ void call_state_changed(struct _LinphoneCore *lc, LinphoneCall *call,

                         LinphoneCallState cstate, const char *message)

 {

   Data *data = (Data*)linphone_core_get_user_data(lc);

+  if (data == nullptr) {

+    return; // still initializing -> ignore

+  }

   std::stringstream line;

   line << "call state changed to " << cstate2str(cstate) << ": "

@@ -291,7 +303,7 @@ void call_state_changed(struct _LinphoneCore *lc, LinphoneCall *call,

     switch (cstate) {

     case LinphoneCallIncomingReceived:

       log(*data, "rejecting call (busy)");

-      linphone_core_decline_call(lc, call, LinphoneReasonBusy);

+      linphone_call_decline(call, LinphoneReasonBusy);

       break;

     default:

       break;

@@ -308,7 +320,7 @@ void call_state_changed(struct _LinphoneCore *lc, LinphoneCall *call,

       }

       data->playback.clear();

       log(*data, "accepting call");

-      linphone_core_accept_call(lc, call);

+      linphone_call_accept(call);

       break;

     default:

       break;

@@ -325,6 +337,9 @@ void call_state_changed(struct _LinphoneCore *lc, LinphoneCall *call,

 void dtmf_received(struct _LinphoneCore* lc, LinphoneCall *call, int dtmf)

 {

   Data *data = (Data*)linphone_core_get_user_data(lc);

+  if (data == nullptr) {

+    return; // still initializing -> ignore

+  }

   // check if current call

   bool current = data->call == call;

@@ -375,23 +390,45 @@ void do_register(Data &data, std::string const &server,

     return;

   }

+  LinphoneFactory *factory = linphone_factory_get();

+

+  // create linphone callback object

+  data.callbacks = linphone_factory_create_core_cbs(factory);

+  if (! data.callbacks) {

+    log(data, "failed to create linphone callback object");

+    return;

+  }

+

+  // set callbacks

+  linphone_core_cbs_set_global_state_changed(data.callbacks,

+                                             global_state_changed);

+  linphone_core_cbs_set_registration_state_changed(data.callbacks,

+                                                   registration_state_changed);

+  linphone_core_cbs_set_call_state_changed(data.callbacks, call_state_changed);

+  linphone_core_cbs_set_dtmf_received(data.callbacks, dtmf_received);

+

   // create linphone core object

-  data.lc = linphone_core_new(&data.callbacks, NULL, NULL, &data);

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

   if (! data.lc) {

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

+    linphone_core_cbs_unref(data.callbacks);

+    data.callbacks = nullptr;

     return;

   }

+  linphone_core_set_user_data(data.lc, &data);

   log(data, "linphone core created");

   // set auth data

   if (! username.empty() && ! password.empty()) {

     LinphoneAuthInfo *auth_info =

         linphone_auth_info_new(username.c_str(), username.c_str(),

-                               password.c_str(), "", "");

+                               password.c_str(), nullptr, "", "");

     if (! auth_info) {

       log(data, "failed to create auth info");

-      linphone_core_destroy(data.lc);

+      linphone_core_unref(data.lc);

       data.lc = nullptr;

+      linphone_core_cbs_unref(data.callbacks);

+      data.callbacks = nullptr;

       return;

     }

     linphone_core_add_auth_info(data.lc, auth_info);

@@ -406,12 +443,18 @@ void do_register(Data &data, std::string const &server,

   LinphoneProxyConfig *proxy = linphone_core_create_proxy_config(data.lc);

   if (! proxy) {

     log(data, "failed to create proxy config");

-    linphone_core_destroy(data.lc);

+    linphone_core_unref(data.lc);

     data.lc = nullptr;

+    linphone_core_cbs_unref(data.callbacks);

+    data.callbacks = nullptr;

     return;

   }

   linphone_proxy_config_set_server_addr(proxy, sipserver.c_str());

-  linphone_proxy_config_set_identity(proxy, identity.c_str());

+  LinphoneAddress *addr =

+      linphone_proxy_config_normalize_sip_uri(proxy, identity.c_str());

+  if (addr != NULL) {

+    linphone_proxy_config_set_identity_address(proxy, addr);

+  }

   linphone_proxy_config_enable_register(proxy, TRUE);

   linphone_core_add_proxy_config(data.lc, proxy);

   log(data, "proxy config set");

@@ -432,11 +475,13 @@ void do_deregister(Data &data)

     return;

   }

-  log(data, "destroying...");

-  linphone_core_destroy(data.lc);

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

+  linphone_core_unref(data.lc);

   data.lc = nullptr;

+  linphone_core_cbs_unref(data.callbacks);

+  data.callbacks = nullptr;

   data.call = nullptr;

-  log(data, "destroyed");

+  log(data, "unreferenced");

 }

 /**

@@ -474,7 +519,7 @@ void do_hangup(Data &data)

   }

   log(data, "terminating call...");

-  linphone_core_terminate_call(data.lc, data.call);

+  linphone_call_terminate(data.call);

   data.call = nullptr;

   log(data, "call terminated");

 }

@@ -491,11 +536,7 @@ void worker(SipPhone::ConfigData const &configData,

   Data data;

   data.configData = &configData;

   data.sharedData = &sharedData;

-  memset(&data.callbacks, 0, sizeof(data.callbacks));

-  data.callbacks.global_state_changed = global_state_changed;

-  data.callbacks.registration_state_changed = registration_state_changed;

-  data.callbacks.call_state_changed = call_state_changed;

-  data.callbacks.dtmf_received = dtmf_received;

+  data.callbacks = nullptr;

   data.lc = nullptr;

   data.call = nullptr;

   data.logLineCnt = 0;