Merge pull request #325 from nuclearcat/cli-ipv6-fixes

cli: proper ipv6 support for cli interface

1 files changed, 25 insertions, 27 deletions

diff --git a/accel-pppd/cli/tcp.c b/accel-pppd/cli/tcp.c
index 8952661a..beba16ca 100644
--- a/accel-pppd/cli/tcp.c
+++ b/accel-pppd/cli/tcp.c
@@ -24,7 +24,7 @@ struct tcp_client_t {
 	struct cli_client_t cli_client;
 	struct list_head entry;
 	struct triton_md_handler_t hnd;
-	struct sockaddr_in addr;
+	struct sockaddr_storage addr;
 	struct list_head xmit_queue;
 	struct buffer_t *xmit_buf;
 	uint8_t *cmdline;
@@ -174,8 +174,10 @@ static int cln_read(struct triton_md_handler_t *h)
 					goto disconn_hard;
 				cln->auth = 1;
 			} else {
-				if (conf_verbose == 2)
-					log_info2("cli: %s: %s\n", inet_ntoa(cln->addr.sin_addr), cln->cmdline);
+				if (conf_verbose == 2) {
+					char buf[INET6_ADDRSTRLEN];
+					log_info2("cli: %s: %s\n", cli_addr_str(&cln->addr, buf, sizeof(buf)), cln->cmdline);
+				}
 
 				cli_process_cmd(&cln->cli_client);
 			}
@@ -248,12 +250,14 @@ disconn:
 
 static int serv_read(struct triton_md_handler_t *h)
 {
-  struct sockaddr_in addr;
-	socklen_t size = sizeof(addr);
+	struct sockaddr_storage addr;
+	socklen_t size;
 	int sock;
 	struct tcp_client_t *conn;
+	char buf[INET6_ADDRSTRLEN];
 
 	while(1) {
+		size = sizeof(addr);
 		sock = accept(h->fd, (struct sockaddr *)&addr, &size);
 		if (sock < 0) {
 			if (errno == EAGAIN)
@@ -263,7 +267,7 @@ static int serv_read(struct triton_md_handler_t *h)
 		}
 
 		if (conf_verbose)
-			log_info2("cli: tcp: new connection from %s\n", inet_ntoa(addr.sin_addr));
+			log_info2("cli: tcp: new connection from %s\n", cli_addr_str(&addr, buf, sizeof(buf)));
 
 		if (fcntl(sock, F_SETFL, O_NONBLOCK)) {
 			log_error("cli: tcp: failed to set nonblocking mode: %s, closing connection...\n", strerror(errno));
@@ -320,9 +324,16 @@ static struct triton_md_handler_t serv_hnd = {
 
 static void start_server(const char *host, int port)
 {
-  struct sockaddr_in addr;
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+	int f = 1;
+
+	if (cli_bind_addr(host, port, &addr, &addrlen) < 0) {
+		log_emerg("cli: tcp: invalid address '%s'\n", host);
+		return;
+	}
 
-	serv_hnd.fd = socket(PF_INET, SOCK_STREAM, 0);
+	serv_hnd.fd = socket(addr.ss_family, SOCK_STREAM, 0);
   if (serv_hnd.fd < 0) {
     log_emerg("cli: tcp: failed to create server socket: %s\n", strerror(errno));
     return;
@@ -330,16 +341,8 @@ static void start_server(const char *host, int port)
 
 	fcntl(serv_hnd.fd, F_SETFD, fcntl(serv_hnd.fd, F_GETFD) | FD_CLOEXEC);
 
-	memset(&addr, 0, sizeof(addr));
-  addr.sin_family = AF_INET;
-  addr.sin_port = htons(port);
-	if (host)
-		addr.sin_addr.s_addr = inet_addr(host);
-	else
-		addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-  setsockopt(serv_hnd.fd, SOL_SOCKET, SO_REUSEADDR, &serv_hnd.fd, 4);
-  if (bind (serv_hnd.fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
+  setsockopt(serv_hnd.fd, SOL_SOCKET, SO_REUSEADDR, &f, sizeof(f));
+  if (bind (serv_hnd.fd, (struct sockaddr *) &addr, addrlen) < 0) {
     log_emerg("cli: tcp: failed to bind socket: %s\n", strerror(errno));
 		close(serv_hnd.fd);
     return;
@@ -378,7 +381,8 @@ static void load_config(void)
 static void init(void)
 {
 	const char *opt;
-	char *host, *d;
+	const char *addr;
+	char *host;
 	int port;
 
 	opt = conf_get_opt("cli", "tcp");
@@ -386,20 +390,14 @@ static void init(void)
 		return;
 
 	host = strdup(opt);
-	d = strstr(host, ":");
-	if (!d)
-		goto err_fmt;
-
-	*d = 0;
-	port = atoi(d + 1);
-	if (port <= 0)
+	if (cli_parse_hostport(host, &addr, &port) < 0)
 		goto err_fmt;
 
 	load_config();
 
 	temp_buf = malloc(RECV_BUF_SIZE);
 
-	start_server(host, port);
+	start_server(addr, port);
 
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);