vdr-iptv: update to vdr-iptv-0.5.2

This commit is contained in:
Stefan Saraev 2012-04-27 12:36:23 +03:00
parent 94dff82c91
commit 10b9a80362
4 changed files with 2 additions and 66 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="vdr-iptv" PKG_NAME="vdr-iptv"
PKG_VERSION="0.5.0" PKG_VERSION="0.5.2"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -1,36 +0,0 @@
commit 9766e893eb3ed1076e41f89b663b3be122355f39
Author: Stefan Saraev <stefan@saraev.ca>
Date: Wed Mar 7 00:13:55 2012 +0200
vdr-iptv: protocolhttp socket connect() fix
diff --git a/protocolhttp.c b/protocolhttp.c
index 62abbd6..2d5277a 100644
--- a/protocolhttp.c
+++ b/protocolhttp.c
@@ -42,6 +42,25 @@ bool cIptvProtocolHttp::Connect(void)
if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) {
// Ensure that socket is valid and connect
OpenSocket(socketPort, streamAddr);
+
+ // First try only the IP address
+ sockAddr.sin_addr.s_addr = inet_addr(streamAddr);
+
+ if (sockAddr.sin_addr.s_addr == INADDR_NONE) {
+ debug("Cannot convert %s directly to internet address\n", streamAddr);
+
+ // It may be a host name, get the name
+ struct hostent *host;
+ host = gethostbyname(streamAddr);
+ if (!host) {
+ char tmp[64];
+ error("%s is not valid address: %s", streamAddr, strerror_r(h_errno, tmp, sizeof(tmp)));
+ return false;
+ }
+
+ sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list);
+ }
+
if (!ConnectSocket()) {
CloseSocket();
return false;

View File

@ -1,29 +0,0 @@
commit 67d5e792aa30100b111490c3c9e1c01f9def3c86
Author: Stefan Saraev <stefan@saraev.ca>
Date: Thu Mar 15 00:02:50 2012 +0200
vdr-iptv: skip header processing
diff --git a/protocolhttp.c b/protocolhttp.c
index 2d5277a..9b305aa 100644
--- a/protocolhttp.c
+++ b/protocolhttp.c
@@ -154,17 +154,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
memset(buf, '\0', sizeof(buf));
if (!GetHeaderLine(buf, sizeof(buf), lineLength))
return false;
- if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ", &response) != 1) {
- error("Expected HTTP header not found\n");
- continue;
- }
- else
- responseFound = true;
- // Allow only 'OK' and 'Partial Content'
- if ((response != 200) && (response != 206)) {
- error("Invalid HTTP response (%d): %s\n", response, buf);
- return false;
- }
+ responseFound = true;
}
return true;
}

View File

@ -3,6 +3,7 @@
- added rotorng plugin - added rotorng plugin
- added control plugin - added control plugin
- added epgsearch plugin - added epgsearch plugin
- update to vdr-iptv-0.5.2
2.1.3 2.1.3
- adjust for fontconfig 2.9.0 - adjust for fontconfig 2.9.0