Changeset 296:dc30103742b9

Timestamp:

10/08/08 15:31:23 (3 months ago)

Author:

vadim@mbdsys.com

Message:

implement multicasting

Files:

• phapi/phapi.c (modified) (9 diffs)
• phapi/phapi.h (modified) (2 diffs)
• phapi/phmedia-audio.c (modified) (4 diffs)
• phapi/phmedia.c (modified) (1 diff)
• phapi/phmedia.h (modified) (1 diff)

phapi/phapi.c

@@ -137 +137 @@
-
-static char*  _get_public_sip_port();
+
-
-
@@ -193 +194 @@
-ph_build_cname(char *buf, int n, struct vline *vl);
-
+
+static 
+void ph_msession_free(struct ph_msession_s *s);
-
-int phvlRegister(int vlid);
@@ -1017 +1021 @@
-phLinePlaceCall4(int vlid, const char *uri, void *userdata, int rcid, int streams, const char *adev, const char *audio_addr, const char *video_addr)
-{
-
+
+
+
+
+
+
+
+
+
+
-}
- 
+
+
-
-#define optional(x) (x[0] ? x : 0)
@@ -1092 +1107 @@
-  else
-    {
-
-#ifdef STUN_ENABLE
-        
@@ -1098 +1112 @@
-        {
-          
-
+
+
+
-          
+
-          if (ret <1)
-            {
@@ -1595 +1612 @@
-}
-
+MY_DLLEXPORT int 
+phAcceptMcCall(int cid, const char *adev, const char *audioaddr, int port)
+{
+   phcall_t *ca = ph_locate_call_by_cid(cid);
+   char  local_voice_port[16] = "0";
+   int streams = PH_STREAM_AUDIO;
+   phCallStateInfo_t info;
+   int i;
+   char *remoteUri;
+   
+   snprintf(local_voice_port,16, "%d", port);
+   eXosip_lock();
+   
+   i = eXosip_answer_call(ca->did, 200, local_voice_port, ph_get_call_contact(ca), 
+                         NULL,NULL,NULL,
+                                 audioaddr, NULL);
+          
+
+ 
+    if (i == 0)
+      {
+        char tmp[16];
+        
+        i = ph_call_retrieve_payloads(ca, NULL, streams);
+
+        _get_local_audio_sdp_port(tmp);
+        ca->local_sdp_audio_port = atoi(tmp);
+        ca->remote_sdp_audio_port = port;
+        strncpy(ca->remote_sdp_audio_ip, audioaddr, sizeof(ca->remote_sdp_audio_ip));
+
+      }
+  
+    eXosip_unlock();
+
+    if (adev)
+      {
+        if (ca->audiodev) free(ca->audiodev);
+        ca->audiodev = strdup(adev);
+      }
+
+    ph_call_media_start(ca, NULL, streams|PH_STREAM_MCSEND, 0);  
+
+    eXosip_lock();
+    eXosip_retrieve_from(ca->did, &remoteUri);
+    eXosip_unlock();
+
+    clear(info);
+
+    info.u.remoteUri = remoteUri;
+    info.event = phCALLOK;
+    phcb->callProgress(cid, &info);
+
+    if (remoteUri)
+      osip_free(remoteUri);
+
+    return 0;
+
+
+}
+
+phAcceptMcastCall2(int cid, int mcid)
+{
+
+}
-
-static void 
@@ -3930 +4011 @@
-
-    if (ca->mses)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}
@@ -3979 +4061 @@
-
-}
+
+
+
+static 
+struct ph_msession_s *ph_msession_new()
+{
+   struct ph_msession_s *s  = (struct ph_msession_s *)calloc(sizeof(struct ph_msession_s), 1);
+   s->critsec_mstream_init = g_mutex_new();
+   s->refcnt = 1;
+}
+
+
+static 
+void ph_msession_free(struct ph_msession_s *s)
+{
+  if (s)
+    {
+      g_mutex_lock(s->critsec_mstream_init);
+      if (s->refcnt-- == 1)
+        {
+          g_mutex_unlock(s->critsec_mstream_init);
+          free(s);
+          return;
+        }
+      g_mutex_unlock(s->critsec_mstream_init);
+    }
+}
+
-
-
@@ -4000 +4110 @@
-  if (!s)
-    {
-
-
+
-    }
-

