better url detection

[record-dvb] / record-dvb.c

diff --git a/record-dvb.c b/record-dvb.c
index 02fcd5157c2d9d3ae17ae6231ebe19132144e8ca..5a055b8525d9a500c255318bc1f8d2bcc26ce144 100644 (file)
--- a/record-dvb.c
+++ b/record-dvb.c
@@ -6,22 +6,31 @@
 #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)
 {
        struct timeval start, curr;
        int bytes, recvd, written, count = 0;
+       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);
@@ -39,13 +48,44 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
        curr = start;
 
        do {
-               if ((recvd = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
-                       /* TODO: Insert better connection-loss recovery here */
+               if (error_sleep) {
+                       sleep(error_sleep);
+                       printf("Reconnecting... ");
                        if ((in = (*open_fn)(url)) < 0) {
-                               sleep(1);
+                               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 {
+                               printf("succeeded\n");
+                               error_sleep = 0;
                        }
                }
+
+               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;
+               }
                written = 0;
                do {
                        if ((bytes = write(out, buffer, recvd-written)) < 0) {
@@ -80,12 +120,20 @@ int main(int argc, char **argv)
                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);
        }