interpret server response

[record-dvb] / record-dvb.c

diff --git a/record-dvb.c b/record-dvb.c
index 63102cfa3d4bd901d3aa9b7ca964cb18b325b192..bc47ecfe3b60d7f3ee0293658826ad91dcfdca7a 100644 (file)
--- a/record-dvb.c
+++ b/record-dvb.c
@@ -13,12 +13,13 @@
 #include "http.h"
 #include "mcast.h"
 
-#define CHUNKSIZE 8192
+#define CHUNKSIZE 1500
+#define GTOD_INTERVAL 100
 
 void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
 {
        struct timeval start, curr;
-       int bytes, written;
+       int bytes, written, count = 0;
        char buffer[CHUNKSIZE];
        int i;
        int in, out;
@@ -36,13 +37,16 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
        printf("Recording from %s for %d seconds...\n", url, duration);
 
        gettimeofday(&start, NULL);
+       curr = start;
 
        do {
                if ((bytes = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
                        /* TODO: Insert better connection-loss recovery here */
-                       in = (*open_fn)(url);
+                       if ((in = (*open_fn)(url)) < 0) {
+                               sleep(1);
+                               continue;
+                       }
                }
-
                written = 0;
                do {
                        if ((i = write(out, buffer, bytes-written)) < 0) {
@@ -52,7 +56,10 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
                        written += i;
                } while(written < bytes);
 
-               gettimeofday(&curr, NULL);
+               count++;
+
+               if (!(count % GTOD_INTERVAL))
+                       gettimeofday(&curr, NULL);
        } while (curr.tv_sec < start.tv_sec+duration);
 
        close(out);
@@ -69,7 +76,7 @@ int main(int argc, char **argv)
 
        if (argc == 4) {
                url = argv[1];
-               duration = atol(argv[2])*60;
+               duration = atoi(argv[2])*60;
                outfile = argv[3];
        } else {
                fprintf(stderr,"Syntax: %s URL duration_in_minutes outfile\n", argv[0]);