Changeset 501:8eda480150bf in verona

Timestamp:

Jun 20, 2012 4:59:54 PM (11 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

avoid generation of mutiple Allow headers

File:

• phapi/phapi.c (modified) (5 diffs)

phapi/phapi.c

@@ -203 +203 @@
 int ph_set_media_direction( sdp_message_t * sdp, const char *media_type, enum ph_direction direction);
 const char * ph_get_str_direction( enum ph_direction direction);
-
+int ph_message_set_allow(osip_message_t* msg, const char* allowstr);
 #define nonempty(x)  ((x) && (x)[0])
 
@@ -1772 +1772 @@
                 return -1;
 
-        osip_message_set_allow(invite, "INVITE, ACK, BYE, CANCEL, REFER, NOTIFY, SUBSCRIBE, REGISTER");
+        ph_message_set_allow(invite, "INVITE, ACK, BYE, CANCEL, REFER, NOTIFY, SUBSCRIBE, REGISTER");
 
         ph_apply_customizations(invite, NULL, NULL);
@@ -3158 +3158 @@
 
         osip_message_set_subject(reinvite, "Call reinvite");
-        osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
+        ph_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
                 
         sdp_context_build_offer(ca->sdpctx);
@@ -3382 +3382 @@
         if (vl->rid >= 0)
         {
-                osip_message_set_allow(msg, "INVITE, ACK, BYE, CANCEL, OPTIONS, REFER, NOTIFY, SUBSCRIBE, REGISTER, MESSAGE");
+                ph_message_set_allow(msg, "INVITE, ACK, BYE, CANCEL, OPTIONS, REFER, NOTIFY, SUBSCRIBE, REGISTER, MESSAGE");
                 ph_apply_customizations(msg, NULL, NULL);
                 ret = eXosip_register_send_register(vl->rid, msg);
@@ -7817 +7817 @@
 }
 
+int ph_message_set_allow(osip_message_t* msg, const char* allowstr)
+{
+        osip_allow_t* allow;
+
+        if (!osip_message_get_allow(msg, 0, &allow)) {
+                char *tmp = osip_strdup(allowstr);
+                if (!tmp)
+                        return -1;
+                osip_free(allow->value);
+                allow->value = tmp;
+                return 0;
+        }
+        return osip_message_set_allow(msg, allowstr);
+}
+