libtinytac: adding option TTAC_OPT_RANDOM

2 files changed, 37 insertions, 4 deletions

diff --git a/include/tinytac.h b/include/tinytac.h
index b5897c7..ccb4121 100644
--- a/include/tinytac.h
+++ b/include/tinytac.h
@@ -118,9 +118,9 @@
 #define TTAC_IPV4                   0x00000002U
 #define TTAC_IPV6                   0x00000004U
 //                                  0x00000008U  UNUSED
-//                                  0x00000010U  UNUSED
-//                                  0x00000020U  UNUSED
-//                                  0x00000040U  UNUSED
+#define TTAC_RND_RAND               0x00000010U  ///< use rand()
+#define TTAC_RND_RANDOM             0x00000020U  ///< use random()
+#define TTAC_RND_URANDOM            0x00000040U  ///< use /dev/urandom
 #define TTAC_SERVER                 0x00000080U
 #define TTAC_ASCII                  0x00000100U  ///< allow ASCII authentication
 #define TTAC_PAP                    0x00000200U  ///< allow PAP authentication
@@ -129,6 +129,7 @@
 #define TTAC_MSCHAPV2               0x00001000U  ///< allow MSCHAPv2 authentication
 #define TTAC_AUTHEN_TYPES           (TTAC_ASCII | TTAC_PAP | TTAC_CHAP | TTAC_MSCHAP | TTAC_MSCHAPV2 )
 #define TTAC_IP_UNSPEC              (TTAC_IPV4 | TTAC_IPV6)
+#define TTAC_RND_METHODS            (TTAC_RND_RAND | TTAC_RND_RANDOM | TTAC_RND_URANDOM)
 
 
 #define TTAC_NO                     0
@@ -139,6 +140,7 @@
 #define TTAC_OPT_DEBUG_LEVEL        1
 #define TTAC_OPT_DEBUG_IDENT        2
 #define TTAC_OPT_DEBUG_SYSLOG       3
+#define TTAC_OPT_RANDOM             4
 #define TTAC_OPT_NOINIT             5
 #define TTAC_OPT_IPV4               6
 #define TTAC_OPT_IPV6               7
@@ -170,12 +172,13 @@
 #define TTAC_DFLT_DEBUG_SYSLOG            TTAC_NO
 #define TTAC_DFLT_HOSTS                   "localhost"
 #define TTAC_DFLT_SECRETS                 NULL
-#define TTAC_DFLT_OPTS                    0
+#define TTAC_DFLT_OPTS                    ( TTAC_RND_URANDOM )
 #define TTAC_DFLT_OPTS_NEG                0
 #define TTAC_DFLT_PORT                    49
 #define TTAC_DFLT_TIMEOUT                 10
 #define TTAC_DFLT_NET_TIMEOUT_SEC         10
 #define TTAC_DFLT_NET_TIMEOUT_USEC        0
+#define TTAC_DFLT_RANDOM                  TTAC_RND_URANDOM
 
 
 //////////////////
diff --git a/lib/libtinytac/lmemory.c b/lib/libtinytac/lmemory.c
index 3f332cb..ca1332b 100644
--- a/lib/libtinytac/lmemory.c
+++ b/lib/libtinytac/lmemory.c
@@ -266,6 +266,19 @@ tinytac_get_option(
          return(TTAC_ENOMEM);
       return(TTAC_SUCCESS);
 
+      case TTAC_OPT_RANDOM:
+      optsp = ((tt)) ? &tt->opts : &tinytac_dflt.opts;
+      TinyTacDebug(TTAC_DEBUG_ARGS, "   == %s( %s, TTAC_OPT_RANDOM, outvalue )", __func__, (((tt)) ? "tt" : "NULL"));
+      switch(*optsp & TTAC_RND_METHODS)
+      {
+         case TTAC_RND_RAND:    TinyTacDebug(TTAC_DEBUG_ARGS, "   <= outvalue: %s", TTAC_RND_RAND); break;
+         case TTAC_RND_RANDOM:  TinyTacDebug(TTAC_DEBUG_ARGS, "   <= outvalue: %s", TTAC_RND_RANDOM);  break;
+         case TTAC_RND_URANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, "   <= outvalue: %s", TTAC_RND_URANDOM); break;
+         default:               TinyTacDebug(TTAC_DEBUG_ARGS, "   <= outvalue: %u", (*optsp & TTAC_RND_METHODS)); break;
+      };
+      *((int *)outvalue) = *optsp & TTAC_RND_METHODS;
+      return(TTAC_SUCCESS);
+
       default:
       break;
    };
@@ -407,6 +420,23 @@ tinytac_set_option(
       ival = ((invalue)) ? *((const int *)invalue) : TTAC_YES;
       return(tinytac_set_option_flag(tt, TTAC_NOINIT, &ival));
 
+      case TTAC_OPT_RANDOM:
+      TinyTacDebug(  TTAC_DEBUG_ARGS, "   == %s( %s, TTAC_OPT_RANDOM, invalue )", __func__, (((tt)) ? "tt" : "NULL") );
+      idflt = ((tt))      ? tinytac_dflt.opts       : TTAC_DFLT_RANDOM;
+      ival  = ((invalue)) ? *((const int *)invalue) : (idflt & TTAC_RND_METHODS);
+      switch(ival)
+      {  case TTAC_RND_RAND:    TinyTacDebug(TTAC_DEBUG_ARGS, "   <= invalue: %s", "TTAC_RND_RAND");    break;
+         case TTAC_RND_RANDOM:  TinyTacDebug(TTAC_DEBUG_ARGS, "   <= invalue: %s", "TTAC_RND_RANDOM");  break;
+         case TTAC_RND_URANDOM: TinyTacDebug(TTAC_DEBUG_ARGS, "   <= invalue: %s", "TTAC_RND_URANDOM"); break;
+         default:               TinyTacDebug(TTAC_DEBUG_ARGS, "   <= invalue: %i", *((const int *)invalue)); return(TTAC_EOPTVAL);
+      };
+      tt = ((tt)) ? tt : &tinytac_dflt;
+      tt->opts     &= ~(TTAC_RND_METHODS);
+      tt->opts_neg &= ~(TTAC_RND_METHODS);
+      tt->opts     |= ival;
+      tt->opts_neg |= ~ival & TTAC_RND_METHODS;
+      return(TTAC_SUCCESS);
+
       case TTAC_OPT_TIMEOUT:
       TinyTacDebug(TTAC_DEBUG_ARGS, "   == %s( %s, TTAC_OPT_TIMEOUT, invalue )", __func__, (((tt)) ? "tt" : "NULL") );
       idflt = ((tt))      ? tinytac_dflt.timeout    : TTAC_DFLT_TIMEOUT;