Merge branch 'master' into fix_sip2sip

daemon/src/sip/sip_utils.cpp

@@ -80,6 +80,7 @@ sip_utils::createRouteSet(const std::string &route, pj_pool_t *hdr_pool)
     pjsip_route_hdr *route_set = pjsip_route_hdr_create(hdr_pool);
     pjsip_route_hdr *routing = pjsip_route_hdr_create(hdr_pool);
     pjsip_sip_uri *url = pjsip_sip_uri_create(hdr_pool, 0);
+    url->lr_param = 1;
     routing->name_addr.uri = (pjsip_uri*) url;
     pj_strdup2(hdr_pool, &url->host, host.c_str());
     url->port = port;

daemon/src/sip/sipvoiplink.cpp

@@ -1613,11 +1613,6 @@ void registration_cb(pjsip_regc_cbparam *param)
         return;
     }
 
-    if(param->code == 200) {
-        account->setRegister(true);
-        account->setRegistrationState(Registered);
-    }
-
     if (account->isContactUpdateEnabled())
         update_contact_header(param, account);