Browse code

conference: update to 1.6 core

std::swap replaced by explicit string exchange

Václav Kubart authored on 12/02/2013 06:39:28 • Raphael Coeffic committed on 28/02/2013 12:11:27
Showing 1 changed files
... ...
@@ -886,18 +886,20 @@ void ConferenceDialog::onSipRequest(const AmSipRequest& req)
886 886
      (req.method != "REFER"))
887 887
     return;
888 888
 
889
-  std::swap(dlg->local_party,dlg->remote_party);
890
-  dlg->remote_tag = "";
889
+  string local_party(dlg->getLocalParty());
890
+  dlg->setLocalParty(dlg->getRemoteParty());
891
+  dlg->setRemoteParty(local_party);
892
+  dlg->setRemoteTag("");
891 893
 
892 894
   // get route set and next hop
893 895
   string iptel_app_param = getHeader(req.hdrs, PARAM_HDR, true);
894 896
   if (iptel_app_param.length()) {
895
-    dlg->route = get_header_keyvalue(iptel_app_param,"Transfer-RR");
897
+    dlg->setRouteSet(get_header_keyvalue(iptel_app_param,"Transfer-RR"));
896 898
   } else {
897 899
     INFO("Use of P-Transfer-RR/P-Transfer-NH is deprecated. "
898 900
 	 "Use '%s: Transfer-RR=<rr>;Transfer-NH=<nh>' instead.\n",PARAM_HDR);
899 901
 
900
-    dlg->route = getHeader(req.hdrs,"P-Transfer-RR", true);
902
+    dlg->setRouteSet(getHeader(req.hdrs,"P-Transfer-RR", true));
901 903
   }
902 904
 
903 905
   DBG("ConferenceDialog::onSipRequest: local_party = %s\n",dlg->getLocalParty().c_str());