Add udp output support

Makefile

@@ -10,7 +10,7 @@ FUNCS_LIB = $(FUNCS_DIR)/libfuncs.a
 TS_DIR = libts
 TS_LIB = $(TS_DIR)/libts.a
 
-tsdecrypt_OBJS = data.o util.o camd.o tables.o tsdecrypt.o $(FUNCS_LIB) $(TS_LIB)
+tsdecrypt_OBJS = data.o udp.c util.o camd.o tables.o tsdecrypt.o $(FUNCS_LIB) $(TS_LIB)
 tsdecrypt_LIBS = -lcrypto -ldvbcsa -lpthread
 
 CLEAN_OBJS = tsdecrypt $(tsdecrypt_OBJS) *~

tsdecrypt.c

@@ -12,6 +12,7 @@
 #include "util.h"
 #include "camd.h"
 #include "tables.h"
+#include "udp.h"
 
 void LOG_func(const char *msg) {
 	char date[64];
@@ -248,6 +249,10 @@ int main(int argc, char **argv) {
 	parse_options(&ts, argc, argv);
 
 	camd35_connect(&ts.camd35);
+	if (ts.output_port)
+		if (udp_connect_output(&ts) < 1)
+			goto EXIT;
+
 	do {
 		readen = read(ts.input_fd, ts_packet, FRAME_SIZE);
 		if (readen > 0) {
@@ -255,6 +260,7 @@ int main(int argc, char **argv) {
 			ts_write_packets(&ts, ts_packet, readen);
 		}
 	} while (readen > 0);
+EXIT:
 	camd35_disconnect(&ts.camd35);
 
 	data_free(&ts);

udp.c

@@ -0,0 +1,64 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+
+#include "udp.h"
+
+static void set_sock_nonblock(int sockfd) {
+	int arg = fcntl(sockfd, F_GETFL, NULL);
+	arg |= O_NONBLOCK;
+	fcntl(sockfd, F_SETFL, arg);
+}
+
+int udp_connect_output(struct ts *ts) {
+	int sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock < 0) {
+		ts_LOGf("socket(SOCK_DGRAM): %s\n", strerror(errno));
+		return -1;
+	}
+
+	ts_LOGf("Connecting output to udp://%s:%d ttl:%d\n",
+		inet_ntoa(ts->output_addr), ts->output_port, ts->output_ttl);
+
+	int on = 1;
+	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+	set_sock_nonblock(sock);
+
+	// subscribe to multicast group
+	if (IN_MULTICAST(ntohl(ts->output_addr.s_addr))) {
+		int ttl = ts->output_ttl;
+		if (setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) {
+			ts_LOGf("setsockopt(IP_MUTICAST_TTL): %s\n", strerror(errno));
+			close(sock);
+			return -1;
+		}
+		if (setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, &ts->output_intf, sizeof(ts->output_intf)) < 0) {
+			ts_LOGf("setsockopt(IP_MUTICAST_IF %s): %s\n", inet_ntoa(ts->output_intf), strerror(errno));
+			close(sock);
+			return -1;
+		}
+	}
+
+	struct sockaddr_in sockaddr;
+	memset(&sockaddr, 0, sizeof(sockaddr));
+	sockaddr.sin_family			= AF_INET;
+	sockaddr.sin_addr.s_addr	= ts->output_addr.s_addr;
+	sockaddr.sin_port			= htons(ts->output_port);
+	if (connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr))) {
+		ts_LOGf("udp_connect() error: %s\n", strerror(errno));
+		close(sock);
+		return -1;
+	}
+	ts->output_fd = sock;
+	ts_LOGf("Output connected to fd:%d\n", ts->output_fd);
+
+	return 1;
+}

udp.h

@@ -0,0 +1,8 @@
+#ifndef UDP_H
+#define UDP_H
+
+#include "data.h"
+
+int udp_connect_output(struct ts *ts);
+
+#endif