Merge branch 'master' of /srv/git.sesse.net/www/cubemap

[cubemap] / udpinput.cpp

diff --git a/udpinput.cpp b/udpinput.cpp
index cd66f16debff02b6edf6426c136b84a46a1bf7d6..081f631c47e114ba42f7ff46699667d8d1d31c5e 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,16 +1,18 @@
+#include <assert.h>
+#include <errno.h>
+#include <poll.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
-#include <arpa/inet.h>
-#include <errno.h>
+#include <unistd.h>
 #include <string>
 
 #include "acceptor.h"
-#include "udpinput.h"
+#include "log.h"
 #include "serverpool.h"
-#include "version.h"
 #include "state.pb.h"
+#include "udpinput.h"
+#include "version.h"
 
 using namespace std;
 
@@ -45,6 +47,7 @@ UDPInput::UDPInput(const InputProto &serialized)
 InputProto UDPInput::serialize() const
 {
        InputProto serialized;
+       serialized.set_stream_id(stream_id);
        serialized.set_url(url);
        serialized.set_sock(sock);
        return serialized;
@@ -82,7 +85,7 @@ void UDPInput::do_work()
                        int port_num = atoi(port.c_str());
                        sock = create_server_socket(port_num, UDP_SOCKET);
                        if (sock == -1) {
-                               fprintf(stderr, "WARNING: UDP socket creation failed. Waiting 0.2 seconds and trying again...\n");
+                               log(WARNING, "UDP socket creation failed. Waiting 0.2 seconds and trying again...");
                                usleep(200000);
                                continue;
                        }