libtinyrad: adding TRAD_BUILTIN_DICT

4 files changed, 28 insertions, 7 deletions

diff --git a/include/tinyrad.h b/include/tinyrad.h
index b9cefec..847faf9 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -184,6 +184,7 @@
 // library user options
 #define TRAD_OPTS_USER              0x000FFFFFU
 #define TRAD_NOINIT                 0x00000001U
+#define TRAD_BUILTIN_DICT           0x00000002U
 #define TRAD_IPV4                   0x00000004U
 #define TRAD_IPV6                   0x00000008U
 #define TRAD_IP_UNSPEC              (TRAD_IPV4 | TRAD_IPV6)
diff --git a/lib/libtinyrad/lconf.c b/lib/libtinyrad/lconf.c
index 5d70fe5..0bb14b9 100644
--- a/lib/libtinyrad/lconf.c
+++ b/lib/libtinyrad/lconf.c
@@ -246,6 +246,21 @@ tinyrad_conf_opt(
       return(tinyrad_set_option(tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, value));
    };
 
+   if (!(strcasecmp(name, "builtin_dictionary")))
+   {
+      if ( (!(dict)) || (( (dict->opts | dict->opts_neg) & TRAD_BUILTIN_DICT )) )
+         return(TRAD_SUCCESS);
+      if ( ((dict->opts | dict->opts_neg) & TRAD_BUILTIN_DICT) != 0 )
+         return(TRAD_SUCCESS);
+      if (!(value))
+         dict->opts |= TRAD_BUILTIN_DICT;
+      else if (!(strcasecmp(value, "yes")))
+         dict->opts |= TRAD_BUILTIN_DICT;
+      else if (!(strcasecmp(value, "no")))
+         dict->opts_neg |= TRAD_BUILTIN_DICT;
+      return(TRAD_SUCCESS);
+   };
+
    if (!(strcasecmp(name, "network_timeout")))
    {
       if ( (!(tr)) || ((tr->net_timeout)) || (!(value)) )
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index 0b0fce0..433b66c 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -837,13 +837,23 @@ tinyrad_dict_initialize(
    // initializes read-only flag
    atomic_init(&dict->readonly, TRAD_NO);
 
-   // load defaults
+   // load configuration
    if ((rc = tinyrad_conf(NULL, dict, opts)) != TRAD_SUCCESS)
    {
       tinyrad_dict_free(dict);
       return(rc);
    };
 
+   // load builtin dictionary
+   if ((dict->opts & TRAD_BUILTIN_DICT) == TRAD_BUILTIN_DICT)
+   {
+      if ((rc = tinyrad_dict_defaults(dict, NULL)) != TRAD_SUCCESS)
+      {
+         tinyrad_dict_free(dict);
+         return(rc);
+      };
+   };
+
    *dictp = tinyrad_obj_retain(&dict->obj);
 
    return(TRAD_SUCCESS);
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index 1e7bc20..17b6cbc 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -307,12 +307,7 @@ tinyrad_initialize(
    // retain or initialize dictionary
    if ((tr->dict = tinyrad_obj_retain(&dict->obj)) == NULL)
    {
-      if ((rc = tinyrad_dict_initialize(&tr->dict, TRAD_NOINIT)) != TRAD_SUCCESS)
-      {
-         tinyrad_tiyrad_free(tr);
-         return(rc);
-      };
-      if ((rc = tinyrad_dict_defaults(tr->dict, NULL)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_dict_initialize(&tr->dict, (TRAD_NOINIT|TRAD_BUILTIN_DICT))) != TRAD_SUCCESS)
       {
          tinyrad_tiyrad_free(tr);
          return(rc);