more http-checks, some fixes

[record-dvb] / record-dvb.c

diff --git a/record-dvb.c b/record-dvb.c
index 45d2fcb353c8888448e762b1749fdf1fb7d5f92a..02fcd5157c2d9d3ae17ae6231ebe19132144e8ca 100644 (file)
--- a/record-dvb.c
+++ b/record-dvb.c
@@ -13,32 +13,33 @@
 #include "http.h"
 #include "mcast.h"
 
-#define CHUNKSIZE 1500
+#define CHUNKSIZE 3000
+#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, recvd, written, count = 0;
        char buffer[CHUNKSIZE];
-       int i;
        int in, out;
 
-       if ((out = open(outfile, O_CREAT|O_TRUNC|O_WRONLY|O_LARGEFILE, 00644)) < 0) {
-               perror("open");
+       if ((in = (*open_fn)(url)) < 0) {
+               fprintf(stderr,"Can't open url %s!\n",url);
                exit(EXIT_FAILURE);
        }
 
-       if ((in = (*open_fn)(url)) < 0) {
-               fprintf(stderr,"Can't open url %s!\n",url);
+       if ((out = open(outfile, O_CREAT|O_TRUNC|O_WRONLY|O_LARGEFILE, 00644)) < 0) {
+               perror("open");
                exit(EXIT_FAILURE);
        }
 
        printf("Recording from %s for %d seconds...\n", url, duration);
 
        gettimeofday(&start, NULL);
+       curr = start;
 
        do {
-               if ((bytes = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
+               if ((recvd = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
                        /* TODO: Insert better connection-loss recovery here */
                        if ((in = (*open_fn)(url)) < 0) {
                                sleep(1);
@@ -47,14 +48,15 @@ void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
                }
                written = 0;
                do {
-                       if ((i = write(out, buffer, bytes-written)) < 0) {
+                       if ((bytes = write(out, buffer, recvd-written)) < 0) {
                                perror("write");
                                exit(EXIT_FAILURE);
                        }
-                       written += i;
-               } while(written < bytes);
+                       written += bytes;
+               } while(written < recvd);
 
-               gettimeofday(&curr, NULL);
+               if (!(++count % GTOD_INTERVAL))
+                       gettimeofday(&curr, NULL);
        } while (curr.tv_sec < start.tv_sec+duration);
 
        close(out);