VideoHub control initial commit.

.gitignore

@@ -0,0 +1,4 @@
+videohubctrl
+version.h
+*.o
+*.d

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libfuncs"]
+	path = libfuncs
+	url = git://github.com/gfto/libfuncs.git

ChangeLog

@@ -0,0 +1,4 @@
+|-----------------------------------------------------------------------|
+2014-11-26 : Version 0.1
+ * Initial vesion with support for showing Videohub configuration
+|-----------------------------------------------------------------------|

LICENSE-MIT.txt

@@ -0,0 +1,20 @@
+Copyright (C) 2014 Unix Solutions Ltd.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -0,0 +1,69 @@
+CC = cc
+STRIP = strip
+CROSS := $(TARGET)
+MKDEP = $(CROSS)$(CC) -MP -MM -o $*.d $<
+RM = rm -f
+MV = mv -f
+
+ifndef V
+Q = @
+endif
+
+CFLAGS ?= -O2 -ggdb -pipe -ffunction-sections -fdata-sections \
+ -W -Wall -Wextra \
+ -Wshadow -Wformat-security -Wstrict-prototypes -Wno-unused-parameter \
+ -Wredundant-decls -Wold-style-definition
+
+LDFLAGS ?= -Wl,--gc-sections
+
+DEFS += -D_FILE_OFFSET_BITS=64
+
+FUNCS_DIR = libfuncs
+FUNCS_LIB = $(FUNCS_DIR)/libfuncs.a
+
+videohubctrl_SRC = \
+	cmd.c \
+	net.c \
+	util.c \
+	videohubctrl.c
+videohubctrl_LIBS = -lpthread
+videohubctrl_OBJS = $(FUNCS_LIB) $(videohubctrl_SRC:.c=.o)
+
+CLEAN_OBJS = videohubctrl $(videohubctrl_SRC:.c=.o) $(videohubctrl_SRC:.c=.d)
+DISTCLEAN_OBJS = version.h
+
+.PHONY: distclean clean version
+
+PROGS=videohubctrl
+
+version:
+	$(shell ./version.sh >/dev/null)
+	@$(MAKE) --no-print-directory videohubctrl
+
+videohubctrl: $(videohubctrl_OBJS)
+	$(Q)echo "  LINK	videohubctrl"
+	$(Q)$(CROSS)$(CC) $(CFLAGS) $(DEFS) $(videohubctrl_OBJS) $(videohubctrl_LIBS) $(LDFLAGS) -o videohubctrl
+
+$(FUNCS_LIB): $(FUNCS_DIR)/libfuncs.h
+	$(Q)echo "  MAKE	$(FUNCS_LIB)"
+	$(Q)$(MAKE) -s -C $(FUNCS_DIR)
+
+%.o: %.c Makefile RELEASE
+	@$(MKDEP)
+	$(Q)echo "  CC	videohubctrl	$<"
+	$(Q)$(CROSS)$(CC) $(CFLAGS) $(DEFS) -c $<
+
+-include $(videohubctrl_SRC:.c=.d)
+
+strip:
+	$(Q)echo "  STRIP	$(PROGS)"
+	$(Q)$(CROSS)$(STRIP) $(PROGS)
+
+clean:
+	$(Q)echo "  RM	$(CLEAN_OBJS)"
+	$(Q)$(RM) $(CLEAN_OBJS)
+
+distclean: clean
+	$(Q)echo "  RM	$(DISTCLEAN_OBJS)"
+	$(Q)$(RM) $(DISTCLEAN_OBJS)
+	$(Q)$(MAKE) -s -C $(FUNCS_DIR) clean

README

