Changeset 1097

Timestamp:

Mar 23, 2007 12:42:47 AM (17 years ago)

Author:

bennylp

Message:

ICE (work in progress): implemented ICE media transport

Location:

pjproject/trunk

Files:

• pjmedia/build/pjmedia.dsp (modified) (4 diffs)
• pjmedia/include/pjmedia/transport.h (modified) (3 diffs)
• pjmedia/include/pjmedia/transport_ice.h (added)
• pjmedia/src/pjmedia/transport_ice.c (added)
• pjmedia/src/pjmedia/transport_udp.c (modified) (4 diffs)
• pjnath/include/pjnath/errno.h (modified) (1 diff)
• pjnath/src/pjnath/ice.c (modified) (1 diff)
• pjproject.dsw (modified) (2 diffs)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -42 +42 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c
+# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -66 +66 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -245 +245 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\transport_ice.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\transport_udp.c
 # End Source File
@@ -398 +402 @@
 
 SOURCE=..\include\pjmedia\transport.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\transport_ice.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/include/pjmedia/transport.h

@@ -27 +27 @@
 
 #include <pjmedia/types.h>
+#include <pjmedia/errno.h>
 
 /**
@@ -178 +179 @@
 struct pjmedia_transport_op
 {
+    pj_status_t (*get_info)(pjmedia_transport *tp,
+                            pjmedia_sock_info *info);
+
     /**
      * This function is called by the stream when the transport is about
@@ -266 +270 @@
 
 
+PJ_INLINE(pj_status_t) pjmedia_transport_get_info(pjmedia_transport *tp,
+                                                  pjmedia_sock_info *info)
+{
+    if (tp->op->get_info)
+        return (*tp->op->get_info)(tp, info);
+    else
+        return PJ_ENOTSUP;
+}
+
 
 /**

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -94 +94 @@
                        pj_ssize_t bytes_read);
 
+static pj_status_t transport_get_info(pjmedia_transport *tp,
+                                      pjmedia_sock_info *info);
 static pj_status_t transport_attach(   pjmedia_transport *tp,
                                        void *user_data,
@@ -117 +119 @@
 static pjmedia_transport_op transport_udp_op = 
 {
+    &transport_get_info,
     &transport_attach,
     &transport_detach,
@@ -325 +328 @@
                                 pjmedia_transport_udp_info *inf)
 {
-    struct transport_udp *udp = (struct transport_udp*)tp;
-    PJ_ASSERT_RETURN(tp && inf, PJ_EINVAL);
-
-    inf->skinfo.rtp_sock = udp->rtp_sock;
-    inf->skinfo.rtp_addr_name = udp->rtp_addr_name;
-    inf->skinfo.rtcp_sock = udp->rtcp_sock;
-    inf->skinfo.rtcp_addr_name = udp->rtcp_addr_name;
-
-    return PJ_SUCCESS;
+    return transport_get_info(tp, &inf->skinfo);
 }
 
@@ -528 +523 @@
 
 
+/* Called to get the transport info */
+static pj_status_t transport_get_info(pjmedia_transport *tp,
+                                      pjmedia_sock_info *info)
+{
+    struct transport_udp *udp = (struct transport_udp*)tp;
+    PJ_ASSERT_RETURN(tp && info, PJ_EINVAL);
+
+    info->rtp_sock = udp->rtp_sock;
+    info->rtp_addr_name = udp->rtp_addr_name;
+    info->rtcp_sock = udp->rtcp_sock;
+    info->rtcp_addr_name = udp->rtcp_addr_name;
+
+    return PJ_SUCCESS;
+}
+
+
 /* Called by application to initialize the transport */
 static pj_status_t transport_attach(   pjmedia_transport *tp,

pjproject/trunk/pjnath/include/pjnath/errno.h

@@ -164 +164 @@
  */
 #define PJ_ENOICE                   -1
-
- /**
+/**
  * @hideinitializer
  * ICE check is in progress
  */
 #define PJ_EICEINPROGRESS           -1
+/**
+ * @hideinitializer
+ * Missing ICE SDP attribute
+ */
+#define PJ_EICEMISSINGSDP           -1
+/**
+ * @hideinitializer
+ * Invalid SDP "candidate" attribute
+ */
+#define PJ_EICEINCANDSDP            -1
 
 

pjproject/trunk/pjnath/src/pjnath/ice.c

@@ -26 +26 @@
 #include <pj/os.h>
 #include <pj/pool.h>
+#include <pj/rand.h>
 #include <pj/string.h>
 

pjproject/trunk/pjproject.dsw

@@ -85 +85 @@
 ###############################################################################
 
+Project: "pjnath"=.\pjnath\build\pjnath.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "pjsip_core"=.\pjsip\build\pjsip_core.dsp - Package Owner=<4>
 
@@ -153 +165 @@
     Project_Dep_Name pjsua_lib
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjnath
+    End Project Dependency
 }}}