Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
e6d25cc5
Commit
e6d25cc5
authored
Sep 24, 2010
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: updated live patch
parent
589a6b50
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
extras/contrib/src/Patches/live-inet_ntop.patch
extras/contrib/src/Patches/live-inet_ntop.patch
+8
-10
No files found.
extras/contrib/src/Patches/live-inet_ntop.patch
View file @
e6d25cc5
...
...
@@ -169,8 +169,8 @@ diff -ru live.orig/liveMedia/RTSPOverHTTPServer.cpp live/liveMedia/RTSPOverHTTPS
// 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-0
5-30 01:20:31.000000000 +03
00
+++ live/liveMedia/RTSPServer.cpp 2010-0
6-06 00:34:03.000000000 +03
00
--- live.orig/liveMedia/RTSPServer.cpp 2010-0
9-23 17:15:48.000000000 +02
00
+++ live/liveMedia/RTSPServer.cpp 2010-0
9-24 12:49:57.000000000 +02
00
@@ -112,11 +112,12 @@
char urlBuffer[100]; // more than big enough for "rtsp://<ip-address>:<port>/"
...
...
@@ -196,22 +196,20 @@ diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
#endif
// Create a new object for this RTSP session.
@@ -7
47,10 +749,12
@@
serverRTPPort, serverRTCPPort,
fStreamStates[streamNum].streamToken);
@@ -7
61,8 +763,10
@@
ReceivingInterfaceAddr = origReceivingInterfaceAddr;
struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
- char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
- char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
+ char destAddrStr[16];
+ 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];
+ our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
if (fIsMulticast) {
switch (streamingMode) {
case RTP_UDP:
@@ -8
25,7 +829
,7 @@
@@ -8
37,7 +841
,7 @@
}
}
}
...
...
@@ -220,7 +218,7 @@ diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
}
void RTSPServer::RTSPClientSession
@@ -12
26,7 +1230
,8 @@
@@ -12
38,7 +1242
,8 @@
// If this gets called, the client session is assumed to have timed out,
// so delete it:
#ifdef DEBUG
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment