#include <assert.h>
#include <errno.h>
#include <poll.h>
+#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include "serverpool.h"
#include "state.pb.h"
#include "udpinput.h"
+#include "util.h"
#include "version.h"
using namespace std;
void UDPInput::close_socket()
{
- int ret;
- do {
- ret = close(sock);
- } while (ret == -1 && errno == EINTR);
-
- if (ret == -1) {
- log_perror("close()");
- }
-
+ safe_close(sock);
sock = -1;
}
"HTTP/1.0 200 OK\r\n"
"Content-type: application/octet-stream\r\n"
"Cache-control: no-cache\r\n"
- "Server: " SERVER_IDENTIFICATION "\r\n";
+ "Server: " SERVER_IDENTIFICATION "\r\n"
+ "Connection: close\r\n";
}
-void UDPInput::add_destination(const string &stream_id)
+void UDPInput::add_destination(int stream_index)
{
- stream_ids.push_back(stream_id);
- servers->set_header(stream_id, http_header, "");
+ stream_indices.push_back(stream_index);
+ servers->set_header(stream_index, http_header, "");
}
void UDPInput::do_work()
{
- while (!should_stop) {
+ while (!should_stop()) {
if (sock == -1) {
int port_num = atoi(port.c_str());
sock = create_server_socket(port_num, UDP_SOCKET);
}
}
- // Since we are non-blocking, we need to wait for the right state first.
- // Wait up to 50 ms, then check should_stop.
- pollfd pfd;
- pfd.fd = sock;
- pfd.events = POLLIN;
-
- int nfds = poll(&pfd, 1, 50);
- if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
+ // Wait for a packet, or a wakeup.
+ bool activity = wait_for_activity(sock, POLLIN, NULL);
+ if (!activity) {
+ // Most likely, should_stop was set.
continue;
}
- if (nfds == -1) {
- log_perror("poll");
- close_socket();
- continue;
- }
char buf[4096];
int ret;
continue;
}
- for (size_t i = 0; i < stream_ids.size(); ++i) {
- servers->add_data(stream_ids[i], buf, ret);
+ for (size_t i = 0; i < stream_indices.size(); ++i) {
+ servers->add_data(stream_indices[i], buf, ret);
}
}
}