fix in6_addr problems

[record-dvb] / record-dvb.c

diff --git a/record-dvb.c b/record-dvb.c
index 38609a4996c27cf7caea23c89a8469e22c57fe00..fa301f49b81f0bcbfc76e002741724da33d7db37 100644 (file)
--- a/record-dvb.c
+++ b/record-dvb.c
@@ -6,15 +6,20 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/select.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <strings.h>
+#include <netdb.h>
 
 #include "http.h"
 #include "mcast.h"
+#include "sap.h"
+#include "common.h"
 
-#define CHUNKSIZE 3000
-#define GTOD_INTERVAL 100
+#define CHUNKSIZE      3000
+#define GTOD_INTERVAL  100
+#define MAX_ERROR_SLEEP        60
 
 void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
 {
@@ -23,6 +28,9 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
        int error_sleep = 0;
        char buffer[CHUNKSIZE];
        int in, out;
+       fd_set rfds;
+       struct timeval tv;
+       int retval;
 
        if ((in = (*open_fn)(url)) < 0) {
                fprintf(stderr,"Can't open url %s!\n",url);
@@ -44,9 +52,12 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
                        sleep(error_sleep);
                        printf("Reconnecting... ");
                        if ((in = (*open_fn)(url)) < 0) {
-                               if (error_sleep < 60)
+                               if (error_sleep < MAX_ERROR_SLEEP)
                                        error_sleep *= 2;
 
+                               if (error_sleep > MAX_ERROR_SLEEP)
+                                       error_sleep = MAX_ERROR_SLEEP;
+
                                printf("failed\n");
                                continue;
                        } else {
@@ -55,6 +66,22 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
                        }
                }
 
+               FD_ZERO(&rfds);
+               FD_SET(in, &rfds);
+
+               tv.tv_sec = 1;
+               tv.tv_usec = 0;
+
+               if ((retval = select(in + 1, &rfds, NULL, NULL, &tv)) == -1) {
+                       error_sleep = 1;
+                       continue;
+               }
+
+               if (!retval) {
+                       gettimeofday(&curr, NULL);
+                       continue;
+               }
+
                if ((recvd = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
                        error_sleep = 1;
                        continue;
@@ -89,16 +116,24 @@ int main(int argc, char **argv)
                duration = atoi(argv[2])*60;
                outfile = argv[3];
        } else {
-               fprintf(stderr,"Syntax: %s URL duration_in_minutes outfile\n", argv[0]);
+               fprintf(stderr,"Syntax: %s URL|SAPServiceName duration_in_minutes outfile\n", argv[0]);
                exit(EXIT_FAILURE);
        }
 
+       if (!is_url(url)) {
+               char *service_url;
+               if ((service_url = get_url_from_sap(url))) {
+                       printf("SAP says: '%s' -> %s\n", url, service_url);
+                       url = service_url;
+               }
+       }
+
        if (is_http(url)) {
                open_fn = &open_http;
        } else if (is_mcast(url)) {
                open_fn = &open_mcast;
        } else {
-               printf("URL %s not supported!\n", url);
+               printf("URL '%s' not supported!\n", url);
                exit(EXIT_FAILURE);
        }