Browse code

b/f: fixed some porting errors

Raphael Coeffic authored on 01/02/2013 00:15:39
Showing 5 changed files
... ...
@@ -292,11 +292,13 @@ void CallLeg::onB2BReply(B2BSipReplyEvent *ev)
292 292
         }
293 293
         if (!reply.to_tag.empty()) {
294 294
           other_id = reply.from_tag;
295
-          TRACE("1xx reply with to-tag received in NoReply state, changing status to Ringing and remembering the other leg ID (%s)\n", other_id.c_str());
296
-          if (ev->forward && relaySipReply(reply) != 0) {
297
-            stopCall();
298
-            return;
299
-          }
295
+          TRACE("1xx reply with to-tag received in NoReply state,"
296
+		" changing status to Ringing and remembering the"
297
+		" other leg ID (%s)\n", other_id.c_str());
298
+          // if (ev->forward && relaySipReply(reply) != 0) {
299
+          //   stopCall();
300
+          //   return;
301
+          // }
300 302
           updateCallStatus(Ringing);
301 303
         }
302 304
       }
... ...
@@ -2,6 +2,7 @@
2 2
 #include "AmSipHeaders.h"
3 3
 #include "arg_conversion.h"
4 4
 #include "sip/parse_nameaddr.h"
5
+#include "sip/parse_common.h"
5 6
 #include "RegisterCache.h"
6 7
 #include "AmSession.h"
7 8
 #include "AmConfig.h"
... ...
@@ -60,6 +61,9 @@ int RegisterDialog::initUAC(const AmSipRequest& req, const SBCCallProfile& cp)
60 61
     return -1;
61 62
   }
62 63
 
64
+  DBG("contact_hiding=%i, reg_caching=%i\n",
65
+      cp.contact_hiding, cp.reg_caching);
66
+
63 67
   contact_hiding = cp.contact_hiding;
64 68
 
65 69
   reg_caching = cp.reg_caching;
... ...
@@ -1,6 +1,6 @@
1 1
 #include "SBCCallLeg.h"
2 2
 
3
-#include "ampi/SBCCallControlAPI.h"
3
+#include "SBCCallControlAPI.h"
4 4
 
5 5
 #include "log.h"
6 6
 #include "AmUtils.h"
... ...
@@ -369,8 +369,8 @@ int SBCCallLeg::relayEvent(AmEvent* ev)
369 369
           assert(reply_ev);
370 370
 
371 371
           if(call_profile.transparent_dlg_id &&
372
-              (reply_ev->reply.to_tag == dlg->ext_local_tag))
373
-            reply_ev->reply.to_tag = dlg->local_tag;
372
+              (reply_ev->reply.from_tag == dlg->ext_local_tag))
373
+            reply_ev->reply.from_tag = dlg->local_tag;
374 374
 
375 375
           if (call_profile.headerfilter.size() ||
376 376
               call_profile.reply_translations.size()) {
... ...
@@ -32,7 +32,7 @@
32 32
 #include "AmPlugIn.h"
33 33
 #include "AmConfig.h"
34 34
 
35
-#include "ampi/SBCCallControlAPI.h"
35
+#include "SBCCallControlAPI.h"
36 36
 #include "RTPParameters.h"
37 37
 #include "SDPFilter.h"
38 38
 
... ...
@@ -257,7 +257,9 @@ struct SBCCallProfile
257 257
     rtprelay_transparent_ssrc(true),
258 258
     rtprelay_interface_value(-1),
259 259
     aleg_rtprelay_interface_value(-1),
260
-    outbound_interface_value(-1)
260
+    outbound_interface_value(-1),
261
+    contact_hiding(false), 
262
+    reg_caching(false)
261 263
   { }
262 264
 
263 265
   ~SBCCallProfile()