[sr-dev] git:richard.good/diameter_rx_calling: ims_qos: bug fix for Rx flow-description AVP

[Richard Good]

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

Author: Richard Good <richard.good at smilecoms.com>
Committer: Richard Good <richard.good at smilecoms.com>
Date:   Thu Mar 14 18:55:52 2013 +0200

ims_qos: bug fix for Rx flow-description AVP

        - rx_avp.c: rx_create_media_subcomponent_avp removed options from flow-description AVP as per Rx 29.214

---

 modules/ims_qos/rx_avp.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c
index 86a630f..d628192 100644
--- a/modules/ims_qos/rx_avp.c
+++ b/modules/ims_qos/rx_avp.c
@@ -505,8 +505,11 @@ static str permit_out = {"permit out ", 11};
 static str permit_in = {"permit in ", 10};
 static str from_s = {" from ", 6};
 static str to_s = {" to ", 4};
-static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s";
-static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s";
+//removed final %s - this is options which Rx 29.214 says will not be used for flow-description AVP
+static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u";
+//static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s";
+static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u";
+//static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s";
 
 AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto,
         str *ipA, str *portA,
@@ -551,13 +554,13 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto,
     }
 
     set_4bytes(x, number);
-
+    
     flow_number = cdpb.AAACreateAVP(AVP_IMS_Flow_Number,
             AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC,
             IMS_vendor_id_3GPP, x, 4,
             AVP_DUPLICATE_DATA);
     cdpb.AAAAddAVPToList(&list, flow_number);
-
+    
     /*IMS Flow descriptions*/
     /*first flow is the receive flow*/
     flow_data.len = snprintf(flow_data.s, len, permit_out_with_ports, proto_int,