Add support for IPv6 and for multiple CAMD addresses.

This patch adds support for connecting to CAMD over IPv6. Nice addition
is that now tsdecrypt tries each of the addresses returned when CAMD
hostname is resolved and connects to the one that works. Resolving
of the server address is done before each connect, which allows for
uninterupted migration of CAMD servers by just changing their DNS
record.

IPv6 functionality can be disabled by using -4/--ipv4 options or
if you fancy only IPv6 servers -6/--ipv6 can be used.

ChangeLog

@@ -7,6 +7,12 @@
    set by IP address.
  * Allow tsdecrypt to read ECM/EMM packet from text file. The added
    parameters are -n, -ecm-file <file> and -m --emm-file <file>.
+ * Add support for CAMD server listening on IPv6.
+ * Add support for forcing only IPv4 (-4, --ipv4) or IPv6 (-6, --ipv6)
+   server connections.
+ * Add support for multiple CAMD addresses returned when resolving CAMD
+   server hostname. tsdecrypt would try each of the addresses and use
+   the one that works.
 
 2012-04-19 : Version 8.1
  * Add support for Bulcrypt CAS.

README

@@ -143,10 +143,18 @@ CAMD server options:
  -A --camd-proto <proto>    | Set CAMD network protocol.
                             . Valid protocols are: CS378X (default) and NEWCAMD
  -s --camd-server <host>    | Set CAMD server address. Default port: 2233
+                            . Example IPv4 addr and port: 127.0.0.1:2233
+                            . Example IPv6 addr and port: [2a00::1014]:2233
+                            . Example hostname          : example.com
+                            . Example hostname and port : example.com:2233
+                            . Example IPv4 hostname     : ipv4.google.com
+                            . Example IPv6 hostname     : ipv6.google.com
  -U --camd-user <user>      | Set CAMD server user. Default: user
  -P --camd-pass <pass>      | Set CAMD server password. Default: pass
  -B --camd-des-key <key>    | Set DES key for newcamd protocol.
                             . Default: 0102030405060708091011121314
+ -4 --ipv4                  | Use only IPv4 addresses of the camd server.
+ -6 --ipv6                  | Use only IPv6 addresses of the camd server.
 
 EMM options:
  -e --emm                   | Enable sending EMM's to CAMD. Default: disabled

TODO

@@ -1,4 +1,3 @@
-- Resolve server address on each connect.
 - Sort nanos of viaccess and cryptoworks emms.
-- Add ipv6 support (multicast send/recv, camd connection).
+- Add ipv6 support (multicast send/recv).
 - Investigate EMM filters implemented in https://github.com/joolzg/tsdecrypt

camd-cs378x.c

@@ -27,7 +27,7 @@
 
 static int cs378x_connect(struct camd *c) {
 	if (c->server_fd < 0)
-		c->server_fd = camd_tcp_connect(c->server_addr, c->server_port);
+		c->server_fd = connect_client(SOCK_STREAM, c->hostname, c->service);
 	return c->server_fd;
 }
 

camd-newcamd.c

