Take the port from the configuration file.

[cubemap] / input.cpp

diff --git a/input.cpp b/input.cpp
index f9f879b6c2a393f6671b42fb25e4462854e04711..541b5df6273bf7e59b0230acbcb1d936f679b977 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -61,10 +61,17 @@ void *Input::do_work_thunk(void *arg)
 void Input::do_work()
 {
        CURL *curl = curl_easy_init();
-       curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &Input::curl_callback_thunk);
-       curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
-       curl_easy_perform(curl);
+
+       while (!should_stop) {
+               curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+               curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &Input::curl_callback_thunk);
+               curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
+               curl_easy_perform(curl);
+               if (!should_stop) {
+                       printf("Transfer ended, waiting 0.2 seconds and restarting...\n");
+                       usleep(200000);
+               }
+       }
 }
 
 size_t Input::curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata)
@@ -131,6 +138,7 @@ void Input::curl_callback(char *ptr, size_t bytes)
                // should we have many blocks, but these routines don't need to be too efficient
                // anyway.
                pending_data.erase(pending_data.begin(), pending_data.begin() + sizeof(metacube_block_header) + size);
+               has_metacube_header = false;
        }
 }