Changeset 113:c30ff23c1383 in verona

Timestamp:

Apr 8, 2010 6:30:13 PM (3 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Children:

114:8ac29d37c839, 115:e450452bc74e

Message:

phAcceptCall is working, ph_call_retrieve_payloads is ok too

Files:

• phapi/phapi.c (modified) (35 diffs)
• phapi/sdphandler.c (modified) (3 diffs)
• phapi/sdphandler.h (modified) (1 diff)
• phcpp/testphcpp.cpp (modified) (3 diffs)

phapi/phapi.c

@@ -129 +129 @@
 
 
-static int ph_call_retrieve_payloads(phcall_t *ca, eXosip_event_t *je, int flags);
+static int ph_call_retrieve_payloads(phcall_t *ca, int flags);
 static int ph_call_media_start(phcall_t *ca, eXosip_event_t *je, int flags, int resumeflag);
 static char *ph_ipv4tostr(char *buf, const StunAddress4 addr);
@@ -220 +220 @@
 static int 
 ph_req_set_body(osip_message_t *msg, const char *body, const char *mime);
+static char *
+ph_req_get_body(osip_message_t *msg);
 
 
@@ -584 +586 @@
   osip_list_init(&ca->audio_payloads);
   osip_list_clone(&ph_audio_payloads, &ca->audio_payloads, sdp_payload_clone);
+  osip_list_init(&ca->video_payloads);
+  osip_list_clone(&ph_video_payloads, &ca->video_payloads, sdp_payload_clone);
   return ca;
 }
@@ -639 +643 @@
   if (hdr && !strcmp(hdr->hvalue, "*;+g.oma.sip-im"))
     ca->nego_mflags = PH_STREAM_DATA;
-  osip_list_init(&ca->audio_payloads);
-  osip_list_clone(&ph_audio_payloads, &ca->audio_payloads, sdp_payload_clone);
-
+
+  if (creatit)
+    {
+    osip_list_init(&ca->audio_payloads);
+    osip_list_clone(&ph_audio_payloads, &ca->audio_payloads, sdp_payload_clone);
+    osip_list_init(&ca->video_payloads);
+    osip_list_clone(&ph_video_payloads, &ca->video_payloads, sdp_payload_clone);
+
+    if (je->request && MSG_IS_INVITE(je->request))
+      {
+      char *sdp = ph_req_get_body(je->request);
+
+      sdp_message_init(&ca->remote_sdp);
+      sdp_message_parse(ca->remote_sdp, sdp);
+      if (sdp_message_m_attr_has_type(ca->remote_sdp, "audio"))
+        ca->nego_mflags |= PH_STREAM_AUDIO;
+      if (sdp_message_m_attr_has_type(ca->remote_sdp, "video"))
+        ca->nego_mflags |= PH_STREAM_VIDEO;
+      osip_free(sdp);
+      }
+
+    if (je->response && MSG_IS_INVITE(je->response))
+      {
+      char *sdp = ph_req_get_body(je->response);
+      if (sdp)
+        {
+        sdp_message_init(&ca->remote_sdp);
+        sdp_message_parse(ca->remote_sdp, sdp);
+        if (sdp_message_m_attr_has_type(ca->remote_sdp, "audio"))
+          ca->nego_mflags |= PH_STREAM_AUDIO;
+        if (sdp_message_m_attr_has_type(ca->remote_sdp, "video"))
+          ca->nego_mflags |= PH_STREAM_VIDEO;
+        osip_free(sdp);
+        }
+      }
+    }
   return ca;
 }
@@ -735 +772 @@
   if (ca->sdpctx)
     sdp_context_free(ca->sdpctx);
-  if (ca->remote_sdp)
+  /*if (ca->remote_sdp)
     sdp_message_free(ca->remote_sdp);
   if (ca->local_sdp)
-    sdp_message_free(ca->local_sdp);
-
-    osip_list_special_free(&ca->audio_payloads, osip_free_func);
-
-    osip_list_special_free(&ca->video_payloads, osip_free_func);
+    sdp_message_free(ca->local_sdp);*/
+
+  osip_list_special_free(&ca->audio_payloads, osip_free_func);
+
+  osip_list_special_free(&ca->video_payloads, osip_free_func);
 
   memset(ca, 0, sizeof(phcall_t));
