Changelog for resolve_on_forward fix

ChangeLog

@@ -1,3 +1,8 @@
+v2.0.1:	
+	Fix resolve_on_forward setting, which would crash
+	sslh reliably.
+
+v2.0.0:
 v2.0:
 	New sslh-ev: this is functionally equivalent to
 	sslh-select (mono-process, only forks for specified

sslh-main.c

@@ -60,20 +60,26 @@ static void printcaps(void) {
 
 static void printsettings(void)
 {
-    char buf[NI_MAXHOST];
+    char buf[NI_MAXHOST + 256]; /* 256 > " family %d %d" for reasonable ints */
     int i;
     struct sslhcfg_protocols_item *p;
     
     for (i = 0; i < cfg.protocols_len; i++ ) {
         p = &cfg.protocols[i];
+        strcpy(buf, "resolve on forward");
+        if (!p->resolve_on_forward) {
+            sprintaddr(buf, sizeof(buf), p->saddr);
+            int len = strlen(buf);
+            sprintf(buf+len, " family %d %d", 
+                    p->saddr->ai_family,
+                    p->saddr->ai_addr->sa_family);
+        }
         print_message(msg_config, 
-                      "%s addr: %s. libwrap service: %s log_level: %d family %d %d [%s] [%s] [%s]\n",
+                      "%s addr: %s. libwrap service: %s log_level: %d [%s] [%s] [%s]\n",
                       p->name, 
-                      sprintaddr(buf, sizeof(buf), p->saddr), 
+                      buf,
                       p->service,
                       p->log_level,
-                      p->saddr->ai_family,
-                      p->saddr->ai_addr->sa_family,
                       p->keepalive ? "keepalive" : "",
                       p->fork ? "fork" : "",
                       p->transparent ? "transparent" : ""

t_load

@@ -14,7 +14,7 @@
 use strict;
 use IO::Socket::INET6;
 use Data::Dumper;
-use Conf::Libconfig;
+use Conf::Libconfig 1.0.3;
 
 ## BEGIN TEST CONFIG
 
@@ -44,7 +44,7 @@ $conf->read_file("test.cfg");
 
 
 # Pick one address for TCP and one for UDP
-my @listen = @{$conf->fetch_array("listen")};
+my @listen = @{$conf->value("listen")};
 my ($sslh_tcp_address, $sslh_udp_address);
 
 foreach my $l (@listen) {
@@ -186,7 +186,7 @@ sub udp_client {
     }
 }
 
-foreach my $p (@{$conf->fetch_array("protocols")}) {
+foreach my $p (@{$conf->value("protocols")}) {
     if (!fork) {
         my $udp = $p->{is_udp} ? "--udp" : "";
         my $cmd = "./echosrv $udp -p $p->{host}:$p->{port} --prefix '$p->{name}: ' 2> /dev/null";
@@ -203,7 +203,7 @@ sleep 2; # Let echosrv's and sslh start
 my ($c_in, $c_out);
 pipe $c_in, $c_out;
 
-my @protocols = @{$conf->fetch_array("protocols")};
+my @protocols = @{$conf->value("protocols")};
 
 if (!fork) {
     # Process that starts all the clients

test.cfg

@@ -42,7 +42,7 @@ listen:
  
 protocols:
 (
-     { name: "ssh";  host: "localhost"; port: "9000"; fork: true; transparent: true; },
+     { name: "ssh";  host: "localhost"; port: "9000"; fork: true; transparent: true; resolve_on_forward: true; },
      { name: "socks5";  host: "localhost"; port: "9001";  },
      { name: "http";  host: "localhost"; port: "9002";  },
      { name: "tinc";  host: "localhost"; port: "9003"; },
@@ -53,6 +53,7 @@ protocols:
      { name: "regex"; host: "ip4-localhost"; is_udp: true; port: "9020";
          udp_timeout: 30;
          regex_patterns: [ "^foo" ];
+         resolve_on_forward: true;
      },
      { name: "regex"; host: "localhost"; port: "9011";
         regex_patterns: [ "^foo", "^bar" ];

udp-listener.c

@@ -225,6 +225,11 @@ static void mark_active(struct connection* cnx)
 /* Creates a new non-blocking socket */
 static int nonblocking_socket(struct sslhcfg_protocols_item* proto)
 {
+    if (proto->resolve_on_forward) {
+        resolve_split_name(&(proto->saddr), proto->host,
+                           proto->port);
+    }
+
     int out = socket(proto->saddr->ai_family, SOCK_DGRAM, 0);
     int res = set_nonblock(out);
     if (res == -1) {