library: Export VPN configuration info to callers

Make a new library call to obtain IP configuration and X-{CSTP,DTLS}-*
parameters.  Use the new call from main.c instead of directly accessing
the private vpninfo elements.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

libopenconnect.map.in

@@ -47,6 +47,7 @@ OPENCONNECT_3.1 {
 	openconnect_set_server_cert_sha1;
 	openconnect_get_ifname;
 	openconnect_set_reqmtu;
+	openconnect_get_ip_info;
 } OPENCONNECT_3.0;
 
 OPENCONNECT_PRIVATE {

library.c

@@ -244,6 +244,20 @@ void openconnect_set_reqmtu(struct openconnect_info *vpninfo, int reqmtu)
 	vpninfo->reqmtu = reqmtu;
 }
 
+int openconnect_get_ip_info(struct openconnect_info *vpninfo,
+			    const struct oc_ip_info **info,
+			    const struct oc_vpn_option **cstp_options,
+			    const struct oc_vpn_option **dtls_options)
+{
+	if (info)
+		*info = &vpninfo->ip_info;
+	if (cstp_options)
+		*cstp_options = vpninfo->cstp_options;
+	if (dtls_options)
+		*dtls_options = vpninfo->dtls_options;
+	return 0;
+}
+
 void openconnect_setup_csd(struct openconnect_info *vpninfo, uid_t uid, int silent, char *wrapper)
 {
 	vpninfo->uid_csd = uid;

main.c

@@ -510,6 +510,7 @@ int main(int argc, char **argv)
 	char *proxy = getenv("https_proxy");
 	int script_tun = 0;
 	char *vpnc_script = NULL, *ifname = NULL;
+	const struct oc_ip_info *ip_info;
 	int autoproxy = 0;
 	uid_t uid = getuid();
 	int opt;
@@ -932,11 +933,12 @@ int main(int argc, char **argv)
 	if (use_dtls && openconnect_setup_dtls(vpninfo, 60))
 		fprintf(stderr, _("Set up DTLS failed; using SSL instead\n"));
 
+	openconnect_get_ip_info(vpninfo, &ip_info, NULL, NULL);
 	vpn_progress(vpninfo, PRG_INFO,
 		     _("Connected %s as %s%s%s, using %s\n"), openconnect_get_ifname(vpninfo),
-		     vpninfo->ip_info.addr?:"",
-		     (vpninfo->ip_info.addr6 && vpninfo->ip_info.addr) ? " + " : "",
-		     vpninfo->ip_info.addr6 ? : "",
+		     ip_info->addr?:"",
+		     (ip_info->addr6 && ip_info->addr) ? " + " : "",
+		     ip_info->addr6 ? : "",
 		     (vpninfo->dtls_fd == -1) ?
 		     (vpninfo->deflate ? "SSL + deflate" : "SSL")
 		     : "DTLS");

openconnect.h

@@ -257,6 +257,15 @@ void openconnect_set_server_cert_sha1(struct openconnect_info *, char *);
 const char *openconnect_get_ifname(struct openconnect_info *);
 void openconnect_set_reqmtu(struct openconnect_info *, int reqmtu);
 
+/* The returned structures are owned by the library and may be freed/replaced
+   due to rekey or reconnect. Assume that once the mainloop starts, the
+   pointers are no longer valid. For similar reasons, it is unsafe to call
+   this function from another thread. */
+int openconnect_get_ip_info(struct openconnect_info *,
+			    const struct oc_ip_info **info,
+			    const struct oc_vpn_option **cstp_options,
+			    const struct oc_vpn_option **dtls_options);
+
 /* This is *not* yours and must not be destroyed with X509_free(). It
  * will be valid when a cookie has been obtained successfully, and will
  * be valid until the connection is destroyed or another attempt it made