add SAP/SDP support

[record-dvb] / record-dvb.c

diff --git a/record-dvb.c b/record-dvb.c
index 02fcd5157c2d9d3ae17ae6231ebe19132144e8ca..d87d3e789ce362110c7161030ad1918e10398b12 100644 (file)
--- a/record-dvb.c
+++ b/record-dvb.c
@@ -12,14 +12,17 @@
 
 #include "http.h"
 #include "mcast.h"
+#include "sap.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;
 
@@ -39,13 +42,28 @@ 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;
                        }
                }
+
+               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 +98,20 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
+       if (!is_http(url) && !is_mcast(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);
        }