@@ -0,0 +1,166 @@
+videohubctrl - Blackmagic Videohub control application
+======================================================
+
+Blackmagic Design Videohub is SDI router device which can be controlled
+over the network using very simple text based protocol which 'videohubctrl'
+implements.
+
+'videohubctrl' is tested with Blackmagic Design Micro Videohub 16x16 router
+and probably will work with other Videohub models.
+
+'videohubctrl' currently displays:
+
+  - Input port labels
+  - Output port labels
+  - Output routing
+  - Output locking
+
+The following features found in bigger Videohub models are currently not
+supported (I don't have the hardware):
+
+  - Configuration of video processing units
+  - Configuration of Video monitoring outputs
+  - Configuration of Serial ports
+
+Configuration of Videohub's network settings can be made using Blackmagic's
+Windows program when the device is connected via USB.
+
+
+License
+=======
+
+videohubctrl is released under MIT license.
+See LICENSE-MIT.txt for full license terms.
+
+
+Development
+===========
+
+The development is done using git. videohubctrl repository is hosted at
+
+   http://github.com/gfto/videohubctrl
+
+To clone the repository issue the following commands:
+
+   git clone git://github.com/gfto/videohubctrl.git
+   cd videohubctrl
+   git submodule init
+   git submodule update
+   make
+
+The code is developed and tested under modern Linux. It's also compiled from
+time to time under OS X but it's not tested there.
+
+
+Updating the code
+=================
+
+To update cloned videohubctrl, go to the directory where the repository
+is cloned and run the following commands:
+
+   git fetch origin
+   git merge origin/master
+   git submodule update
+   make clean all
+
+videohubctrl's master branch should always be useful so it is safe to
+use it instead of official release. The master branch will always
+be better than any released version.
+
+
+Command line parameters
+=======================
+
+videohubctrl is controlled using command line parameters. Here is a list
+of supported command line parameters:
+
+ Usage: videohubctrl --host <host> [..commands..]
+
+Main options:
+ -s --host <hostname>       | Set device hostname.
+ -p --port <port_number>    | Set device port (default: 9990).
+
+Misc options:
+ -v --verbose               | Enable verbose logging.
+ -q --quiet                 | Suppress warnings.
+ -h --help                  | Show help screen.
+ -V --version               | Show program version.
+
+Commands:
+ -i --info                  | Show device info (default command).
+
+
+Example usage
+=============
+
+TODO: Add examples once set commands are done.
+
+
+Example output
+==============
+
+Here is how videohubctrl output looks like:
+
+|-----------------------------------------------------------------------------|
+gf@gf:~/git/videohubctrl$ ./videohubctrl --host sdi-matrix
+videohubctrl Version: 0.1 Git: 0.1
+
+Protocol version: 2.4
+Model name: Blackmagic Micro Videohub
+Unique ID: 7c2e0d021714
+Video inputs: 16
+Video processing units: 0
+Video outputs: 16
+Video monitoring outputs: 0
+Serial ports: 0
+
+----------------------------------------------------------------------------
+|  # | x | Input name                     | Output name                    |
+----------------------------------------------------------------------------
+|  1 | L | Windows 1                      | Enc1 3                         |
+|  2 | L | Windows 2                      | Enc1 2                         |
+|  3 | L | Windows 3                      | Enc1 1                         |
+|  4 | L | Windows 4 HD                   | Enc1 1                         |
+|  5 |   | Input 5                        | Output 5                       |
+|  6 |   | Input 6                        | Output 6                       |
+|  7 |   | Input 7                        | Output 7                       |
+|  8 |   | Input 8                        | Output 8                       |
+|  9 | L | Input 9                        | Enc1 4                         |
+| 10 |   | Input 10                       | Enc1 4                         |
+| 11 |   | Input 11                       | Output 11                      |
+| 12 | L | DPlay1                         | Output 13                      |
+| 13 | L | DPlay2                         | Denc                           |
+| 14 |   | Input 14                       | Output 14                      |
+| 15 |   | Input 15                       | Output 15                      |
+| 16 |   | Loopback                       | Loopback                       |
+----------------------------------------------------------------------------
+
+gf@gf:~/git/videohubctrl$
+|-----------------------------------------------------------------------------|
+
+
+Reporting bugs
+==============
+
+If you think you have found bug in videohubctrl, please report it to the
+e-mail listed in Contact section (see below) of this README file.
+
+When reporting bugs, please send the whole output that videohubctrl generated
+(preferably by using --verbose option) and also the full command line which
+you used and describe what you think the videohubctrl does wrong.
+
+
+Releases
+========
+
+Official releases can be downloaded from videohubctrl home page which is
+
+   http://georgi.unixsol.org/programs/videohubctrl/
+
+
+Contact
+=======
+
+For requests, patches, bug reports, complaints and so on send e-mail to
+
+   Georgi Chorbadzhiyski <georgi@unixsol.org>

RELEASE

@@ -0,0 +1 @@
+0.1

TODO

@@ -0,0 +1,5 @@
+- Add --monitor option to continually display configuration and changes to it.
+- Add --save-config and --restore-config.
+- Add commands to set labels, routing and locking.
+- Create man page.
+- Investigate the USB protocol for configuring network settings.

cmd.c

@@ -0,0 +1,301 @@
+/*
+ * === Command parser ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "data.h"
+#include "util.h"
+
+/*
+Example response from videohub (on connect)
+===========================================
+PROTOCOL PREAMBLE:
+Version: 2.4
+
+VIDEOHUB DEVICE:
+Device present: true
+Model name: Blackmagic Micro Videohub
+Unique ID: 7c2e0d021714
+Video inputs: 16
+Video processing units: 0
+Video outputs: 16
+Video monitoring outputs: 0
+Serial ports: 0
+
+INPUT LABELS:
+0 Windows 1
+1 Windows 2
+2 Windows 3
+3 Windows 4 HD
+4 Input 5
+5 Input 6
+6 Input 7
+7 Input 8
+8 Input 9
+9 Input 10
+10 Input 11
+11 DPlay1
+12 DPlay2
+13 Input 14
+14 Input 15
+15 Loopback
+
+OUTPUT LABELS:
+0 Enc1 1
+1 Enc1 2
+2 Enc1 3
+3 Enc1 4
+4 Output 5
+5 Output 6
+6 Output 7
+7 Output 8
+8 Enc2 1
+9 Output 10
+10 Output 11
+11 Denc
+12 Output 13
+13 Output 14
+14 Output 15
+15 Loopback
+
+VIDEO OUTPUT LOCKS:
+0 L
+1 L
+2 L
+3 L
+4 U
+5 U
+6 U
+7 U
+8 L
+9 U
+10 U
+11 L
+12 L
+13 U
+14 U
+15 U
+
+VIDEO OUTPUT ROUTING:
+0 2
+1 1
+2 0
+3 0
+4 4
+5 5
+6 6
+7 7
+8 3
+9 3
+10 10
+11 12
+12 11
+13 13
+14 14
+15 15
+
+*/
+
+enum vcmd {
+	CMD_PROTOCOL_PREAMBLE,
+	CMD_VIDEOHUB_DEVICE,
+	CMD_INPUT_LABELS,
+	CMD_OUTPUT_LABELS,
+	CMD_VIDEO_OUTPUT_LOCKS,
+	CMD_VIDEO_OUTPUT_ROUTING,
+	CMD_PING,
+};
+
+static struct videohub_commands {
+	enum vcmd	cmd;
+	const char	*txt;
+} videohub_commands[] = {
+	{ CMD_PROTOCOL_PREAMBLE,       "PROTOCOL PREAMBLE" },
+	{ CMD_VIDEOHUB_DEVICE,         "VIDEOHUB DEVICE" },
+	{ CMD_INPUT_LABELS,            "INPUT LABELS" },
+	{ CMD_OUTPUT_LABELS,           "OUTPUT LABELS" },
+	{ CMD_VIDEO_OUTPUT_LOCKS,      "VIDEO OUTPUT LOCKS" },
+	{ CMD_VIDEO_OUTPUT_ROUTING,    "VIDEO OUTPUT ROUTING" },
+	{ CMD_PING,                    "PING" },
+};
+
+static char *parse_text(char *line, char *cmd) {
+	char *parsed_text = strstr(line, cmd);
+	if (parsed_text == line) {
+		return parsed_text + strlen(cmd);
+	}
+	return NULL;
+}
+
+bool parse_command(struct videohub_data *data, char *cmd) {
+	unsigned int i;
+	struct videohub_commands *v = NULL;
+	for (i = 0; i < ARRAY_SIZE(videohub_commands); i++) {
+		if (!videohub_commands[i].txt)
+			continue;
+		if (strstr(cmd, videohub_commands[i].txt) == cmd) {
+			v = &videohub_commands[i];
+			break;
+		}
+	}
+
+	if (!v) {
+		if (!quiet) {
+			fprintf(stderr, "WARNING: Videohub sent unknown command!\n");
+			fprintf(stderr, "         Please report this command to author's email: georgi@unixsol.org\n");
+			fprintf(stderr, "         You may use -q or --quiet to suppress the message.\n");
+			fprintf(stderr, "---------8<-----------8<----------- cut here ---------8<------------8<---------\n");
+			fprintf(stderr, "%s\n", cmd);
+			fprintf(stderr, "---------8<-----------8<----------- cut here ---------8<------------8<---------\n");
+		}
+		return false;
+	}
+
+	v("verbose: Got '%s' command.\n", v->txt);
+
+	bool cmd_response = false;
+	char *p, *cmd_data = xstrdup( cmd + strlen(v->txt) + 2 ); // +2 to compensate for :\n at the end of the command
+	// Split line by line
+	char *line, *saveptr = NULL;
+	for(i = 0, line = strtok_r(cmd_data, "\n", &saveptr); line; line = strtok_r(NULL, "\n", &saveptr), i++) {
+		if (i == 0) { // Handle command response
+			if (streq(line, "NAK"))
+				return false;
+			if (streq(line, "ACK")) {
+				cmd_response = true;
+				continue;
+			}
+		}
+
+		if (i == 1 && cmd_response) { // The command must match
+			if (strstr(line, v->txt) != line)
+				return false;
+			continue;
+		}
+
+		// Parse command data response looking like that: "[slot_pos] [slot_data]"
+		bool valid_slot = false;
+		unsigned int slot_pos = 0;
+		char *slot_data = NULL;
+		switch (v->cmd) {
+		case CMD_INPUT_LABELS:
+		case CMD_OUTPUT_LABELS:
+		case CMD_VIDEO_OUTPUT_LOCKS:
+		case CMD_VIDEO_OUTPUT_ROUTING:
+			slot_data = strchr(line, ' ');
+			if (slot_data) {
+				slot_data[0] = '\0'; // Separate slot_pos from slot_data
+				slot_data++;
+				slot_pos = strtoul(line, NULL, 10);
+				if (slot_pos < ARRAY_SIZE(data->inputs))
+					valid_slot = true;
+			}
+			break;
+		default:
+			break;
+		}
+
+		// Parse commands
+		switch (v->cmd) {
+		case CMD_PROTOCOL_PREAMBLE:
+			if ((p = parse_text(line, "Version: ")))
+				snprintf(data->device.protocol_ver, sizeof(data->device.protocol_ver), "%s", p);
+			break;
+
+		case CMD_VIDEOHUB_DEVICE:
+			if ((p = parse_text(line, "Device present: ")))
+				data->device.dev_present = streq(p, "true");
+
+			if ((p = parse_text(line, "Model name: ")))
+				snprintf(data->device.model_name, sizeof(data->device.model_name), "%s", p);
+
+			if ((p = parse_text(line, "Unique ID: ")))
+				snprintf(data->device.unique_id, sizeof(data->device.unique_id) , "%s", p);
+
+			if ((p = parse_text(line, "Video inputs: ")))
+				data->device.num_video_inputs = strtoul(p, NULL, 10);
+
+			if ((p = parse_text(line, "Video processing units: ")))
+				data->device.num_video_processing_units = strtoul(p, NULL, 10);
+
+			if ((p = parse_text(line, "Video outputs: ")))
+				data->device.num_video_outputs = strtoul(p, NULL, 10);
+
+			if ((p = parse_text(line, "Video monitoring output: ")))
+				data->device.num_video_monitoring_outputs = strtoul(p, NULL, 10);
+
+			if ((p = parse_text(line, "Serial ports: ")))
+				data->device.num_serial_ports = strtoul(p, NULL, 10);
+			break;
+
+		case CMD_INPUT_LABELS:
+			if (valid_slot)
+				snprintf(data->inputs[slot_pos].name, sizeof(data->inputs[slot_pos].name), "%s", slot_data);
+			break;
+
+		case CMD_OUTPUT_LABELS:
+			if (valid_slot)
+				snprintf(data->outputs[slot_pos].name, sizeof(data->inputs[slot_pos].name), "%s", slot_data);
+			break;
+
+		case CMD_VIDEO_OUTPUT_LOCKS:
+			if (valid_slot)
+				data->inputs[slot_pos].locked = slot_data[0] == 'L' ? true : false;
+			break;
+
+		case CMD_VIDEO_OUTPUT_ROUTING:
+			if (valid_slot) {
+				unsigned int dest_pos = strtoul(slot_data, NULL, 10);
+				if (dest_pos < ARRAY_SIZE(data->outputs))
+					data->inputs[slot_pos].routed_to = dest_pos;
+			}
+			break;
+
+		case CMD_PING:
+			// Do nothing, we just get ACK without any data
+			break;
+		}
+	}
+	free(cmd_data);
+
+	/* Check if everything is within limits */
+	switch (v->cmd) {
+	case CMD_PROTOCOL_PREAMBLE:
+		if (!streq(data->device.protocol_ver, "2.4")) {
+			if (!quiet) {
+				fprintf(stderr, "WARNING: Device protocol is %s but this program is tested with 2.4 only.\n",
+					data->device.protocol_ver);
+				fprintf(stderr, "         Please report successes/failures to author's email: georgi@unixsol.org\n");
+				fprintf(stderr, "         You may use -q or --quiet to suppress the message.\n");
+			}
+		}
+		break;
+	case CMD_VIDEOHUB_DEVICE:
+		if (!data->device.dev_present) {
+			die("Device reports that it's not present.");
+		}
+		if (data->device.num_video_inputs > ARRAY_SIZE(data->inputs)) {
+			die("The device supports %d inputs. Recompile the program with more MAX_INPUTS (currently %d)",
+				data->device.num_video_inputs, MAX_INPUTS);
+		}
+		if (data->device.num_video_outputs > ARRAY_SIZE(data->outputs)) {
+			die("The device supports %d outputs. Recompile the program with more MAX_OUTPUTS (currently %d)\n",
+				data->device.num_video_outputs, MAX_OUTPUTS);
+		}
+	default:
+		break;
+	}
+
+	return true;
+}

cmd.h

@@ -0,0 +1,18 @@
+/*
+ * === Command parser ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#ifndef CMD_H
+#define CMD_H
+
+bool parse_command(struct videohub_data *d, char *cmd);
+
+#endif

data.h

@@ -0,0 +1,66 @@
+/*
+ * === Main data structures and helpers ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#ifndef DATA_H
+#define DATA_H
+
+#include <stdbool.h>
+
+#define MAX_INPUTS 64
+#define MAX_OUTPUTS 64
+#define MAX_NAME_LEN 64
+
+struct device_desc {
+	bool			dev_present;
+	char			protocol_ver[16];
+	char			model_name[MAX_NAME_LEN];
+	char			unique_id[MAX_NAME_LEN];
+	unsigned int	num_video_inputs;
+	unsigned int	num_video_processing_units;
+	unsigned int	num_video_outputs;
+	unsigned int	num_video_monitoring_outputs;
+	unsigned int	num_serial_ports;
+};
+
+struct input_desc {
+	char			name[MAX_NAME_LEN];
+	bool			locked;
+	unsigned int	routed_to;
+};
+
+struct output_desc {
+	char			name[MAX_NAME_LEN];
+};
+
+struct videohub_data {
+	char					*dev_host;
+	char					*dev_port;
+	int						dev_fd;
+	struct device_desc		device;
+	struct input_desc		inputs[MAX_INPUTS];
+	struct output_desc		outputs[MAX_OUTPUTS];
+};
+
+extern int verbose;
+extern int quiet;
+
+#define v(fmt, arguments...) \
+	do { \
+		if (verbose) \
+			printf("verbose: " fmt, ## arguments); \
+	} while(0)
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+
+#endif

libfuncs

@@ -0,0 +1 @@
+Subproject commit 0f6dacb790a6989b5c3b310d676022b9159c7115

net.c

@@ -0,0 +1,103 @@
+/*
+ * === Network functions ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/errno.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+
+#include "data.h"
+#include "net.h"
+
+#include "libfuncs/libfuncs.h"
+
+int ai_family = AF_UNSPEC;
+
+static 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;
+	}
+}
+
+int connect_client(int socktype, const char *hostname, const char *service) {
+	struct addrinfo hints, *res;
+	int n;
+
+	memset(&hints, 0, sizeof(struct addrinfo));
+
+	hints.ai_family = ai_family;
+	hints.ai_socktype = socktype;
+
+	v("Connecting to server %s port %s\n", hostname, service);
+
+	n = getaddrinfo(hostname, service, &hints, &res);
+
+	if (n < 0) {
+		fprintf(stderr, "ERROR: getaddrinfo(%s): %s\n", hostname, gai_strerror(n));
+		return -1;
+	}
+
+	int sockfd = -1;
+	struct addrinfo *ressave = res;
+	char str_addr[INET6_ADDRSTRLEN] = { 0 };
+	while (res) {
+		sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (sockfd > -1) {
+			my_inet_ntop(res->ai_family, res->ai_addr, str_addr, sizeof(str_addr));
+			if (do_connect(sockfd, res->ai_addr, res->ai_addrlen, 1000) < 0) {
+				fprintf(stderr, "ERROR: Cant connect to server %s port %s (addr=%s) | %s\n",
+					hostname, service, str_addr, strerror(errno));
+				close(sockfd);
+				sockfd = -1;
+			} else {
+				break; // connected
+			}
+		} else {
+			fprintf(stderr, "ERROR: Could not create socket: %s\n", strerror(errno));
+			sleep(1); // 1 second between socket creation (after error)
+			return -1;
+		}
+		res = res->ai_next;
+	}
+	freeaddrinfo(ressave);
+
+	if (sockfd < 0)
+		return -1;
+
+	if (socktype == SOCK_STREAM) {
+		int flag = 1;
+		setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int));
+	}
+
+	v("Connected to server %s port %s (addr=%s fd=%d).\n",
+		hostname, service, str_addr, sockfd);
+
+	set_sock_nonblock(sockfd);
+
+	return sockfd;
+}

net.h

@@ -0,0 +1,18 @@
+/*
+ * === Network functions ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#ifndef _NET_H
+#define _NET_H
+
+int connect_client(int socktype, const char *hostname, const char *service);
+
+#endif

util.c

@@ -0,0 +1,83 @@
+/*
+ * === Utility functions ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <malloc.h>
+#include <unistd.h>
+
+#include "util.h"
+
+void die(const char *fmt, ...) {
+	va_list args;
+	va_start(args, fmt);
+	fprintf(stderr, "ERROR: ");
+	vfprintf(stderr, fmt, args);
+	if (fmt[strlen(fmt) - 1] != '\n')
+		fprintf(stderr, "\n");
+	va_end(args);
+	exit(EXIT_FAILURE);
+}
+
+void *xmalloc(size_t size) {
+	void *ret = memalign(16, size);
+	if (!ret)
+		die("Can't alloc %ld bytes\n", (unsigned long)size);
+	return ret;
+}
+
+void *xzalloc(size_t size) {
+	void *ret = xmalloc(size);
+	memset(ret, 0, size);
+	return ret;
+}
+
+void *xcalloc(size_t nmemb, size_t size) {
+	return xzalloc(nmemb * size);
+}
+
+void *xrealloc(void *ptr, size_t size) {
+	void *ret = realloc(ptr, size);
+	if (!ret)
+		die("Can't realloc %ld bytes\n", (unsigned long)size);
+	return ret;
+}
+
+char *xstrdup(const char *s) {
+	char *ret;
+	if (!s)
+		return NULL;
+	ret = strdup(s);
+	if (!ret)
+		die("Can't strdup %lu bytes\n", (unsigned long)strlen(s) + 1);
+	return ret;
+}
+
+char *xstrndup(const char *s, size_t n) {
+	char *ret;
+	if (!s)
+		return NULL;
+	ret = strndup(s, n);
+	if (!ret)
+		die("Can't strndup %lu bytes\n", (unsigned long)n + 1);
+	return ret;
+}
+
+bool streq(const char *s1, const char *s2) {
+	if(!s1 && s2) { return 0; }
+	if(s1 && !s2) { return 0; }
+	if(!s1 && !s2) { return 1; }
+	return strcmp(s1, s2) == 0;
+}

util.h

@@ -0,0 +1,30 @@
+/*
+ * === Utility functions ===
+ *
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#ifndef _UTIL_H
+#define _UTIL_H
+
+#include <stdbool.h>
+#include <inttypes.h>
+#include <sys/time.h>
+
+void die(const char *fmt, ...) __attribute__ ((format(printf, 1, 2)));
+void *xmalloc(size_t size);
+void *xzalloc(size_t size);
+void *xcalloc(size_t nmemb, size_t size);
+void *xrealloc(void *ptr, size_t size);
+char *xstrdup(const char *s);
+char *xstrndup(const char *s, size_t n);
+
+bool streq(const char *s1, const char *s2);
+
+#endif

version.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+# Create/Update version.h
+# Written by Georgi Chorbadzhiyski
+
+VERSION=$(cat RELEASE 2>/dev/null || echo 'unknown')
+GIT_VER=$(git describe --tags --dirty --always 2>/dev/null || echo 'release')
+
+TMPFILE=`mktemp /tmp/version.h.XXXXXX` || exit 1
+
+trap "{ rm -f $TMPFILE ; exit 1 ; }" INT TERM
+
+echo "\
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+#define VERSION \"${VERSION}\"
+#define GIT_VER \"${GIT_VER}\"
+#define PROGRAM_NAME \"videohubctrl\"
+
+#endif\
+" > $TMPFILE
+
+if ! cmp version.h $TMPFILE >/dev/null 2>/dev/null
+then
+	cat $TMPFILE > version.h
+	echo "Updated version.h with VERSION=${VERSION} GIT_VER=${GIT_VER}"
+else
+	echo "version.h is up to date with VERSION=${VERSION} GIT_VER=${GIT_VER}"
+fi
+
+rm -f $TMPFILE

videohubctrl.c

@@ -0,0 +1,173 @@
+/*
+ * Blackmagic Design Videohub control application
+ * Copyright (C) 2014 Unix Solutions Ltd.
+ * Written by Georgi Chorbadzhiyski
+ *
+ * Released under MIT license.
+ * See LICENSE-MIT.txt for license terms.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+
+#include "data.h"
+#include "cmd.h"
+#include "net.h"
+#include "util.h"
+#include "version.h"
+
+#include "libfuncs/libfuncs.h"
+
+int verbose;
+int quiet;
+
+static struct videohub_data maindata;
+static int show_info = 1;
+
+static const char *program_id = PROGRAM_NAME " Version: " VERSION " Git: " GIT_VER;
+
+static const char short_options[] = "s:p:qvhVi";
+
+static const struct option long_options[] = {
+	{ "host",				required_argument, NULL, 's' },
+	{ "port",				required_argument, NULL, 'p' },
+	{ "quiet",				no_argument,       NULL, 'q' },
+	{ "verbose",			no_argument,       NULL, 'v' },
+	{ "help",				no_argument,       NULL, 'h' },
+	{ "version",			no_argument,       NULL, 'V' },
+	{ "info",				no_argument,       NULL, 'i' },
+	{ 0, 0, 0, 0 }
+};
+
+static void show_help(struct videohub_data *data) {
+	printf("\n");
+	printf(" Usage: " PROGRAM_NAME " --host <host> [..commands..]\n");
+	printf("\n");
+	printf("Main options:\n");
+	printf(" -s --host <hostname>       | Set device hostname.\n");
+	printf(" -p --port <port_number>    | Set device port (default: 9990).\n");
+	printf("\n");
+	printf("Misc options:\n");
+	printf(" -v --verbose               | Enable verbose logging.\n");
+	printf(" -q --quiet                 | Suppress warnings.\n");
+	printf(" -h --help                  | Show help screen.\n");
+	printf(" -V --version               | Show program version.\n");
+	printf("\n");
+	printf("Commands:\n");
+	printf(" -i --info                  | Show device info (default command).\n");
+	printf("\n");
+}
+
+static void parse_options(struct videohub_data *data, int argc, char **argv) {
+	int j, err = 0;
+	// Set defaults
+	data->dev_port = "9990";
+	while ((j = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+		switch (j) {
+			case 's': // --host
+				data->dev_host = optarg;
+				break;
+			case 'p': // --port
+				data->dev_port = optarg;
+				break;
+			case 'v': // --verbose
+				verbose = !verbose;
+				if (verbose)
+					quiet = 0; // Disable quiet
+				break;
+			case 'q': // --quiet
+				quiet = !quiet;
+				break;
+			case 'i': // --info
+				show_info = 1;
+				break;
+			case 'h': // --help
+				show_help(data);
+				exit(EXIT_SUCCESS);
+			case 'V': // --version
+				// program_id is already printed on startup, just exit.
+				exit(EXIT_SUCCESS);
+		}
+	}
+
+	if (!data->dev_host || !strtoul(data->dev_port, NULL, 10))
+		err = 1;
+
+	if (err) {
+		show_help(data);
+		if (!data->dev_host)
+			fprintf(stderr, "ERROR: host is not set. Use --host option.\n");
+		exit(EXIT_FAILURE);
+	}
+
+	v("Device address: %s:%s\n", data->dev_host, data->dev_port);
+}
+
+static void print_device_desc(struct device_desc *d) {
+	printf("\n");
+	printf("Protocol version: %s\n", d->protocol_ver);
+	printf("Model name: %s\n", d->model_name);
+	printf("Unique ID: %s\n", d->unique_id);
+	printf("Video inputs: %u\n", d->num_video_inputs);
+	printf("Video processing units: %u\n", d->num_video_processing_units);
+	printf("Video outputs: %u\n", d->num_video_outputs);
+	printf("Video monitoring outputs: %u\n", d->num_video_monitoring_outputs);
+	printf("Serial ports: %u\n", d->num_serial_ports);
+}
+
+static void printf_line(int len) {
+	int i;
+	for (i = 0; i < len; i++)
+		printf("-");
+	printf("\n");
+}
+
+static void print_device_settings(struct videohub_data *d) {
+	unsigned int i;
+	printf("\n");
+	printf_line(76);
+	printf("|  # | x | %-30s | %-30s |\n", "Input name", "Output name");
+	printf_line(76);
+	for(i = 0; i < d->device.num_video_inputs; i++) {
+		printf("| %2d | %c | %-30s | %-30s |\n",
+			i + 1,
+			d->inputs[i].locked ? 'L' : ' ',
+			d->inputs[i].name,
+			d->outputs[d->inputs[i].routed_to].name
+		);
+	}
+	printf_line(76);
+}
+
+int main(int argc, char **argv) {
+	struct videohub_data *data = &maindata;
+
+	printf("%s\n", program_id);
+
+	parse_options(data, argc, argv);
+	set_log_io_errors(0);
+
+	data->dev_fd = connect_client(SOCK_STREAM, data->dev_host, data->dev_port);
+	if (data->dev_fd < 0)
+		exit(EXIT_FAILURE);
+
+	int ret;
+	char buf[8192 + 1];
+	memset(buf, 0, sizeof(buf));
+	while ((ret = fdread_ex(data->dev_fd, buf, sizeof(buf) - 1, 5, 0, 0)) >= 0) {
+		parse_command(data, buf);
+		memset(buf, 0, sizeof(buf));
+	}
+	shutdown_fd(&data->dev_fd);
+
+	if (show_info) {
+		print_device_desc(&data->device);
+		print_device_settings(data);
+		fflush(stdout);
+	}
+
+	return 0;
+}