4 files changed, 22 insertions, 7 deletions

diff --git a/doc/mans/tinyrad_options.3.in b/doc/mans/tinyrad_options.3.in
index 701d89e..a5b83f5 100644
--- a/doc/mans/tinyrad_options.3.in
+++ b/doc/mans/tinyrad_options.3.in
@@ -111,6 +111,12 @@ Sets/gets timeout for socket/network operations.  \fIinvalue\fR must be a
 \fBstruct timeval *\fR.
 
 .TP
+.B TRAD_OPT_SCHEME
+Retrieves the configured scheme of the client library. \fIoutvalue\fR must be
+a \fBint *\fR. Valid schemes are \fBTRAD_RADIUS\fR, \fBTRAD_RADIUS_ACCT\fR,
+\fBTRAD_RADIUS_DYNAUTH\fR, and \fBTRAD_RADSEC\fR. This is a read-only option.
+
+.TP
 .B TRAD_OPT_SOCKET_BIND_ADDRESSES
 Sets/gets a space-separated list of IP Addresses used to bind the local socket
 when connecting to a remote server.  Only one valid IPv4 address and/or one
diff --git a/include/tinyrad.h b/include/tinyrad.h
index bc17b3e..3afb9cb 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -143,6 +143,7 @@
 #define TRAD_OPT_TIMEOUT            9
 #define TRAD_OPT_DEBUG_IDENT       10
 #define TRAD_OPT_DEBUG_SYSLOG      11
+#define TRAD_OPT_SCHEME            12
 
 // library debug levels
 #define TRAD_DEBUG_NONE             0
diff --git a/lib/libtinyrad/libtinyrad.h b/lib/libtinyrad/libtinyrad.h
index bfb4a92..301efb8 100644
--- a/lib/libtinyrad/libtinyrad.h
+++ b/lib/libtinyrad/libtinyrad.h
@@ -94,6 +94,8 @@ struct _tinyrad
    struct sockaddr_in6 * bind_sa6;
    struct timeval *      net_timeout;
    uint32_t              authenticator;
+   uint32_t              pad32;
+   unsigned              scheme;
    unsigned              opts;
    int                   s;
    int                   timeout;
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index b7d08ca..ec37044 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -206,6 +206,12 @@ tinyrad_get_option(
       ((struct timeval *)outvalue)->tv_usec  = tr->net_timeout->tv_usec;
       break;
 
+      case TRAD_OPT_SCHEME:
+      TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SCHEME, outvalue )", __FUNCTION__);
+      TinyRadDebug(TRAD_DEBUG_ARGS, "   <= outvalue: %i", tr->scheme);
+      *((int *)outvalue) = tr->scheme;
+      break;
+
       case TRAD_OPT_SOCKET_BIND_ADDRESSES:
       TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, outvalue )", __FUNCTION__);
       inet_ntop(AF_INET, &tr->bind_sa->sin_addr, bind_buff, sizeof(struct sockaddr_in));
@@ -324,12 +330,7 @@ tinyrad_initialize(
    tr->authenticator = u32;
 
    // parses URL
-   if ((rc = tinyrad_urldesc_parse(url, &tr->trud)) != TRAD_SUCCESS)
-   {
-      tinyrad_destroy(tr);
-      return(rc);
-   };
-   if ((rc = tinyrad_urldesc_resolve(tr->trud, (uint32_t)opts)) != TRAD_SUCCESS)
+   if ((rc = tinyrad_set_option(tr, TRAD_OPT_URI, url)) != TRAD_SUCCESS)
    {
       tinyrad_destroy(tr);
       return(rc);
@@ -432,6 +433,10 @@ tinyrad_set_option(
       memcpy(tr->net_timeout, ((const struct timeval *)invalue), sizeof(struct timeval));
       break;
 
+      case TRAD_OPT_SCHEME:
+      TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SCHEME, invalue )", __FUNCTION__);
+      return(TRAD_EOPTERR);
+
       case TRAD_OPT_SOCKET_BIND_ADDRESSES:
       TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, invalue )", __FUNCTION__);
       if (tr->s != -1)
@@ -455,7 +460,8 @@ tinyrad_set_option(
          return(rc);
       };
       tinyrad_urldesc_free(tr->trud);
-      tr->trud = trud;
+      tr->scheme  = tinyrad_urldesc_scheme(trud);
+      tr->trud    = trud;
       break;
 
       default: