frodovdr/vdr-plugin-iptv
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-iptv.git synced 2023-10-10 13:37:03 +02:00
Code Issues Releases Wiki Activity

Fixed header 'Id:' keywords.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2007-09-29 16:21:04 +00:00
parent b8bde0422c
commit e579aeb5bf
16 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile,v 1.12 2007/09/28 23:23:12 rahrenbe Exp $ # $Id: Makefile,v 1.13 2007/09/29 16:21:04 rahrenbe Exp $
# Debugging on/off # Debugging on/off
#IPTV_DEBUG = 1 #IPTV_DEBUG = 1

2
common.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: common.h,v 1.1 2007/09/12 17:28:59 rahrenbe Exp $ * $Id: common.h,v 1.2 2007/09/29 16:23:40 rahrenbe Exp $
*/ */
#ifndef __IPTV_COMMON_H #ifndef __IPTV_COMMON_H

2
config.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: config.c,v 1.8 2007/09/28 19:56:03 rahrenbe Exp $ * $Id: config.c,v 1.9 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include "common.h" #include "common.h"

2
config.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: config.h,v 1.6 2007/09/28 16:44:59 rahrenbe Exp $ * $Id: config.h,v 1.7 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#ifndef __IPTV_CONFIG_H #ifndef __IPTV_CONFIG_H

2
device.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: device.c,v 1.44 2007/09/28 23:23:12 rahrenbe Exp $ * $Id: device.c,v 1.45 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include "common.h" #include "common.h"

2
device.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: device.h,v 1.21 2007/09/28 23:23:12 rahrenbe Exp $ * $Id: device.h,v 1.22 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#ifndef __IPTV_DEVICE_H #ifndef __IPTV_DEVICE_H

2
iptv.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: iptv.c,v 1.6 2007/09/28 16:44:59 rahrenbe Exp $ * $Id: iptv.c,v 1.7 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include <getopt.h> #include <getopt.h>

10
po/fi_FI.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
"POT-Creation-Date: 2007-09-28 18:57+0300\n" "POT-Creation-Date: 2007-09-29 19:09+0300\n"
"PO-Revision-Date: 2007-08-12 23:22+0300\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n"
"Last-Translator: Rolf Ahrenberg\n" "Last-Translator: Rolf Ahrenberg\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -43,18 +43,18 @@ msgstr "Osoite"
msgid "Port" msgid "Port"
msgstr "Portti" msgstr "Portti"
#: setup.c:296 #: setup.c:297
msgid "IPTV Channels" msgid "IPTV Channels"
msgstr "IPTV-kanavat" msgstr "IPTV-kanavat"
#: setup.c:430 #: setup.c:441
msgid "TS buffer size [MB]" msgid "TS buffer size [MB]"
msgstr "TS-puskurin koko [MB]" msgstr "TS-puskurin koko [MB]"
#: setup.c:431 #: setup.c:442
msgid "TS buffer prefill ratio [%]" msgid "TS buffer prefill ratio [%]"
msgstr "TS-puskurin esitäyttöaste [%]" msgstr "TS-puskurin esitäyttöaste [%]"
#: setup.c:432 #: setup.c:443
msgid "FILE protocol idle time [ms]" msgid "FILE protocol idle time [ms]"
msgstr "FILE-prokollan joutoaika [ms]" msgstr "FILE-prokollan joutoaika [ms]"

27
protocolhttp.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: protocolhttp.c,v 1.8 2007/09/29 11:17:57 ajhseppa Exp $ * $Id: protocolhttp.c,v 1.9 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -220,17 +220,14 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
unsigned int &recvLen) unsigned int &recvLen)
{ {
debug("cIptvProtocolHttp::GetHeaderLine()\n"); debug("cIptvProtocolHttp::GetHeaderLine()\n");
bool linefeed = false; bool linefeed = false;
bool newline = false; bool newline = false;
char buf[256]; char buf[256];
//int bufferPosition = 0;
char *bufptr = buf; char *bufptr = buf;
memset(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
recvLen = 0; recvLen = 0;
while (!newline || !linefeed) { while (!newline || !linefeed) {
socklen_t addrlen = sizeof(sockAddr); socklen_t addrlen = sizeof(sockAddr);
// Set argument point to read buffer // Set argument point to read buffer
// Wait for data // Wait for data
@ -252,39 +249,33 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen,
else if (retval) { else if (retval) {
int retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT, int retval = recvfrom(socketDesc, bufptr, 1, MSG_DONTWAIT,
(struct sockaddr *)&sockAddr, &addrlen); (struct sockaddr *)&sockAddr, &addrlen);
if (retval <= 0) if (retval <= 0)
return false; return false;
// Parsing end conditions, if line ends with \r\n // Parsing end conditions, if line ends with \r\n
if (linefeed && *bufptr == '\n') { if (linefeed && *bufptr == '\n')
newline = true; newline = true;
// First occurrence of \r seen // First occurrence of \r seen
} else if (*bufptr == '\r') else if (*bufptr == '\r')
linefeed = true; linefeed = true;
// Saw just data or \r without \n // Saw just data or \r without \n
else { else {
linefeed = false; linefeed = false;
++recvLen; ++recvLen;
} }
++bufptr; ++bufptr;
// Check that buffers won't be exceeded // Check that buffers won't be exceeded
if (recvLen >= sizeof(buf) || recvLen >= destLen) { if (recvLen >= sizeof(buf) || recvLen >= destLen) {
error("Header wouldn't fit into buffer\n"); error("Header wouldn't fit into buffer\n");
return false; return false;
} }
}
} else { else {
error("No HTTP response received\n"); error("No HTTP response received\n");
return false; return false;
} }
} }
memcpy(dest, buf, recvLen); memcpy(dest, buf, recvLen);
return true; return true;
} }
bool cIptvProtocolHttp::ProcessHeaders(void) bool cIptvProtocolHttp::ProcessHeaders(void)
@ -297,16 +288,14 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
while (!responseFound || lineLength != 0) { while (!responseFound || lineLength != 0) {
memset(buf, '\0', sizeof(buf)); memset(buf, '\0', sizeof(buf));
if (!GetHeaderLine(buf, sizeof(buf), lineLength)) if (!GetHeaderLine(buf, sizeof(buf), lineLength))
return false; return false;
if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ",&response) != 1) { if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ",&response) != 1) {
error("Expected HTTP -header not found\n"); error("Expected HTTP header not found\n");
continue; continue;
} else }
else
responseFound = true; responseFound = true;
if (response != 200) { if (response != 200) {
error("ERROR: %s\n", buf); error("ERROR: %s\n", buf);
return false; return false;

2
protocolif.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: protocolif.h,v 1.3 2007/09/15 21:27:00 rahrenbe Exp $ * $Id: protocolif.h,v 1.4 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#ifndef __IPTV_PROTOCOLIF_H #ifndef __IPTV_PROTOCOLIF_H

2
protocoludp.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: protocoludp.c,v 1.9 2007/09/28 18:48:07 rahrenbe Exp $ * $Id: protocoludp.c,v 1.10 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>

2
protocoludp.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: protocoludp.h,v 1.6 2007/09/28 16:44:59 rahrenbe Exp $ * $Id: protocoludp.h,v 1.7 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#ifndef __IPTV_PROTOCOLUDP_H #ifndef __IPTV_PROTOCOLUDP_H

2
setup.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: setup.c,v 1.12 2007/09/29 12:33:48 ajhseppa Exp $ * $Id: setup.c,v 1.13 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include <string.h> #include <string.h>

2
setup.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: setup.h,v 1.6 2007/09/28 16:44:59 rahrenbe Exp $ * $Id: setup.h,v 1.7 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#ifndef __IPTV_SETUP_H #ifndef __IPTV_SETUP_H

2
streamer.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: streamer.c,v 1.15 2007/09/29 11:17:57 ajhseppa Exp $ * $Id: streamer.c,v 1.16 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#include <vdr/thread.h> #include <vdr/thread.h>

2
streamer.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: streamer.h,v 1.6 2007/09/14 15:44:25 rahrenbe Exp $ * $Id: streamer.h,v 1.7 2007/09/29 16:21:05 rahrenbe Exp $
*/ */
#ifndef __IPTV_STREAMER_H #ifndef __IPTV_STREAMER_H