Changeset 46

Timestamp:

05/04/08 16:53:35 (4 months ago)

Author:

sip

Message:

Added multicast support

Files:

• media/src/rtpsession.cpp (modified) (9 diffs)

media/src/rtpsession.cpp

@@ -1 +1 @@
-#include <sys/socket.h>
+#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
@@ -82 +83 @@
-int RTPSession::Init()
-{
+        Log(">Init RTPSession\n");
+
-        struct sockaddr_in sendAddr;
-        socklen_t len;
+        int optval = 1;
-
-        /* empty addres */
@@ -90 +94 @@
-        sendAddr.sin_family = AF_INET;
-
-* Create sockets */
+/ Create sockets
-        simSocket = socket(PF_INET,SOCK_DGRAM,0);
+        // set SO_REUSEADDR on a socket to true (1):
+        setsockopt(simSocket, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
+        //Bind
-        bind(simSocket,(struct sockaddr *)&sendAddr,sizeof(struct sockaddr_in));
+
+        // Open next socket
-        simRtcpSocket = socket(PF_INET,SOCK_DGRAM,0);
+        // set SO_REUSEADDR on a socket to true (1):
+        setsockopt(simRtcpSocket, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
+        // Bind
-        bind(simRtcpSocket,(struct sockaddr *)&sendAddr,sizeof(struct sockaddr_in));
-
@@ -115 +127 @@
-                /* Create new socket */
-                simRtcpSocket = socket(PF_INET,SOCK_DGRAM,0);
+                // set SO_REUSEADDR on a socket to true (1):
+                setsockopt(simRtcpSocket, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
-                /* Get port */
-                sendAddr.sin_port = htons(0);
@@ -123 +137 @@
-        }
-
+        Log("<Init RTPSession\n");
+
-        //Opened
-        return 1;
@@ -220 +236 @@
-int RTPSession::GetVideoPacket(BYTE *data,DWORD *size,BYTE *last,BYTE *lost,BYTE *type)
-{
+        sockaddr_in from_addr;
+        DWORD from_len = sizeof(from_addr);
+
-        //Esperamos
-        if(!WaitForSocket(simSocket,1))
@@ -225 +244 @@
-                return 0;
-
+        //Receive from everywhere
+        memset(&from_addr, 0, from_len);
+
-        //Leemos del socket
-(simSocket,recBuffer,MTU,0
+from(simSocket,recBuffer,MTU,0,(sockaddr*)&from_addr, &from_len
-
-        //Comprobamos que nos haya devuelto algo
@@ -318 +340 @@
-int RTPSession::GetAudioPacket(BYTE *data,DWORD *size,BYTE *lost,BYTE *type,DWORD *timestamp)
-{
+        sockaddr_in from_addr;
+        DWORD from_len = sizeof(from_addr);
+
-        //Esperamos
-        if(!WaitForSocket(simSocket,1))
@@ -323 +348 @@
-                return 0;
-
+        //Receive from everywhere
+        memset(&from_addr, 0, from_len);
+
-        //Leemos del socket
-(simSocket,recBuffer,MTU,0
+from(simSocket,recBuffer,MTU,0,(sockaddr*)&from_addr, &from_len
-
-        //Comprobamos que nos haya devuelto algo