Changeset 2283 for pjproject/trunk

Timestamp:

Sep 16, 2008 4:11:44 PM (16 years ago)

Author:

nanang

Message:

Ticket #629: Added IGMPv2 multicast socket options (thanks David Parker for the patch).

Location:

pjproject/trunk/pjlib

Files:

• include/pj/compat/socket.h (modified) (2 diffs)
• include/pj/sock.h (modified) (4 diffs)
• src/pj/sock_bsd.c (modified) (1 diff)
• src/pj/sock_common.c (modified) (1 diff)
• src/pj/sock_symbian.cpp (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -54 +54 @@
  * it has built-in IPv6 support.
  */
-#if defined(_MSC_VER) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+#if defined(_MSC_VER)
 #   ifndef s_addr
 #       define s_addr  S_un.S_addr
@@ -61 +61 @@
 #   include <ws2tcpip.h>
 
-#   ifndef IPPROTO_IPV6
+#   if !defined(IPPROTO_IPV6) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
         /* Need to download and install IPv6Kit for this platform.
          * Please see the comments above about Visual Studio 6.

pjproject/trunk/pjlib/include/pj/sock.h

@@ -290 +290 @@
 extern const pj_uint16_t PJ_SO_SNDBUF;
 
+/** IP multicast interface. @see pj_IP_MULTICAST_IF() */
+extern const pj_uint16_t PJ_IP_MULTICAST_IF;
+ 
+/** IP multicast ttl. @see pj_IP_MULTICAST_TTL() */
+extern const pj_uint16_t PJ_IP_MULTICAST_TTL;
+
+/** IP multicast loopback. @see pj_IP_MULTICAST_LOOP() */
+extern const pj_uint16_t PJ_IP_MULTICAST_LOOP;
+
+/** Add an IP group membership. @see pj_IP_ADD_MEMBERSHIP() */
+extern const pj_uint16_t PJ_IP_ADD_MEMBERSHIP;
+
+/** Drop an IP group membership. @see pj_IP_DROP_MEMBERSHIP() */
+extern const pj_uint16_t PJ_IP_DROP_MEMBERSHIP;
+
 
 #if defined(PJ_DLL)
@@ -300 +315 @@
     /** Get #PJ_SO_SNDBUF constant */
     PJ_DECL(pj_uint16_t) pj_SO_SNDBUF(void);
+
+    /** Get #PJ_IP_MULTICAST_IF constant */
+    PJ_DECL(pj_uint16_t) pj_IP_MULTICAST_IF(void);
+
+    /** Get #PJ_IP_MULTICAST_TTL constant */
+    PJ_DECL(pj_uint16_t) pj_IP_MULTICAST_TTL(void);
+
+    /** Get #PJ_IP_MULTICAST_LOOP constant */
+    PJ_DECL(pj_uint16_t) pj_IP_MULTICAST_LOOP(void);
+
+    /** Get #PJ_IP_ADD_MEMBERSHIP constant */
+    PJ_DECL(pj_uint16_t) pj_IP_ADD_MEMBERSHIP(void);
+
+    /** Get #PJ_IP_DROP_MEMBERSHIP constant */
+    PJ_DECL(pj_uint16_t) pj_IP_DROP_MEMBERSHIP(void);
 #else
     /** Get #PJ_SO_TYPE constant */
@@ -309 +339 @@
     /** Get #PJ_SO_SNDBUF constant */
 #   define pj_SO_SNDBUF()   PJ_SO_SNDBUF
+
+    /** Get #PJ_IP_MULTICAST_IF constant */
+#   define pj_IP_MULTICAST_IF()    PJ_IP_MULTICAST_IF
+
+    /** Get #PJ_IP_MULTICAST_TTL constant */
+#   define pj_IP_MULTICAST_TTL()   PJ_IP_MULTICAST_TTL
+
+    /** Get #PJ_IP_MULTICAST_LOOP constant */
+#   define pj_IP_MULTICAST_LOOP()  PJ_IP_MULTICAST_LOOP
+
+    /** Get #PJ_IP_ADD_MEMBERSHIP constant */
+#   define pj_IP_ADD_MEMBERSHIP()  PJ_IP_ADD_MEMBERSHIP
+
+    /** Get #PJ_IP_DROP_MEMBERSHIP constant */
+#   define pj_IP_DROP_MEMBERSHIP() PJ_IP_DROP_MEMBERSHIP
 #endif
 
@@ -516 +561 @@
 
 
+/**
+ * This structure provides multicast group information for IPv4 addresses.
+ */
+typedef struct pj_ip_mreq {
+    pj_in_addr imr_multiaddr;   /**< IP multicast address of group. */
+    pj_in_addr imr_interface;   /**< local IP address of interface. */
+} pj_ip_mreq;
+
+
 /*****************************************************************************
  *

pjproject/trunk/pjlib/src/pj/sock_bsd.c

@@ -116 +116 @@
 const pj_uint16_t PJ_SO_RCVBUF  = SO_RCVBUF;
 const pj_uint16_t PJ_SO_SNDBUF  = SO_SNDBUF;
+const pj_uint16_t pj_IP_MULTICAST_IF    = IP_MULTICAST_IF;
+const pj_uint16_t pj_IP_MULTICAST_TTL   = IP_MULTICAST_TTL;
+const pj_uint16_t pj_IP_MULTICAST_LOOP  = IP_MULTICAST_LOOP;
+const pj_uint16_t pj_IP_ADD_MEMBERSHIP  = IP_ADD_MEMBERSHIP;
+const pj_uint16_t pj_IP_DROP_MEMBERSHIP = IP_DROP_MEMBERSHIP;
 
 

pjproject/trunk/pjlib/src/pj/sock_common.c

@@ -687 +687 @@
 }
 
+PJ_DEF(pj_uint16_t) pj_IP_MULTICAST_IF(void)
+{
+    return PJ_IP_MULTICAST_IF;
+}
+
+PJ_DEF(pj_uint16_t) pj_IP_MULTICAST_TTL(void)
+{
+    return PJ_IP_MULTICAST_TTL;
+}
+
+PJ_DEF(pj_uint16_t) pj_IP_MULTICAST_LOOP(void)
+{
+    return PJ_IP_MULTICAST_LOOP;
+}
+
+PJ_DEF(pj_uint16_t) pj_IP_ADD_MEMBERSHIP(void)
+{
+    return PJ_IP_ADD_MEMBERSHIP;
+}
+
+PJ_DEF(pj_uint16_t) pj_IP_DROP_MEMBERSHIP(void)
+{
+    return PJ_IP_DROP_MEMBERSHIP;
+}
+
 PJ_DEF(int) pj_MSG_OOB(void)
 {

pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

@@ -65 +65 @@
 const pj_uint16_t PJ_SO_RCVBUF  = 0xFFFF;
 const pj_uint16_t PJ_SO_SNDBUF  = 0xFFFF;
+
+/* IP multicast is also not supported. */
+const pj_uint16_t pj_IP_MULTICAST_IF    = 0xFFFF;
+const pj_uint16_t pj_IP_MULTICAST_TTL   = 0xFFFF;
+const pj_uint16_t pj_IP_MULTICAST_LOOP  = 0xFFFF;
+const pj_uint16_t pj_IP_ADD_MEMBERSHIP  = 0xFFFF;
+const pj_uint16_t pj_IP_DROP_MEMBERSHIP = 0xFFFF;
 
 /* Flags */