Create parse_host_and_port() function.

Refactor host and port parsing code into a function. It'll be used
when setting up input, output and camd server.

tsdecrypt.c

@@ -290,7 +290,6 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	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;
 	opterr = 0; // Prevent printing of error messages for unknown options in getopt()
 	while ((j = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
-		char *p = NULL;
 		if (j == '?') {
 			fprintf(stderr, "ERROR: Unknown parameter '%s'.\n", argv[optind - 1]);
 			exit(EXIT_FAILURE);
@@ -461,30 +460,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				}
 				break;
 			case 's': // --camd-server
-				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;
-					}
-				} else {
-					p = strrchr(optarg, ':');
-					if (p) {
-						*p = 0x00;
-						ts->camd.service = p + 1;
-						port_set = 1;
-					}
-				}
+				server_err = !parse_host_and_port(optarg, &ts->camd.hostname, &ts->camd.service, &port_set);
 				break;
 			case 'U': // --camd-user
 				if (strlen(optarg) < 64)

util.c

@@ -281,6 +281,36 @@ OUT:
 	return buf_pos;
 }
 
+int parse_host_and_port(char *input, char **hostname, char **service, int *port_set) {
+	char *p;
+	if (strlen(input) == 0)
+		return 0;
+	*hostname = input;
+	if (input[0] == '[') { // Detect IPv6 static address
+		p = strrchr(input, ']');
+		if (!p) {
+			fprintf(stderr, "ERROR: Invalid IPv6 address format: %s\n", input);
+			exit(EXIT_FAILURE);
+		}
+		*hostname = input + 1; // Remove first [
+		*p = 0x00; // Remove last ]
+		char *p2 = strchr(p + 1, ':');
+		if (p2) {
+			*p2 = 0x00;
+			*service = p2 + 1;
+			*port_set = 1;
+		}
+	} else {
+		p = strrchr(input, ':');
+		if (p) {
+			*p = 0x00;
+			*service = p + 1;
+			*port_set = 1;
+		}
+	}
+	return 1;
+}
+
 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;

util.h

@@ -27,6 +27,7 @@ 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);
+int parse_host_and_port(char *input, char **hostname, char **service, int *port_set);
 char *my_inet_ntop(int family, struct sockaddr *addr, char *dest, int dest_len);
 
 #endif