phapi/phapi.h

@@ -173 +173 @@
-#define PH_NOMEDIA_STREAMS (1 << 5)
-#define PH_STREAM_DATA (1 << 6)
+#define PH_STREAM_MCSEND (1 << 7)
+#define PH_STREAM_MCRECV (1 << 8)
+
-
-/********************TELEPHONY*********************/
@@ -258 +261 @@
-MY_DLLEXPORT int phAcceptCall4(int cid, void *userData, int streams, const char *audio_addr, const char *video_addr);
-MY_DLLEXPORT int phAcceptCall5(int cid, void *userData, int streams, ...);
+
+MY_DLLEXPORT int phAcceptMcCall(int cid, const char *adev, const char *audioaddr, int port);
+MY_DLLEXPORT int phLinePlaceMcCall(int vlid, const char *uri, void *userdata, int streams, const char *adev);
+
-
-#define phAcceptCall(cid) phAcceptCall2(cid, 0)

phapi/phmedia-audio.c

@@ -2218 +2218 @@
-}
-
+
+int ph_media_setup_mcast_send(int fd, ph_mstream_params_t *sp)
+{
+  return 0;
+}
+
+
+int ph_media_setup_mcast_recv(int fd, ph_mstream_params_t *sp)
+{
+     struct ip_mreq mreq;
+
+     memset(&mreq, 0, sizeof(mreq));
+     mreq.imr_multiaddr.s_addr=inet_addr(sp->remoteaddr);
+     mreq.imr_interface.s_addr=htonl(INADDR_ANY);
+     if (setsockopt(fd,IPPROTO_IP,IP_ADD_MEMBERSHIP,&mreq,sizeof(mreq)) < 0)
+       return -1;
+
+     return 0;
+
+}
-
-
@@ -2336 +2356 @@
-          else
-#endif
-
+
+
+
-                                        stream->ms.remote_ip,
-                                        stream->ms.remote_port);
+
+              if (s->mcast_send)
+                {
+                  ph_media_setup_mcast_send(stream->ms.rtp_session->rtp.socket, sp);
+                }
+              else if (s->mcast_recv)
+                {
+                  ph_media_setup_mcast_recv(stream->ms.rtp_session->rtp.socket, sp);
+                }
+                
+
+
+            }
-          
-          DBG1_MEDIA_ENGINE("ph_msession_audio_start: audio stream reset done\n");
@@ -2432 +2467 @@
-
-  
-
-
+
+
+
+
+
+
-
-  DBG2_MEDIA_ENGINE("ph_msession_audio_start: rtpsession's qos: %d\n", s->qos);
@@ -2502 +2541 @@
-  stream->ms.running = 1;
-  stream->ms.rtp_session = session;
+
+  if (s->mcast_send)
+    {
+      ph_media_setup_mcast_send(stream->ms.rtp_session->rtp.socket, sp);
+    }
+  else if (s->mcast_recv)
+    {
+      ph_media_setup_mcast_recv(stream->ms.rtp_session->rtp.socket, sp);
+    }
+  
-
-

phapi/phmedia.c

@@ -72 +72 @@
-
-  g_mutex_lock(s->critsec_mstream_init);
+  if (s->refcnt != 1)
+    {
+      g_mutex_unlock(s->critsec_mstream_init);
+      return 0;
+    }
+
-
-  ret1 = ph_msession_audio_start(s, deviceid);

phapi/phmedia.h

@@ -133 +133 @@
-struct ph_msession_s
-{
+  int    refcnt;          /* reference count */
+  int    mcast_send;
+  int    mcast_recv;
-  int    activestreams;   /* bit mask of active streams */
-  int    newstreams;      /* bit mask of new streams to be activated */