@@ -848 +885 @@
 ph_call_support_payload(const struct osip_list *codec_list, const sdp_payload_t *payload)
 {
-  sdp_payload_t *cur_payload;
+  const sdp_payload_t *cur_payload;
 
   int pos = 0;
@@ -856 +893 @@
     cur_payload = (sdp_payload_t *) osip_list_get (codec_list, pos);
 
-    if (sdp_equal_payload(cur_payload, payload))
-      {
-      return 0;
+    if (sdp_equal_payload(cur_payload, payload) == 0)
+      {
+      return 1;
       }
     pos++;
     }
-  return -1;
+  return 0;
 }
 
@@ -898 +935 @@
       }
   }
-
 
   payload->localport = si->streamport;
@@ -999 +1035 @@
   phcall_t *ca =(phcall_t*)sdp_context_get_user_pointer(ctx);
 
-  if (!ph_call_support_payload(ca, payload))
+  if (!ph_call_support_payload(&ca->audio_payloads, payload))
     return -1;
 
@@ -1013 +1049 @@
   phcall_t *ca =(phcall_t*)sdp_context_get_user_pointer(ctx);
 
-  if (!ph_call_support_payload(ca, payload))
+  if (!ph_call_support_payload(&ca->video_payloads, payload))
     return -1;
 
@@ -1205 +1241 @@
   DBG_SIP_NEGO("phLinePlaceCall_withCa: a new call has been placed\n");
 
-
-  sdp_payload_t *cur_payload;
-
-  int pos = 0;
-
   local_video_port[0] = 0;
   local_voice_port[0] = 0;
@@ -1234 +1265 @@
     ca0->cid = -2;
   eXosip_unlock();
-
-  while (!osip_list_eol(&ca0->audio_payloads, pos))
-    {
-    cur_payload = (sdp_payload_t *) osip_list_get (&ca0->audio_payloads, pos);
-    printf("ca0 audio codecs %s\n", cur_payload->a_rtpmap);
-    pos++;
-    }
 
   if (!ca0)
@@ -1318 +1342 @@
       }
       sdp_context_build_offer(ca0->sdpctx);
+      ca0->local_sdp = ca0->sdpctx->offer;
       ph_req_set_body(invite, ca0->sdpctx->offerstr, "application/sdp")
 
@@ -1332 +1357 @@
       }
       sdp_context_build_offer(ca0->sdpctx);
+      ca0->local_sdp = ca0->sdpctx->offer;
       ph_req_set_body(invite, ca0->sdpctx->offerstr, "application/sdp");
 
@@ -1390 +1416 @@
   return phLineSendMessage2(vlid, uri, uri, buff, mime, 0);
 }
-
-
-
 
 
@@ -1416 +1439 @@
   ph_build_from(from, sizeof(from), vl);
 
