Postpone resolving of DNS names of server.

We used to resolve DNS names when reading configuration.  We now do it
in event_init_socket() and cache the result in the connection object.

The imminent need for changing this is to keep host names around for
X509 certificate verification (CNAME and subjectAltName).  This will
also help later when we implement server failover (and later, when
people want to do more dynamic configuration, f.ex. NAPTR).

1 files changed, 19 insertions, 8 deletions

diff --git a/lib/event.c b/lib/event.c
index ff05012..2229689 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -19,6 +19,8 @@
 #if defined (RS_ENABLE_TLS)
 #include "tls.h"
 #endif
+#include "err.h"
+#include "radsec.h"
 #include "event.h"
 #include "packet.h"
 #include "conn.h"
@@ -97,9 +99,16 @@ event_init_socket (struct rs_connection *conn, struct rs_peer *p)
   if (conn->fd != -1)
     return RSE_OK;
 
-  assert (p->addr);
-  conn->fd = socket (p->addr->ai_family, p->addr->ai_socktype,
-		     p->addr->ai_protocol);
+  if (p->addr_cache == NULL)
+    {
+      struct rs_error *err =
+        rs_resolve (&p->addr_cache, p->realm->type, p->hostname, p->service);
+      if (err != NULL)
+        return err_conn_push_err (conn, err);
+    }
+
+  conn->fd = socket (p->addr_cache->ai_family, p->addr_cache->ai_socktype,
+		     p->addr_cache->ai_protocol);
   if (conn->fd < 0)
     return rs_err_conn_push_fl (conn, RSE_SOCKERR, __FILE__, __LINE__,
 				"socket: %d (%s)",
@@ -168,8 +177,8 @@ event_do_connect (struct rs_connection *conn)
   {
     char host[80], serv[80];
 
-    getnameinfo (p->addr->ai_addr,
-		 p->addr->ai_addrlen,
+    getnameinfo (p->addr_cache->ai_addr,
+		 p->addr_cache->ai_addrlen,
 		 host, sizeof(host), serv, sizeof(serv),
 		 0 /* NI_NUMERICHOST|NI_NUMERICSERV*/);
     rs_debug (("%s: connecting to %s:%s\n", __func__, host, serv));
@@ -179,8 +188,8 @@ event_do_connect (struct rs_connection *conn)
   if (p->conn->bev)		/* TCP */
     {
       conn_activate_timeout (conn); /* Connect timeout.  */
-      err = bufferevent_socket_connect (p->conn->bev, p->addr->ai_addr,
-					p->addr->ai_addrlen);
+      err = bufferevent_socket_connect (p->conn->bev, p->addr_cache->ai_addr,
+					p->addr_cache->ai_addrlen);
       if (err < 0)
 	rs_err_conn_push_fl (p->conn, RSE_EVENT, __FILE__, __LINE__,
 			     "bufferevent_socket_connect: %s",
@@ -190,7 +199,9 @@ event_do_connect (struct rs_connection *conn)
     }
   else				/* UDP */
     {
-      err = connect (p->conn->fd, p->addr->ai_addr, p->addr->ai_addrlen);
+      err = connect (p->conn->fd,
+                     p->addr_cache->ai_addr,
+                     p->addr_cache->ai_addrlen);
       if (err < 0)
 	{
 	  sockerr = evutil_socket_geterror (p->conn->fd);