Changeset 371:14c4ff75deb4 in verona

Timestamp:

Nov 17, 2011 4:40:56 PM (19 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

try fixing hold/resume

Location:

phapi

Files:

• phapi.c (modified) (5 diffs)
• sdphandler.c (modified) (1 diff)

phapi/phapi.c

@@ -2899 +2899 @@
 
 
+static char *ph_call_fix_media_dir(phcall_t *ca,  const char *dir)
+{
+        if (!ca->sdpctx)
+                return 0;
+
+        if (ca->sdpctx->offer) {
+                sdp_context_update_media_direction(ca->sdpctx, dir, 1);
+                return ca->sdpctx->offerstr;
+        }
+
+        if (ca->sdpctx->answer) {
+                sdp_context_update_media_direction(ca->sdpctx, dir, 0);
+                return ca->sdpctx->answerstr;
+        }
+
+        return 0;
+
+}
+
 PHAPI_EXPORT int
 phResumeCall(int cid)
@@ -2905 +2924 @@
         int i;
         osip_message_t *reinvite;
+        char *body;
 
         if (!phIsInitialized)
@@ -2935 +2955 @@
         osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
 
-        if (ca->sdpctx && ca->sdpctx->offerstr)
-        {
-                //FIXME must change the streams direction to a=sendrecv
-                ph_req_set_body(reinvite, ca->sdpctx->offerstr, "application/sdp");
-        }
+        body = ph_call_fix_media_dir(ca, "sendrecv");
+        if (!body)
+                return -PH_HOLDERR;
+        if (body)
+                ph_req_set_body(reinvite, body, "application/sdp");
+
 
         eXosip_lock();
@@ -2954 +2975 @@
         osip_message_t *reinvite;
         int i;
+        char *body;
 
         DBG_SIP_NEGO("SIP_NEGO: phHoldCall\n");
@@ -2979 +3001 @@
         osip_message_set_subject(reinvite, "Call on hold");
         osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
-        if (ca->sdpctx && ca->sdpctx->offerstr)
-        {
-                //FIXME must change the streams direction to a=sendonly
-                ph_req_set_body(reinvite, ca->sdpctx->offerstr, "application/sdp");
-        }
+        body = ph_call_fix_media_dir(ca, "sendonly");
+        if (!body)
+                return -PH_HOLDERR;
+        if (body)
+                ph_req_set_body(reinvite, body, "application/sdp");
 
         eXosip_lock();

phapi/sdphandler.c

@@ -704 +704 @@
         osip_free(ctx);
 }
+
+
+void sdp_update_media_dir(sdp_message_t *sdp, const char *dir) {
+
+        int i = 0;
+
+        for(; !sdp_message_endof_media (sdp, i); i++) {
+                sdp_message_a_attribute_del(sdp, i, "inactive");
+                sdp_message_a_attribute_del(sdp, i, "sendonly");
+                sdp_message_a_attribute_del(sdp, i, "sendrecv");
+                sdp_message_a_attribute_add(sdp, i, osip_strdup(dir), 0);
+
+        }
+
+}
+
+void sdp_context_update_media_direction(sdp_context_t *ctx, const char *dir,  int offer)
+{
+
+        if (offer) {
+
+                if (ctx->offerstr!=NULL) {
+                        osip_free(ctx->offerstr);
+                        ctx->offerstr = 0;
+                }
+
+                if (ctx->offer) {
+                        sdp_update_media_dir(ctx->offer, dir);
+                }
+                sdp_message_to_str(ctx->offer, &ctx->offerstr);
+                return;
+        }
+
+        if (ctx->answerstr!=NULL) {
+                osip_free(ctx->answerstr);
+                ctx->answerstr = 0;
+        }
+
+        if (ctx->answer) {
+                sdp_update_media_dir(ctx->answer, dir);
+        }
+        sdp_message_to_str(ctx->answer, &ctx->answerstr);
+
+
+}