@@ -345,7 +345,7 @@ static int newcamd_login(struct camd *c) {
 
 static int newcamd_connect(struct camd *c) {
 	if (c->server_fd < 0) {
-		c->server_fd = camd_tcp_connect(c->server_addr, c->server_port);
+		c->server_fd = connect_client(SOCK_STREAM, c->hostname, c->service);
 		if (!newcamd_login(c)) {
 			shutdown_fd(&c->server_fd);
 			return -1;

camd.c

@@ -29,33 +29,60 @@
 #include "camd.h"
 #include "notify.h"
 
+int ai_family = AF_UNSPEC;
+
 static uint8_t invalid_cw[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-int camd_tcp_connect(struct in_addr ip, int port) {
-	ts_LOGf("CAM | Connecting to server %s:%d\n", inet_ntoa(ip), port);
+int connect_client(int socktype, const char *hostname, const char *service) {
+	struct addrinfo hints, *res;
+	int n;
 
-	int fd = socket(PF_INET, SOCK_STREAM, 0);
-	if (fd < 0)	{
-		ts_LOGf("CAM | Could not create socket | %s\n", strerror(errno));
+	memset(&hints, 0, sizeof(struct addrinfo));
+
+	hints.ai_family = ai_family;
+	hints.ai_socktype = socktype;
+
+	ts_LOGf("CAM | Connecting to server %s port %s\n", hostname, service);
+
+	n = getaddrinfo(hostname, service, &hints, &res);
+
+	if (n < 0) {
+		ts_LOGf("CAM | ERROR: getaddrinfo(%s): %s\n", hostname, gai_strerror(n));
 		return -1;
 	}
 
-	struct sockaddr_in sock;
-	sock.sin_family = AF_INET;
-	sock.sin_port = htons(port);
-	sock.sin_addr = ip;
-	if (do_connect(fd, (struct sockaddr *)&sock, sizeof(sock), 1000) < 0) {
-		ts_LOGf("CAM | Could not connect to server %s:%d | %s\n", inet_ntoa(ip), port, strerror(errno));
-		close(fd);
-		sleep(1);
-		return -1;
+	int sockfd = -1;
+	struct addrinfo *ressave = res;
+	while (res) {
+		sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (sockfd > -1) {
+			if (do_connect(sockfd, res->ai_addr, res->ai_addrlen, 1000) < 0) {
+				char str_addr[INET6_ADDRSTRLEN];
+				my_inet_ntop(res->ai_family, res->ai_addr, str_addr, sizeof(str_addr));
+				ts_LOGf("CAM | Could not connect to server %s:%s (%s) | %s\n",
+					hostname, service, str_addr, strerror(errno));
+				close(sockfd);
+				sockfd = -1;
+			} else {
+				break; // connected
+			}
+		} else {
+			ts_LOGf("CAM | Could not create socket: %s\n", strerror(errno));
+			sleep(1);
+			return -1;
+		}
+		res = res->ai_next;
+	}
+	freeaddrinfo(ressave);
+
+	if (socktype == SOCK_STREAM) {
+		int flag = 1;
+		setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int));
 	}
 
-	int flag = 1;
-	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int));
+	ts_LOGf("CAM | Connected to fd:%d\n", sockfd);
 
-	ts_LOGf("CAM | Connected to fd:%d\n", fd);
-	return fd;
+	return sockfd;
 }
 
 static inline void camd_reconnect(struct camd *c) {

camd.h

@@ -17,7 +17,7 @@
 
 #include "data.h"
 
-int						camd_tcp_connect	(struct in_addr ip, int port);
+int connect_client							(int socktype, const char *hostname, const char *service);
 
 struct camd_msg *		camd_msg_alloc		(enum msg_type msg_type, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len);
 void					camd_msg_free   	(struct camd_msg **pmsg);

data.c

@@ -56,7 +56,7 @@ void data_init(struct ts *ts) {
 	// CAMD
 	memset(&ts->camd, 0, sizeof(ts->camd));
 	ts->camd.server_fd    = -1;
-	ts->camd.server_port  = 2233;
+	ts->camd.service      = "2233";
 	ts->camd.key          = &ts->key;
 	ts->camd.user         = "user";
 	ts->camd.pass         = "pass";

data.h

@@ -138,8 +138,8 @@ struct newcamd {
 
 struct camd {
 	int				server_fd;
-	struct in_addr	server_addr;
-	unsigned int	server_port;
+	char			*hostname;
+	char			*service;
 	char			*user;
 	char			*pass;
 

tsdecrypt.1

@@ -177,11 +177,12 @@ Set CAMD server protocol. Valid protocols are \fBCS378X\fR and \fBNEWCAMD\fR.
 If this option is not used the default protocol is \fBCS378X\fR (camd35 over
 tcp).
 .TP
-\fB\-s\fR, \fB\-\-camd\-server\fR <host[:port]>
-Set CAMD server address. You can use IP address or hostname. If the port is not
-set then \fB2233\fR is used as default port. 2233 is the default port for
-CS378X protocol but for NEWCAMD protocol you probably should choose other
-port number.
+\fB\-s\fR, \fB\-\-camd\-server\fR <hostname[:port]>
+Set CAMD server address. You can use IPv4/IPv6 address or hostname. If the port
+is not set then \fB2233\fR is used as default port. 2233 is the default port
+for CS378X protocol but for NEWCAMD protocol you probably should choose other
+port number. To set static IPv6 address you have to put in in brackets (\fB[]\fR)
+for example: \fB[1234::5678]:2233\fR
 .TP
 \fB\-U\fR, \fB\-\-camd\-user\fR <username>
 Set CAMD user name. The default is \fBuser\fR.
@@ -193,6 +194,14 @@ Set CAMD user password. The default is \fBpass\fR.
 Set DES key used by NEWCAMD protocol. The default
 is \fB0102030405060708091011121314\fR.
 .TP
+\fB\-4\fR, \fB\-\-ipv4\fR
+Connect to CAMD server using only IPv4 addresses of the server. IPv6
+addresses would be are ignorred.
+.TP
+\fB\-6\fR, \fB\-\-ipv6\fR
+Connect to CAMD server using only IPv6 addresses of the server. IPv4
+addresses would be are ignorred.
+.TP
 .SH EMM OPTIONS
 .PP
 .TP

tsdecrypt.c

@@ -52,6 +52,8 @@ static int packet_buflen;
 static uint8_t packet_buf[256];
 static enum msg_type packet_type = ECM_MSG;
 
+extern int ai_family;
+
 static void do_log(FILE *f, time_t now, const char *msg) {
 	char date[64];
 	struct tm tm;
@@ -76,9 +78,9 @@ static void LOG_func(const char *msg) {
 		LOG(msg);
 }
 
-static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:eZ:Ef:X:H:G:KJ:D:jbhVn:m:";
+static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:46eZ:Ef:X:H:G:KJ:D:jbhVn:m:";
 
-// Unused short options: aqv0123456789
+// Unused short options: aqv01235789
 static const struct option long_options[] = {
 	{ "ident",				required_argument, NULL, 'i' },
 	{ "daemon",				required_argument, NULL, 'd' },
@@ -117,6 +119,8 @@ static const struct option long_options[] = {
 	{ "camd-user",			required_argument, NULL, 'U' },
 	{ "camd-pass",			required_argument, NULL, 'P' },
 	{ "camd-des-key",		required_argument, NULL, 'B' },
+	{ "ipv4",				no_argument,       NULL, '4' },
+	{ "ipv6",				no_argument,       NULL, '6' },
 
 	{ "emm",				no_argument,       NULL, 'e' },
 	{ "emm-pid",			required_argument, NULL, 'Z' },
@@ -194,10 +198,18 @@ static void show_help(struct ts *ts) {
 	printf(" -A --camd-proto <proto>    | Set CAMD network protocol.\n");
 	printf("                            . Valid protocols are: CS378X (default) and NEWCAMD\n");
 	printf(" -s --camd-server <host>    | Set CAMD server address. Default port: 2233\n");
+	printf("                            . Example IPv4 addr and port: 127.0.0.1:2233\n");
+	printf("                            . Example IPv6 addr and port: [2a00::1014]:2233\n");
+	printf("                            . Example hostname          : example.com\n");
+	printf("                            . Example hostname and port : example.com:2233\n");
+	printf("                            . Example IPv4 hostname     : ipv4.google.com\n");
+	printf("                            . Example IPv6 hostname     : ipv6.google.com\n");
 	printf(" -U --camd-user <user>      | Set CAMD server user. Default: %s\n", ts->camd.user);
 	printf(" -P --camd-pass <pass>      | Set CAMD server password. Default: %s\n", ts->camd.pass);
 	printf(" -B --camd-des-key <key>    | Set DES key for newcamd protocol.\n");
 	printf("                            . Default: %s\n", ts->camd.newcamd.hex_des_key);
+	printf(" -4 --ipv4                  | Use only IPv4 addresses of the camd server.\n");
+	printf(" -6 --ipv6                  | Use only IPv6 addresses of the camd server.\n");
 	printf("\n");
 	printf("EMM options:\n");
 	printf(" -e --emm                   | Enable sending EMM's to CAMD. Default: %s\n", ts->emm_send ? "enabled" : "disabled");
@@ -267,8 +279,6 @@ static int parse_io_param(struct io *io, char *opt, int open_flags, mode_t open_
 }
 
 static void parse_options(struct ts *ts, int argc, char **argv) {
-	int h_err;
-	struct addrinfo hints, *addrinfo = NULL;
 	int j, i, ca_err = 0, server_err = 1, input_addr_err = 0, output_addr_err = 0, output_intf_err = 0, ident_err = 0, port_set = 0;
 	while ((j = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
 		char *p = NULL;
@@ -438,33 +448,29 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				}
 				break;
 			case 's': // --camd-server
-				p = strrchr(optarg, ':');
-				if (p) {
-					*p = 0x00;
-					ts->camd.server_port = atoi(p + 1);
-					port_set = 1;
-				}
-				server_err = 1;
-
-				memset(&hints, 0, sizeof hints);
-				hints.ai_family = AF_INET;
-				hints.ai_socktype = SOCK_STREAM;
-				h_err = getaddrinfo(optarg, NULL, &hints, &addrinfo);
-				if (h_err == 0) {
-					int num_addrs = 0;
-					struct addrinfo *addr;
-					for (addr = addrinfo; addr != NULL; addr = addr->ai_next) {
-						struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr->ai_addr;
-						if (!ts->camd.server_addr.s_addr) // Get the first IP address
-							ts->camd.server_addr = ipv4->sin_addr;
-						num_addrs++;
+				server_err = 0;
+				ts->camd.hostname = optarg;
+				if (optarg[0] == '[') { // Detect IPv6 static address
+					p = strrchr(optarg, ']');
+					if (!p) {
+						fprintf(stderr, "ERROR: Invalid IPv6 address format: %s\n", optarg);
+						exit(EXIT_FAILURE);
+					}
+					ts->camd.hostname = optarg + 1; // Remove first [
+					*p = 0x00; // Remove last ]
+					char *p2 = strchr(p + 1, ':');
+					if (p2) {
+						*p2 = 0x00;
+						ts->camd.service = p2 + 1;
+						port_set = 1;
 					}
-					freeaddrinfo(addrinfo);
-					if (num_addrs)
-						server_err = 0;
 				} else {
-					fprintf(stderr, "ERROR: getaddrinfo(%s) returned: %s\n", optarg, gai_strerror(h_err));
-					exit(EXIT_FAILURE);
+					p = strrchr(optarg, ':');
+					if (p) {
+						*p = 0x00;
+						ts->camd.service = p + 1;
+						port_set = 1;
+					}
 				}
 				break;
 			case 'U': // --camd-user
@@ -484,6 +490,12 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				strncpy(ts->camd.newcamd.hex_des_key, optarg, sizeof(ts->camd.newcamd.hex_des_key) - 1);
 				ts->camd.newcamd.hex_des_key[sizeof(ts->camd.newcamd.hex_des_key) - 1] = 0;
 				break;
+			case '4': // --ipv4
+				ai_family = AF_INET;
+				break;
+			case '6': // --ipv6
+				ai_family = AF_INET6;
+				break;
 
 			case 'e': // --emm
 				ts->emm_send = !ts->emm_send;
@@ -621,7 +633,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		exit(EXIT_FAILURE);
 	}
 	if (ts->camd.ops.proto == CAMD_NEWCAMD && !port_set) {
-		fprintf(stderr, "ERROR: CAMD server port is not set. Use --camd-server %s:xxxx to set the port.\n", inet_ntoa(ts->camd.server_addr));
+		fprintf(stderr, "ERROR: CAMD server port is not set. Use --camd-server %s:xxxx to set the port.\n", ts->camd.hostname);
 		exit(EXIT_FAILURE);
 	}
 
@@ -728,7 +740,11 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	}
 	if (!ts->camd.constant_codeword) {
 		ts_LOGf("CAMD proto : %s\n", ts->camd.ops.ident);
-		ts_LOGf("CAMD addr  : tcp://%s:%u/\n", inet_ntoa(ts->camd.server_addr), ts->camd.server_port);
+		ts_LOGf("CAMD addr  : %s:%s%s\n", ts->camd.hostname, ts->camd.service,
+			ai_family == AF_INET  ? " (IPv4 only)" :
+			ai_family == AF_INET6 ? " (IPv6 only)" :
+			" (IPv4/IPv6)"
+		);
 		ts_LOGf("CAMD user  : %s\n", ts->camd.user);
 		ts_LOGf("CAMD pass  : %s\n", ts->camd.pass);
 		if (ts->camd.ops.proto == CAMD_NEWCAMD)

util.c

@@ -20,6 +20,7 @@
 #include <time.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include "util.h"
 
@@ -221,3 +222,20 @@ OUT:
 
 	return buf_pos;
 }
+
+char *my_inet_ntop(int family, struct sockaddr *addr, char *dest, int dest_len) {
+	struct sockaddr_in  *addr_v4 = (struct sockaddr_in  *)addr;
+	struct sockaddr_in6 *addr_v6 = (struct sockaddr_in6 *)addr;
+	switch (family) {
+		case AF_INET:
+			return (char *)inet_ntop(AF_INET, &addr_v4->sin_addr, dest, dest_len);
+			break;
+		case AF_INET6:
+			return (char *)inet_ntop(AF_INET6, &addr_v6->sin6_addr, dest, dest_len);
+			break;
+		default:
+			memset(dest, 0, dest_len);
+			strcpy(dest, "unknown");
+			return dest;
+	}
+}

util.h

@@ -16,6 +16,7 @@
 #define UTIL_H
 
 #include <inttypes.h>
+#include <arpa/inet.h>
 
 unsigned long crc32(unsigned long crc, const uint8_t *buf, unsigned int len);
 int32_t boundary(int32_t exp, int32_t n);
@@ -26,5 +27,6 @@ void set_thread_name(char *thread_name);
 int decode_hex_string(char *hex, uint8_t *bin, int asc_len);
 int64_t get_time(void);
 unsigned int file_hex2buf(char *filename, uint8_t *buffer, unsigned int buf_size);
+char *my_inet_ntop(int family, struct sockaddr *addr, char *dest, int dest_len);
 
 #endif