Rewrite input address parsing to allow rtp and udp inputs.

ChangeLog

+xxxx-xx-xx : Version -dev
+ * Add support for RTP input.
+
 2013-07-22 : Version 0.9
  * Initial public release.

tsdumper2.c

 	printf(" -D --create-dirs           | Save files in subdirs YYYY/MM/DD/HH/file.\n");
 	printf("\n");
 	printf("Input options:\n");
-	printf(" -i --input <source>        | Where to read from. Multicast address.\n");
+	printf(" -i --input <source>        | Where to read from.\n");
 	printf("                            .  -i udp://224.0.0.1:5000    (v4 multicast)\n");
 	printf("                            .  -i udp://[ff01::1111]:5000 (v6 multicast)\n");
+	printf("                            .  -i rtp://224.0.0.1:5000    (v4 RTP input)\n");
+	printf("                            .  -i rtp://[ff01::1111]:5000 (v6 RTP input)\n");
 	printf(" -z --input-ignore-disc     | Do not report discontinuty errors in input.\n");
 	printf(" -4 --ipv4                  | Use only IPv4 addresses.\n");
 	printf(" -6 --ipv6                  | Use only IPv6 addresses.\n");
 	printf("\n");
 }
 
-static int parse_io_param(struct io *io, char *opt) {
-	int port_set = 0;
-	io->type = NET_IO;
-	int host_set = parse_host_and_port(opt, &io->hostname, &io->service, &port_set);
-	return !(!port_set || !host_set);
-}
-
 extern char *optarg;
 extern int optind, opterr, optopt;
 
 				ts->create_dirs = !ts->create_dirs;
 				break;
 			case 'i': // --input
-				input_addr_err = !parse_io_param(&ts->input, optarg);
+				input_addr_err = !parse_host_and_port(optarg, &ts->input);
 				break;
 			case 'z': // --input-ignore-disc
 				ts->ts_discont = !ts->ts_discont;
 	}
 
 	p_info("Prefix     : %s\n", ts->prefix);
-	p_info("Input addr : udp://%s:%s/\n", ts->input.hostname, ts->input.service);
+	p_info("Input addr : %s://%s:%s/\n",
+		ts->input.type == UDP ? "udp" :
+		ts->input.type == RTP ? "rtp" : "???",
+		ts->input.hostname, ts->input.service);
 	p_info("Seconds    : %u\n", ts->rotate_secs);
 	p_info("Output dir : %s (create directories: %s)\n", ts->output_dir,
 		ts->create_dirs ? "YES" : "no");
 static struct ts ts;
 
 int main(int argc, char **argv) {
-	ssize_t readen;
 	int i;
 	int have_data = 1;
 	int ntimeouts = 0;
 
 	p_info("Start %s\n", program_id);
 
-	if (ts.input.type == NET_IO && udp_connect_input(&ts.input) < 1)
-		goto EXIT;
+	switch (ts.input.type) {
+	case UDP:
+	case RTP:
+		if (udp_connect_input(&ts.input) < 1)
+			exit(EXIT_FAILURE);
+		break;
+	}
 
 	signal(SIGCHLD, SIG_IGN);
 	signal(SIGPIPE, SIG_IGN);
 
 	int data_received = 0;
 	do {
+		ssize_t readen = -1;
 		set_log_io_errors(0);
-		if (!ts.rtp_input) {
+		switch (ts.input.type) {
+		case UDP:
 			readen = fdread_ex(ts.input.fd, (char *)ts_packet, FRAME_SIZE, 250, 4, 1);
-		} else {
+			break;
+		case RTP:
 			readen = fdread_ex(ts.input.fd, (char *)ts_packet, FRAME_SIZE + RTP_HDR_SZ, 250, 4, 1);
 			if (readen > RTP_HDR_SZ) {
 				memcpy(rtp_hdr[rtp_hdr_pos], ts_packet, RTP_HDR_SZ);
 							pssrc, ssrc, ((ssrc - pssrc)-1) & 0xffff);
 				num_packets++;
 			}
+			break;
 		}
 		set_log_io_errors(1);
 		if (readen < 0) {
 		if (!keep_running)
 			break;
 	} while (have_data);
-EXIT:
 
 	queue_add(ts.packet_queue, ts.current_packet);
 	queue_add(ts.packet_queue, NULL); // Exit write_thread

tsdumper2.h

 #include <stdbool.h>
 
 #include "libfuncs/libfuncs.h"
-#include "util.h"
 
 // Supported values 0, 1 and 2. Higher value equals more spam in the log.
 #define DEBUG 0
 #define THREAD_STACK_SIZE (64 * 1024)
 
 enum io_type {
-	FILE_IO,
-	NET_IO,
-	WTF_IO
+	UDP,
+	RTP,
 };
 
 // 1.2MB = ~13Mbit/s
 	int					create_dirs;
 	int					rotate_secs;
 	int					ts_discont;
-	int					rtp_input;
 	struct io			input;
 
 	pthread_attr_t		thread_attr;
 	char				output_full_filename[OUTFILE_NAME_MAX];
 };
 
+#include "util.h"
+
 // From tsdumper2.c
 struct packet *alloc_packet(struct ts *ts);
 void free_packet(struct packet *packet);

util.c

 
 #endif
 
-int parse_host_and_port(char *input, char **hostname, char **service, int *port_set) {
+int parse_host_and_port(char *input, struct io *io) {
+	int port_set = 0;
 	char *p, *proto;
+	io->type = UDP;
 	if (strlen(input) == 0)
 		return 0;
-	proto = strstr(input, "http://");
-	if (proto == input)
-		die("HTTP input is unsupported (patch welcome): %s", input);
+	if (strstr(input, "udp://") == input)       io->type = UDP;
+	else if (strstr(input, "rtp://") == input)  io->type = RTP;
+	else
+		die("Unsupported protocol (patch welcome): %s", input);
 	proto = strstr(input, "://");
 	if (proto)
 		input = proto + 3;
-	*hostname = input;
+	io->hostname = input;
 	if (input[0] == '[') { // Detect IPv6 static address
 		p = strrchr(input, ']');
 		if (!p)
 			die("Invalid IPv6 address format: %s\n", input);
-		*hostname = input + 1; // Remove first [
+		io->hostname = input + 1; // Remove first [
 		*p = 0x00; // Remove last ]
 		char *p2 = strchr(p + 1, ':');
 		if (p2) {
 			*p2 = 0x00;
-			*service = p2 + 1;
-			*port_set = 1;
+			io->service = p2 + 1;
+			port_set = 1;
 		}
 	} else {
 		p = strrchr(input, ':');
 		if (p) {
 			*p = 0x00;
-			*service = p + 1;
-			*port_set = 1;
+			io->service = p + 1;
+			port_set = 1;
 		}
 	}
-	if (*service) {
-		char *path = strstr(*service, "/");
+	if (io->service) {
+		char *path = strstr(io->service, "/");
 		if (path)
 			path[0] = 0;
 	}
+	if (!port_set)
+		die("Port is not set in the input url.");
 	return 1;
 }
 

util.h

 
 void set_thread_name(char *thread_name);
 
-int parse_host_and_port(char *input, char **hostname, char **service, int *port_set);
+int parse_host_and_port(char *input, struct io *io);
 char *my_inet_ntop(int family, struct sockaddr *addr, char *dest, int dest_len);
 
 int create_dir(const char *dir, mode_t mode);