|
|
@ -1,9 +1,9 @@
|
|
|
|
Copyright (C) 2010 Rémi Denis-Courmont.
|
|
|
|
Copyright (C) 2010 Rémi Denis-Courmont.
|
|
|
|
Licensed under GNU General Public License version 2 or higher.
|
|
|
|
Licensed under GNU General Public License version 2 or higher.
|
|
|
|
diff -ru live.orig//groupsock/Groupsock.cpp live//groupsock/Groupsock.cpp
|
|
|
|
diff -ru live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
|
|
|
|
--- live.orig//groupsock/Groupsock.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/groupsock/Groupsock.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//groupsock/Groupsock.cpp 2010-04-17 19:51:07.000000000 +0300
|
|
|
|
+++ live/groupsock/Groupsock.cpp 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -331,8 +331,10 @@
|
|
|
|
@@ -335,8 +335,10 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (DebugLevel >= 3) {
|
|
|
|
if (DebugLevel >= 3) {
|
|
|
@ -15,7 +15,7 @@ diff -ru live.orig//groupsock/Groupsock.cpp live//groupsock/Groupsock.cpp
|
|
|
|
if (numMembers > 0) {
|
|
|
|
if (numMembers > 0) {
|
|
|
|
env() << "; relayed to " << numMembers << " members";
|
|
|
|
env() << "; relayed to " << numMembers << " members";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -441,13 +443,14 @@
|
|
|
|
@@ -445,13 +447,14 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
UsageEnvironment& operator<<(UsageEnvironment& s, const Groupsock& g) {
|
|
|
|
UsageEnvironment& operator<<(UsageEnvironment& s, const Groupsock& g) {
|
|
|
@ -32,10 +32,10 @@ diff -ru live.orig//groupsock/Groupsock.cpp live//groupsock/Groupsock.cpp
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return s1 << (unsigned)(g.ttl()) << ")";
|
|
|
|
return s1 << (unsigned)(g.ttl()) << ")";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff -ru live.orig//groupsock/include/GroupsockHelper.hh live//groupsock/include/GroupsockHelper.hh
|
|
|
|
diff -ru live.orig/groupsock/include/GroupsockHelper.hh live/groupsock/include/GroupsockHelper.hh
|
|
|
|
--- live.orig//groupsock/include/GroupsockHelper.hh 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/groupsock/include/GroupsockHelper.hh 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//groupsock/include/GroupsockHelper.hh 2010-04-17 19:43:44.000000000 +0300
|
|
|
|
+++ live/groupsock/include/GroupsockHelper.hh 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -124,7 +124,7 @@
|
|
|
|
@@ -116,7 +116,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
// The following are implemented in inet.c:
|
|
|
|
// The following are implemented in inet.c:
|
|
|
|
extern "C" netAddressBits our_inet_addr(char const*);
|
|
|
|
extern "C" netAddressBits our_inet_addr(char const*);
|
|
|
@ -44,10 +44,10 @@ diff -ru live.orig//groupsock/include/GroupsockHelper.hh live//groupsock/include
|
|
|
|
extern "C" struct hostent* our_gethostbyname(char* name);
|
|
|
|
extern "C" struct hostent* our_gethostbyname(char* name);
|
|
|
|
extern "C" void our_srandom(int x);
|
|
|
|
extern "C" void our_srandom(int x);
|
|
|
|
extern "C" long our_random();
|
|
|
|
extern "C" long our_random();
|
|
|
|
diff -ru live.orig//groupsock/inet.c live//groupsock/inet.c
|
|
|
|
diff -ru live.orig/groupsock/inet.c live/groupsock/inet.c
|
|
|
|
--- live.orig//groupsock/inet.c 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/groupsock/inet.c 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//groupsock/inet.c 2010-04-17 19:42:52.000000000 +0300
|
|
|
|
+++ live/groupsock/inet.c 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -21,26 +21,18 @@
|
|
|
|
@@ -21,26 +21,19 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
char *
|
|
|
@ -65,7 +65,8 @@ diff -ru live.orig//groupsock/inet.c live//groupsock/inet.c
|
|
|
|
+ strncpy(result, ret, 16);
|
|
|
|
+ strncpy(result, ret, 16);
|
|
|
|
+ return ret;
|
|
|
|
+ return ret;
|
|
|
|
+#elif !defined (VXWORKS)
|
|
|
|
+#elif !defined (VXWORKS)
|
|
|
|
+ return inet_ntop(AF_INET, &in, result, 16);
|
|
|
|
+ inet_ntop(AF_INET, &in, result, 16);
|
|
|
|
|
|
|
|
+ return(result);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
- /* according the man pages of inet_ntoa :
|
|
|
|
- /* according the man pages of inet_ntoa :
|
|
|
|
-
|
|
|
|
-
|
|
|
@ -84,10 +85,10 @@ diff -ru live.orig//groupsock/inet.c live//groupsock/inet.c
|
|
|
|
inet_ntoa_b(in, result);
|
|
|
|
inet_ntoa_b(in, result);
|
|
|
|
return(result);
|
|
|
|
return(result);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
diff -ru live.orig//liveMedia/DarwinInjector.cpp live//liveMedia/DarwinInjector.cpp
|
|
|
|
diff -ru live.orig/liveMedia/DarwinInjector.cpp live/liveMedia/DarwinInjector.cpp
|
|
|
|
--- live.orig//liveMedia/DarwinInjector.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/DarwinInjector.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//liveMedia/DarwinInjector.cpp 2010-04-17 19:45:19.000000000 +0300
|
|
|
|
+++ live/liveMedia/DarwinInjector.cpp 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -128,7 +128,8 @@
|
|
|
|
@@ -146,7 +146,8 @@
|
|
|
|
NetAddress const* address = addresses.firstAddress();
|
|
|
|
NetAddress const* address = addresses.firstAddress();
|
|
|
|
addr.s_addr = *(unsigned*)(address->data());
|
|
|
|
addr.s_addr = *(unsigned*)(address->data());
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -97,9 +98,9 @@ diff -ru live.orig//liveMedia/DarwinInjector.cpp live//liveMedia/DarwinInjector.
|
|
|
|
|
|
|
|
|
|
|
|
// Construct a SDP description for the session that we'll be streaming:
|
|
|
|
// Construct a SDP description for the session that we'll be streaming:
|
|
|
|
char const* const sdpFmt =
|
|
|
|
char const* const sdpFmt =
|
|
|
|
diff -ru live.orig//liveMedia/OnDemandServerMediaSubsession.cpp live//liveMedia/OnDemandServerMediaSubsession.cpp
|
|
|
|
diff -ru live.orig/liveMedia/OnDemandServerMediaSubsession.cpp live/liveMedia/OnDemandServerMediaSubsession.cpp
|
|
|
|
--- live.orig//liveMedia/OnDemandServerMediaSubsession.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/OnDemandServerMediaSubsession.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//liveMedia/OnDemandServerMediaSubsession.cpp 2010-04-17 19:50:05.000000000 +0300
|
|
|
|
+++ live/liveMedia/OnDemandServerMediaSubsession.cpp 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -365,7 +365,8 @@
|
|
|
|
@@ -365,7 +365,8 @@
|
|
|
|
char const* mediaType = rtpSink->sdpMediaType();
|
|
|
|
char const* mediaType = rtpSink->sdpMediaType();
|
|
|
|
unsigned char rtpPayloadType = rtpSink->rtpPayloadType();
|
|
|
|
unsigned char rtpPayloadType = rtpSink->rtpPayloadType();
|
|
|
@ -119,9 +120,9 @@ diff -ru live.orig//liveMedia/OnDemandServerMediaSubsession.cpp live//liveMedia/
|
|
|
|
|
|
|
|
|
|
|
|
fSDPLines = strDup(sdpLines);
|
|
|
|
fSDPLines = strDup(sdpLines);
|
|
|
|
delete[] sdpLines;
|
|
|
|
delete[] sdpLines;
|
|
|
|
diff -ru live.orig//liveMedia/PassiveServerMediaSubsession.cpp live//liveMedia/PassiveServerMediaSubsession.cpp
|
|
|
|
diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/PassiveServerMediaSubsession.cpp
|
|
|
|
--- live.orig//liveMedia/PassiveServerMediaSubsession.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/PassiveServerMediaSubsession.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//liveMedia/PassiveServerMediaSubsession.cpp 2010-04-17 19:46:28.000000000 +0300
|
|
|
|
+++ live/liveMedia/PassiveServerMediaSubsession.cpp 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -54,7 +54,8 @@
|
|
|
|
@@ -54,7 +54,8 @@
|
|
|
|
char const* auxSDPLine = fRTPSink.auxSDPLine();
|
|
|
|
char const* auxSDPLine = fRTPSink.auxSDPLine();
|
|
|
|
if (auxSDPLine == NULL) auxSDPLine = "";
|
|
|
|
if (auxSDPLine == NULL) auxSDPLine = "";
|
|
|
@ -141,39 +142,26 @@ diff -ru live.orig//liveMedia/PassiveServerMediaSubsession.cpp live//liveMedia/P
|
|
|
|
|
|
|
|
|
|
|
|
fSDPLines = strDup(sdpLines);
|
|
|
|
fSDPLines = strDup(sdpLines);
|
|
|
|
delete[] sdpLines;
|
|
|
|
delete[] sdpLines;
|
|
|
|
diff -ru live.orig//liveMedia/RTCP.cpp live//liveMedia/RTCP.cpp
|
|
|
|
diff -ru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
|
|
|
|
--- live.orig//liveMedia/RTCP.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/RTSPClient.cpp 2010-10-20 12:34:33.662177993 +0200
|
|
|
|
+++ live//liveMedia/RTCP.cpp 2010-04-17 19:46:44.000000000 +0300
|
|
|
|
+++ live/liveMedia/RTSPClient.cpp 2010-10-20 12:34:04.762178010 +0200
|
|
|
|
@@ -359,7 +359,8 @@
|
|
|
|
@@ -411,7 +411,8 @@
|
|
|
|
}
|
|
|
|
int RTSPClient::connectToServer(int socketNum, portNumBits remotePortNum) {
|
|
|
|
|
|
|
|
MAKE_SOCKADDR_IN(remoteName, fServerAddress, htons(remotePortNum));
|
|
|
|
#ifdef DEBUG
|
|
|
|
if (fVerbosityLevel >= 1) {
|
|
|
|
- fprintf(stderr, "[%p]saw incoming RTCP packet (from address %s, port %d)\n", this, our_inet_ntoa(fromAddress.sin_addr), ntohs(fromAddress.sin_port));
|
|
|
|
- envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr) << ", port " << remotePortNum << "...\n";
|
|
|
|
+ char buf[16];
|
|
|
|
+ char buf[16];
|
|
|
|
+ fprintf(stderr, "[%p]saw incoming RTCP packet (from address %s, port %d)\n", this, our_inet_ntoa(fromAddress.sin_addr, buf), ntohs(fromAddress.sin_port));
|
|
|
|
+ envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr, buf) << ", port " << remotePortNum << "...\n";
|
|
|
|
unsigned char* p = pkt;
|
|
|
|
}
|
|
|
|
for (unsigned i = 0; i < packetSize; ++i) {
|
|
|
|
if (connect(socketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
|
|
|
|
if (i%4 == 0) fprintf(stderr, " ");
|
|
|
|
if (envir().getErrno() == EINPROGRESS) {
|
|
|
|
diff -ru live.orig//liveMedia/RTSPOverHTTPServer.cpp live//liveMedia/RTSPOverHTTPServer.cpp
|
|
|
|
diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
|
|
|
|
--- live.orig//liveMedia/RTSPOverHTTPServer.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/RTSPServer.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//liveMedia/RTSPOverHTTPServer.cpp 2010-04-17 19:50:41.000000000 +0300
|
|
|
|
+++ live/liveMedia/RTSPServer.cpp 2010-10-20 12:34:04.772177998 +0200
|
|
|
|
@@ -128,7 +128,8 @@
|
|
|
|
@@ -111,11 +111,12 @@
|
|
|
|
makeSocketNonBlocking(clientSocket);
|
|
|
|
|
|
|
|
increaseSendBufferTo(envir(), clientSocket, 50*1024);
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DEBUG_CONNECTIONS)
|
|
|
|
|
|
|
|
- fprintf(stderr, "accept()ed connection from %s\n", our_inet_ntoa(clientAddr.sin_addr));
|
|
|
|
|
|
|
|
+ char buf[16];
|
|
|
|
|
|
|
|
+ fprintf(stderr, "accept()ed connection from %s\n", our_inet_ntoa(clientAddr.sin_addr, buf));
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Create a new object for handling this HTTP connection:
|
|
|
|
|
|
|
|
diff -ru live.orig//liveMedia/RTSPServer.cpp live//liveMedia/RTSPServer.cpp
|
|
|
|
|
|
|
|
--- live.orig//liveMedia/RTSPServer.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
|
|
|
|
+++ live//liveMedia/RTSPServer.cpp 2010-04-17 19:49:32.000000000 +0300
|
|
|
|
|
|
|
|
@@ -112,11 +112,12 @@
|
|
|
|
|
|
|
|
char urlBuffer[100]; // more than big enough for "rtsp://<ip-address>:<port>/"
|
|
|
|
char urlBuffer[100]; // more than big enough for "rtsp://<ip-address>:<port>/"
|
|
|
|
|
|
|
|
|
|
|
|
portNumBits portNumHostOrder = ntohs(fServerPort.num());
|
|
|
|
portNumBits portNumHostOrder = ntohs(fRTSPServerPort.num());
|
|
|
|
+ char buf[16];
|
|
|
|
+ char buf[16];
|
|
|
|
if (portNumHostOrder == 554 /* the default port number */) {
|
|
|
|
if (portNumHostOrder == 554 /* the default port number */) {
|
|
|
|
- sprintf(urlBuffer, "rtsp://%s/", our_inet_ntoa(ourAddress.sin_addr));
|
|
|
|
- sprintf(urlBuffer, "rtsp://%s/", our_inet_ntoa(ourAddress.sin_addr));
|
|
|
@ -185,32 +173,30 @@ diff -ru live.orig//liveMedia/RTSPServer.cpp live//liveMedia/RTSPServer.cpp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return strDup(urlBuffer);
|
|
|
|
return strDup(urlBuffer);
|
|
|
|
@@ -233,7 +234,8 @@
|
|
|
|
@@ -264,7 +265,8 @@
|
|
|
|
increaseSendBufferTo(envir(), clientSocket, 50*1024);
|
|
|
|
increaseSendBufferTo(envir(), clientSocket, 50*1024);
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DEBUG_CONNECTIONS)
|
|
|
|
#ifdef DEBUG
|
|
|
|
- envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr) << '\n';
|
|
|
|
- envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr) << '\n';
|
|
|
|
+ char buf[16];
|
|
|
|
+ char buf[16];
|
|
|
|
+ envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr, buf) << '\n';
|
|
|
|
+ envir() << "accept()ed connection from " << our_inet_ntoa(clientAddr.sin_addr, buf) << '\n';
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
// Create a new object for this RTSP session.
|
|
|
|
// Create a new object for this RTSP session.
|
|
|
|
@@ -747,10 +749,12 @@
|
|
|
|
@@ -860,8 +862,10 @@
|
|
|
|
serverRTPPort, serverRTCPPort,
|
|
|
|
ReceivingInterfaceAddr = origReceivingInterfaceAddr;
|
|
|
|
fStreamStates[streamNum].streamToken);
|
|
|
|
|
|
|
|
struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
|
|
|
|
struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
|
|
|
|
- char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
|
|
|
|
- char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
|
|
|
|
|
|
|
|
- char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
|
|
|
|
+ char destAddrStr[16];
|
|
|
|
+ char destAddrStr[16];
|
|
|
|
+ our_inet_ntoa(destinationAddr, destAddrStr);
|
|
|
|
+ our_inet_ntoa(destinationAddr, destAddrStr);
|
|
|
|
struct sockaddr_in sourceAddr; SOCKLEN_T namelen = sizeof sourceAddr;
|
|
|
|
|
|
|
|
getsockname(fClientSocket, (struct sockaddr*)&sourceAddr, &namelen);
|
|
|
|
|
|
|
|
- char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
|
|
|
|
|
|
|
|
+ char sourceAddrStr[16];
|
|
|
|
+ char sourceAddrStr[16];
|
|
|
|
+ our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
|
|
|
|
+ our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
|
|
|
|
if (fIsMulticast) {
|
|
|
|
if (fIsMulticast) {
|
|
|
|
switch (streamingMode) {
|
|
|
|
switch (streamingMode) {
|
|
|
|
case RTP_UDP:
|
|
|
|
case RTP_UDP:
|
|
|
|
@@ -825,7 +829,7 @@
|
|
|
|
@@ -936,7 +940,7 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -219,7 +205,7 @@ diff -ru live.orig//liveMedia/RTSPServer.cpp live//liveMedia/RTSPServer.cpp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RTSPServer::RTSPClientSession
|
|
|
|
void RTSPServer::RTSPClientSession
|
|
|
|
@@ -1226,7 +1230,8 @@
|
|
|
|
@@ -1446,7 +1450,8 @@
|
|
|
|
// If this gets called, the client session is assumed to have timed out,
|
|
|
|
// If this gets called, the client session is assumed to have timed out,
|
|
|
|
// so delete it:
|
|
|
|
// so delete it:
|
|
|
|
#ifdef DEBUG
|
|
|
|
#ifdef DEBUG
|
|
|
@ -229,9 +215,9 @@ diff -ru live.orig//liveMedia/RTSPServer.cpp live//liveMedia/RTSPServer.cpp
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
delete clientSession;
|
|
|
|
delete clientSession;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff -ru live.orig//liveMedia/ServerMediaSession.cpp live//liveMedia/ServerMediaSession.cpp
|
|
|
|
diff -ru live.orig/liveMedia/ServerMediaSession.cpp live/liveMedia/ServerMediaSession.cpp
|
|
|
|
--- live.orig//liveMedia/ServerMediaSession.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/ServerMediaSession.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//liveMedia/ServerMediaSession.cpp 2010-04-17 19:50:31.000000000 +0300
|
|
|
|
+++ live/liveMedia/ServerMediaSession.cpp 2010-10-20 12:34:04.772177998 +0200
|
|
|
|
@@ -185,7 +185,8 @@
|
|
|
|
@@ -185,7 +185,8 @@
|
|
|
|
char* ServerMediaSession::generateSDPDescription() {
|
|
|
|
char* ServerMediaSession::generateSDPDescription() {
|
|
|
|
struct in_addr ipAddress;
|
|
|
|
struct in_addr ipAddress;
|
|
|
@ -251,9 +237,9 @@ diff -ru live.orig//liveMedia/ServerMediaSession.cpp live//liveMedia/ServerMedia
|
|
|
|
return sdp;
|
|
|
|
return sdp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
diff -ru live.orig//liveMedia/SIPClient.cpp live//liveMedia/SIPClient.cpp
|
|
|
|
diff -ru live.orig/liveMedia/SIPClient.cpp live/liveMedia/SIPClient.cpp
|
|
|
|
--- live.orig//liveMedia/SIPClient.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/liveMedia/SIPClient.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//liveMedia/SIPClient.cpp 2010-04-17 19:47:42.000000000 +0300
|
|
|
|
+++ live/liveMedia/SIPClient.cpp 2010-10-20 12:34:04.772177998 +0200
|
|
|
|
@@ -60,13 +60,14 @@
|
|
|
|
@@ -60,13 +60,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
struct in_addr ourAddress;
|
|
|
|
struct in_addr ourAddress;
|
|
|
@ -280,9 +266,9 @@ diff -ru live.orig//liveMedia/SIPClient.cpp live//liveMedia/SIPClient.cpp
|
|
|
|
<< fOurPortNum << ": "
|
|
|
|
<< fOurPortNum << ": "
|
|
|
|
<< env.getResultMsg() << "\n";
|
|
|
|
<< env.getResultMsg() << "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff -ru live.orig//testProgs/sapWatch.cpp live//testProgs/sapWatch.cpp
|
|
|
|
diff -ru live.orig/testProgs/sapWatch.cpp live/testProgs/sapWatch.cpp
|
|
|
|
--- live.orig//testProgs/sapWatch.cpp 2010-04-09 22:27:39.000000000 +0300
|
|
|
|
--- live.orig/testProgs/sapWatch.cpp 2010-10-20 10:31:13.000000000 +0200
|
|
|
|
+++ live//testProgs/sapWatch.cpp 2010-04-17 19:51:29.000000000 +0300
|
|
|
|
+++ live/testProgs/sapWatch.cpp 2010-10-20 12:34:04.772177998 +0200
|
|
|
|
@@ -49,13 +49,14 @@
|
|
|
|
@@ -49,13 +49,14 @@
|
|
|
|
struct sockaddr_in fromAddress;
|
|
|
|
struct sockaddr_in fromAddress;
|
|
|
|
while (inputGroupsock.handleRead(packet, maxPacketSize,
|
|
|
|
while (inputGroupsock.handleRead(packet, maxPacketSize,
|
|
|
|