[sr-dev] git:richard.good/diameter_rx_media: modules/ims_qos: fix for TM suspend_reply change

[Richard Good]

Module: sip-router
Branch: richard.good/diameter_rx_media
Commit: de4f65df646b63b150a3c894fd69dfe2261bc838
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de4f65df646b63b150a3c894fd69dfe2261bc838

Author: Richard Good <richard.good at smilecoms.com>
Committer: Richard Good <richard.good at smilecoms.com>
Date:   Mon Jul 15 12:53:17 2013 +0200

modules/ims_qos:  fix for TM suspend_reply change
	- TM suspend reply no longer requires calling application to store branch parameter when suspending

---

 modules/ims_qos/mod.c    |    3 +--
 modules/ims_qos/rx_aar.c |    2 +-
 modules/ims_qos/rx_aar.h |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c
index 1ed636d..16d31e5 100644
--- a/modules/ims_qos/mod.c
+++ b/modules/ims_qos/mod.c
@@ -527,7 +527,6 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* str1, char* bar) {
         LOG(L_ERR, "ERROR: t_suspend: failed find UAC branch\n");
         return CSCF_RETURN_ERROR;
     }
-    saved_t_data->branch = branch;
     
     //Check that we dont already have an auth session for this specific dialog
     //if not we create a new one and attach it to the dialog (via session ID).
@@ -588,7 +587,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* str1, char* bar) {
 
     if (!ret) {
         LM_ERR("Failed to send AAR\n");
-        tmb.t_cancel_suspend_reply(saved_t_data->tindex, saved_t_data->tlabel, saved_t_data->branch);
+        tmb.t_cancel_suspend_reply(saved_t_data->tindex, saved_t_data->tlabel);
         goto error;
 
 
diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c
index b9e8e21..bca0a2d 100644
--- a/modules/ims_qos/rx_aar.c
+++ b/modules/ims_qos/rx_aar.c
@@ -165,7 +165,7 @@ done:
     if (aaa)
         cdpb.AAAFreeMessage(&aaa);
 
-    tmb.t_continue_reply(data->tindex, data->tlabel, data->act, data->branch);
+    tmb.t_continue_reply(data->tindex, data->tlabel, data->act);
     free_saved_transaction_global_data(data);
 }
 
diff --git a/modules/ims_qos/rx_aar.h b/modules/ims_qos/rx_aar.h
index ac90179..9f53515 100644
--- a/modules/ims_qos/rx_aar.h
+++ b/modules/ims_qos/rx_aar.h
@@ -71,7 +71,6 @@ typedef struct saved_transaction {
         str callid;
         str ftag;
         str ttag;
-        int branch;
 } saved_transaction_t;
 
 typedef struct saved_transaction_local {