-
-
   eXosip_lock();
   i = eXosip_message_build_request(&msg, "MESSAGE", (char *)uri,
@@ -1444 +1465 @@
   if (!ca)
     return -PH_BADCID;
-
 
   eXosip_lock();
@@ -1727 +1747 @@
   if (!i) {
     if (!ca->sdpctx) {
-      printf("build sdp ctx\n");
       ca->sdpctx = sdp_handler_create_context(&ph_sdp_handler, local_ip, ctct, vl->proxy);
       ca->cfg =  &phcfg;
       sdp_context_set_user_pointer(ca->sdpctx, ca);
+      ca->sdpctx->offer = ca->remote_sdp;
     }
     sdp_context_build_answer(ca->sdpctx, ca->remote_sdp);
-
-    ph_req_set_body(msg, ca->sdpctx->offerstr, "application/sdp");
+    ca->local_sdp = ca->sdpctx->answer;
+    ph_req_set_body(msg, ca->sdpctx->answerstr, "application/sdp");
     if (ctct)
       osip_message_set_contact(msg, ctct);
@@ -1817 +1837 @@
   if (i == 0 && streams != PH_STREAM_DATA)
     {
-    i = ph_call_retrieve_payloads(ca, NULL, streams | PH_STREAM_CNG );
+    i = ph_call_retrieve_payloads(ca, streams | PH_STREAM_CNG );
 
     ca->local_sdp_audio_port = atoi(local_voice_port);
@@ -1829 +1849 @@
   eXosip_unlock();
 
-  if (!i && !(streams == PH_STREAM_DATA))
+  if (!i && streams != PH_STREAM_DATA)
     i = ph_call_media_start(ca, NULL, streams, 0);
 
@@ -1877 +1897 @@
     char tmp[16];
 
-    i = ph_call_retrieve_payloads(ca, NULL, streams);
+    i = ph_call_retrieve_payloads(ca, streams);
 
     _get_local_audio_sdp_port(tmp);
@@ -1929 +1949 @@
 
 
-  i = ph_call_retrieve_payloads(ca, NULL, streams);
+  i = ph_call_retrieve_payloads(ca, streams);
 
   ca->local_sdp_audio_port = mca->local_sdp_audio_port;
@@ -3017 +3037 @@
   else
     {
-#ifdef OLDOSIP
-    char contact[512];
     char from[512];
 
     ph_build_from(from, sizeof(from), vl);
-    eXosip_guess_contact_uri(from, contact, sizeof(contact), 1);
-    vl->contact = osip_strdup(contact);
-#endif
+    vl->contact = osip_strdup(from);
 
     }
@@ -3992 +4008 @@
   ph_nat_init();
 
-  DBG_SIP_NEGO("NAT type: %s fw=%s \n", ph_nat_type_str, ph_nat_router_addr,0);
+  DBG_SIP_NEGO("NAT type: %s fw=%s \n", ph_nat_type_str, ph_nat_router_addr);
 
 #ifdef OLDOSIP
@@ -4196 +4212 @@
 
 static int
-ph_call_retrieve_payloads(phcall_t *ca, eXosip_event_t *je, int flags)
-{
-#if 0
+ph_rebuild_codec_list(sdp_message_t *sdp, const char *mtype, int *ptnum, char *mime, int mime_len)
+{
+  int i;
+  char *pt;
+
+  for (i = 0; !sdp_message_endof_media (sdp, i); i++)
+    {
+    if (strcmp(mtype, sdp_message_m_media_get(sdp, i)) == 0 && (pt = sdp_message_m_payload_get(sdp, i, 0)) != NULL)
+      {
+      *ptnum = atoi(pt);
+      mime[0] = 0;
+     // strcpy(mime, ph_media_lookup_codec_mime(*ptnum));
+      }
+    }
+  return 0;
+}
+
+static int
+ph_call_retrieve_payloads(phcall_t *ca, int flags)
+{
   int  i = 0;
-  DBG4_SIP_NEGO("looking for payloads...\n", 0, 0, 0);
-  DBG4_SIP_NEGO("audio...\n", 0, 0, 0);
+
+  DBG_SIP_NEGO("looking for payloads...\n");
+  DBG_SIP_NEGO("audio...\n");
   if (_is_audio_enabled(flags))
     {
-    i = eXosip_retrieve_negotiated_audio_payload(ca->did, &ca->audio_payload, ca->audio_payload_name, sizeof(ca->audio_payload_name));
-    DBG4_SIP_NEGO("remote_audio=%s payload=%s(%d)\n", ca->remote_sdp_audio_ip, ca->audio_payload_name, ca->audio_payload);
-    }
-
-  DBG4_SIP_NEGO("video...\n", 0, 0, 0);
+    ph_rebuild_codec_list(ca->local_sdp, "audio", &ca->audio_payload, ca->audio_payload_name, sizeof(ca->audio_payload_name));
+    //i = eXosip_retrieve_negotiated_audio_payload(ca->did, &ca->audio_payload, ca->audio_payload_name, sizeof(ca->audio_payload_name));
+    // DBG4_SIP_NEGO("remote_audio=%s payload=%s(%d)\n", ca->remote_sdp_audio_ip, ca->audio_payload_name, ca->audio_payload);
+    }
+
+  DBG_SIP_NEGO("video...\n");
   ca->video_payload = 0;
   if (ca->remote_sdp_video_ip[0] && (_is_video_enabled(flags)))
     {
-    i = eXosip_retrieve_negotiated_video_payload(ca->did, &ca->video_payload, ca->video_payload_name, sizeof(ca->video_payload_name));
-    DBG4_SIP_NEGO("remote_video=%s payload=%s(%d)\n", ca->remote_sdp_video_ip, ca->video_payload_name, ca->video_payload);
-    }
-
-  DBG4_SIP_NEGO("cng...\n", 0, 0, 0);
+    ph_rebuild_codec_list(ca->local_sdp, "video", &ca->video_payload, ca->video_payload_name, sizeof(ca->video_payload_name));
+    //i = eXosip_retrieve_negotiated_video_payload(ca->did, &ca->video_payload, ca->video_payload_name, sizeof(ca->video_payload_name));
+    // DBG_SIP_NEGO("remote_video=%s payload=%s(%d)\n", ca->remote_sdp_video_ip, ca->video_payload_name, ca->video_payload);
+    }
+
+  DBG_SIP_NEGO("cng...\n");
   if(!i && phcfg.cng && (flags & PH_STREAM_CNG)) {
-    ca->cng = !eXosip_retrieve_negotiated_specific_payload(ca->did, PH_MEDIA_CN_PT_STR, strlen(PH_MEDIA_CN_PT_STR));
-    DBG4_SIP_NEGO("cng: %d", ca->cng, 0, 0);
+    // ca->cng = !eXosip_retrieve_negotiated_specific_payload(ca->did, PH_MEDIA_CN_PT_STR, strlen(PH_MEDIA_CN_PT_STR));
+    // DBG_SIP_NEGO("cng: %d", ca->cng);
   }
   return i;
-#endif
 }
 
@@ -4625 +4660 @@
 ph_call_new(eXosip_event_t *je)
 {
-#ifdef OLDOSIP
   phCallStateInfo_t info;
   phcall_t *ca;
   struct vline *vl;
+  char *localUri, *remoteUri;
 
   clear(info);
   if (ph_busyFlag)
     {
-    ph_answer_request(je->tid, 486, 0);
+    ph_answer_request(je->cid, je->tid, 486, 0);
     return;
     }
 
-
   if (ph_follow_me_addr[0])
     {
-    ph_answer_request(je->tid, 302, ph_follow_me_addr);
+    ph_answer_request(je->cid, je->tid, 302, ph_follow_me_addr);
     return;
     }
-
-  info.vlid = ph_get_vline_id(je->local_uri, je->req_uri);
+  osip_uri_to_str(je->response->req_uri, &localUri);
+  osip_uri_to_str(je->request->req_uri, &remoteUri);
+  info.vlid = ph_get_vline_id(localUri, remoteUri);
 
   if (!info.vlid)
     {
-    ph_answer_request(je->tid, 404, 0);
+    ph_answer_request(je->cid, je->tid, 404, 0);
     return;
     }
@@ -4658 +4693 @@
   if (vl->busy)
     {
-    ph_answer_request(je->tid, 486, vl->contact);
+    ph_answer_request(je->cid, je->tid, 486, vl->contact);
     return;
     }
@@ -4665 +4700 @@
   if (vl->followme && vl->followme[0])
     {
-    ph_answer_request(je->tid, 302, vl->followme);
+    ph_answer_request(je->cid, je->tid, 302, vl->followme);
     return;
     }
@@ -4678 +4713 @@
     info.userData = je->external_reference;
     info.event = phINCALL;
-    info.u.remoteUri = je->remote_uri;
-    info.localUri = je->local_uri;
+    info.u.remoteUri = osip_strdup(remoteUri);
+    info.localUri = osip_strdup(localUri);
     info.streams = ca->nego_mflags;
-    info.callinfo = je->call_info;
-
-    ph_retrieve_remote_sdp_text(je->did, (char **)&info.remoteSdp);
+    info.callinfo = 0; //je->call_info;
+
+    info.remoteSdp = ph_req_get_body(je->response);
+
+    // ph_retrieve_remote_sdp_text(je->did, (char **)&info.remoteSdp);
 
     phcb->callProgress(ca->cid, &info);
@@ -4689 +4726 @@
   else
     {
-    ph_answer_request(je->tid, 500, vl->contact);
-    }
-#endif
-
+    ph_answer_request(je->cid, je->tid, 500, vl->contact);
+    }
 }
 
@@ -4823 +4858 @@
   clear(info);
 
-  ca = ph_locate_call(je, 1);
+  ca = ph_locate_call(je, 0);
   info.remoteSdp = sdp = ph_req_get_body(je->response);
   if (ca)
@@ -4834 +4869 @@
     const int mflags =  -1 & ~(PH_STREAM_MCSEND|PH_STREAM_MCRECV);
 
-    ph_call_retrieve_payloads(ca, je, -1);
     sdp_message_init(&ca->remote_sdp);
     sdp_message_parse(ca->remote_sdp, sdp);
+    ca->sdpctx->answer = ca->remote_sdp;
     sdp_context_process_answer(ca->sdpctx, ca->remote_sdp);
+    ph_call_retrieve_payloads(ca, -1);
     ph_call_media_start(ca, je, mflags, ca->localresume);
     }
@@ -4916 +4952 @@
   if (!ca->localrefer)
     {
-    ph_call_retrieve_payloads(ca, je, PH_STREAM_CNG);
+    ph_call_retrieve_payloads(ca, PH_STREAM_CNG);
     ph_call_media_start(ca, je, -1, 0);
 
@@ -5036 +5072 @@
     }
 
-  ph_call_retrieve_payloads(ca, je, PH_STREAM_CNG);
+  ph_call_retrieve_payloads(ca, PH_STREAM_CNG);
 
   ret = ph_call_media_start(ca, je, -1, 0);
@@ -5334 +5370 @@
   ca->remotehold = 0;
 
-  ph_call_retrieve_payloads(ca, je, -1);
+  ph_call_retrieve_payloads(ca, -1);
   ph_call_media_start(ca, je, -1, remhold);
 

phapi/sdphandler.c

@@ -81 +81 @@
 
 int
-sdp_equal_payload(sdp_payload_t *cur_payload, sdp_payload_t *payload)
+sdp_equal_payload(const sdp_payload_t *cur_payload, const sdp_payload_t *payload)
 {
   return strcmp(cur_payload->a_rtpmap, payload->a_rtpmap);
@@ -119 +119 @@
   }
   return NULL;
+}
+
+int sdp_message_m_attr_has_type(sdp_message_t *sdp, const char *type)
+{
+  int i;
+  for (i = 0; !sdp_message_endof_media (sdp, i); i++)
+    {
+      if (strcmp(sdp_message_m_media_get(sdp, i), type) == 0)
+        return 1;
+    }
+  return 0;
 }
 
@@ -408 +419 @@
     {
     /* refuse this line (leave port to 0) */
-    refuse_mline(answer, mtype, payload.proto, mline);
+   // refuse_mline(answer, mtype, payload.proto, mline);
     }
 

phapi/sdphandler.h

@@ -95 +95 @@
 void sdp_context_process_answer(sdp_context_t *ctx, sdp_message_t *remote_answer);
 void sdp_context_free(sdp_context_t *ctx);
+int sdp_message_m_attr_has_type(sdp_message_t *sdp, const char *type);
 
 int sdp_payload_init (sdp_payload_t * payload);
 int sdp_payload_clone(sdp_payload_t *src, sdp_payload_t **dst);
-int sdp_equal_payload(sdp_payload_t *cur_payload, sdp_payload_t *payload);
+int sdp_equal_payload(const sdp_payload_t *cur_payload, const sdp_payload_t *payload);
 int sdp_payload_list_add(struct osip_list* list, int pt, const char *rtpmap);
 #endif

phcpp/testphcpp.cpp

@@ -115 +115 @@
                info->localUri, info->u.remoteUri, info->streams, nz(info->callinfo));
         
-        if (info->streams == PH_STREAM_DATA)
+        if (info->streams & PH_STREAM_AUDIO)
           {
-            acceptCall(cid, 0, PH_STREAM_DATA);
+            printf("INCALL ACCEPT\n");
+            acceptCall(cid, 0, PH_STREAM_AUDIO, "192.168.10.145");
             cid2 = cid;
           }
@@ -338 +339 @@
   cout << "Intializing and creating virtual lines " << endl; 
   ph_config_t* conf = api.getConfig();
-  strcpy(conf->audio_codecs, "PCMU");
+  strcpy(conf->audio_codecs, "PCMA,PCMU");
   strcpy(conf->local_rtp_port, "27000");
   strcpy(conf->audio_dev, "default");
@@ -348 +349 @@
   api.addAuthInfo(argv[1], argv[1], argv[2], NULL);
   
-  vl1 = api.addVline(argv[1], argv[1], "voip.mbdsys.com:6060", "", 600);
+  vl1 = api.addVline(argv[1], argv[1], "voip.mbdsys.com:6060", "voip.mbdsys.com:6060", 600);
 
   string s;