2 * dict.c Routines to read the dictionary file.
6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version.
11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Lesser General Public License for more details.
16 * You should have received a copy of the GNU Lesser General Public
17 * License along with this library; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
20 * Copyright 2000 The FreeRADIUS server project
23 static const char rcsid[] = "$Id$";
35 #ifdef HAVE_SYS_STAT_H
42 #include "libradius.h"
44 #define DICT_VALUE_MAX_NAME_LEN (128)
45 #define DICT_VENDOR_MAX_NAME_LEN (128)
47 static lrad_hash_table_t *vendors_byname = NULL;
48 static lrad_hash_table_t *vendors_byvalue = NULL;
50 static lrad_hash_table_t *attributes_byname = NULL;
51 static lrad_hash_table_t *attributes_byvalue = NULL;
53 static lrad_hash_table_t *values_byvalue = NULL;
54 static lrad_hash_table_t *values_byname = NULL;
57 * For faster HUP's, we cache the stat information for
58 * files we've $INCLUDEd
60 typedef struct dict_stat_t {
61 struct dict_stat_t *next;
66 static char *stat_root_dir = NULL;
67 static char *stat_root_file = NULL;
69 static dict_stat_t *stat_head = NULL;
70 static dict_stat_t *stat_tail = NULL;
72 typedef struct value_fixup_t {
75 struct value_fixup_t *next;
80 * So VALUEs in the dictionary can have forward references.
82 static value_fixup_t *value_fixup = NULL;
84 static const LRAD_NAME_NUMBER type_table[] = {
85 { "string", PW_TYPE_STRING },
86 { "integer", PW_TYPE_INTEGER },
87 { "ipaddr", PW_TYPE_IPADDR },
88 { "date", PW_TYPE_DATE },
89 { "abinary", PW_TYPE_ABINARY },
90 { "octets", PW_TYPE_OCTETS },
91 { "ifid", PW_TYPE_IFID },
92 { "ipv6addr", PW_TYPE_IPV6ADDR },
93 { "ipv6prefix", PW_TYPE_IPV6PREFIX },
99 * Create the hash of the name.
101 * We copy the hash function here because it's substantially faster.
103 #define FNV_MAGIC_INIT (0x811c9dc5)
104 #define FNV_MAGIC_PRIME (0x01000193)
106 static uint32_t dict_hashname(const char *name)
108 uint32_t hash = FNV_MAGIC_INIT;
111 for (p = name; *p != '\0'; p++) {
112 int c = *(const unsigned char *) p;
113 if (isalpha(c)) c = tolower(c);
115 hash *= FNV_MAGIC_PRIME;
116 hash ^= (uint32_t ) (c & 0xff);
124 * Hash callback functions.
126 static uint32_t dict_attr_name_hash(const void *data)
128 return dict_hashname(((const DICT_ATTR *)data)->name);
131 static int dict_attr_name_cmp(const void *one, const void *two)
133 const DICT_ATTR *a = one;
134 const DICT_ATTR *b = two;
136 return strcasecmp(a->name, b->name);
139 static uint32_t dict_attr_value_hash(const void *data)
141 return lrad_hash(&((const DICT_ATTR *)data)->attr,
142 sizeof(((const DICT_ATTR *)data)->attr));
145 static int dict_attr_value_cmp(const void *one, const void *two)
147 const DICT_ATTR *a = one;
148 const DICT_ATTR *b = two;
150 return a->attr - b->attr;
153 static uint32_t dict_vendor_name_hash(const void *data)
155 return dict_hashname(((const DICT_VENDOR *)data)->name);
158 static int dict_vendor_name_cmp(const void *one, const void *two)
160 const DICT_VENDOR *a = one;
161 const DICT_VENDOR *b = two;
163 return strcasecmp(a->name, b->name);
166 static uint32_t dict_vendor_value_hash(const void *data)
168 return lrad_hash(&(((const DICT_VENDOR *)data)->vendorpec),
169 sizeof(((const DICT_VENDOR *)data)->vendorpec));
172 static int dict_vendor_value_cmp(const void *one, const void *two)
174 const DICT_VENDOR *a = one;
175 const DICT_VENDOR *b = two;
177 return a->vendorpec - b->vendorpec;
180 static uint32_t dict_value_name_hash(const void *data)
183 const DICT_VALUE *dval = data;
185 hash = dict_hashname(dval->name);
186 return lrad_hash_update(&dval->attr, sizeof(dval->attr), hash);
189 static int dict_value_name_cmp(const void *one, const void *two)
192 const DICT_VALUE *a = one;
193 const DICT_VALUE *b = two;
195 rcode = a->attr - b->attr;
196 if (rcode != 0) return rcode;
198 return strcasecmp(a->name, b->name);
201 static uint32_t dict_value_value_hash(const void *data)
204 const DICT_VALUE *dval = data;
206 hash = lrad_hash(&dval->attr, sizeof(dval->attr));
207 return lrad_hash_update(&dval->value, sizeof(dval->value), hash);
210 static int dict_value_value_cmp(const void *one, const void *two)
213 const DICT_VALUE *a = one;
214 const DICT_VALUE *b = two;
216 rcode = a->attr - b->attr;
217 if (rcode != 0) return rcode;
219 return a->value - b->value;
224 * Free the list of stat buffers
226 static void dict_stat_free(void)
228 dict_stat_t *this, *next;
231 stat_root_dir = NULL;
232 free(stat_root_file);
233 stat_root_file = NULL;
240 for (this = stat_head; this != NULL; this = next) {
246 stat_head = stat_tail = NULL;
251 * Add an entry to the list of stat buffers.
253 static void dict_stat_add(const char *name, const struct stat *stat_buf)
257 this = malloc(sizeof(*this));
259 memset(this, 0, sizeof(*this));
261 this->name = strdup(name);
262 this->mtime = stat_buf->st_mtime;
265 stat_head = stat_tail = this;
267 stat_tail->next = this;
274 * See if any dictionaries have changed. If not, don't
277 static int dict_stat_check(const char *root_dir, const char *root_file)
282 if (!stat_root_dir) return 0;
283 if (!stat_root_file) return 0;
285 if (strcmp(root_dir, stat_root_dir) != 0) return 0;
286 if (strcmp(root_file, stat_root_file) != 0) return 0;
288 if (!stat_head) return 0; /* changed, reload */
290 for (this = stat_head; this != NULL; this = this->next) {
291 if (stat(this->name, &buf) < 0) return 0;
293 if (buf.st_mtime != this->mtime) return 0;
301 * Free the dictionary_attributes and dictionary_values lists.
308 lrad_hash_table_free(vendors_byname);
309 lrad_hash_table_free(vendors_byvalue);
310 vendors_byname = NULL;
311 vendors_byvalue = NULL;
313 lrad_hash_table_free(attributes_byname);
314 lrad_hash_table_free(attributes_byvalue);
315 attributes_byname = NULL;
316 attributes_byvalue = NULL;
318 lrad_hash_table_free(values_byname);
319 lrad_hash_table_free(values_byvalue);
320 values_byname = NULL;
321 values_byvalue = NULL;
328 * Add vendor to the list.
330 int dict_addvendor(const char *name, int value)
335 if (value >= (1 << 16)) {
336 librad_log("dict_addvendor: Cannot handle vendor ID larger than 65535");
340 if ((length = strlen(name)) >= DICT_VENDOR_MAX_NAME_LEN) {
341 librad_log("dict_addvendor: vendor name too long");
345 if ((dv = malloc(sizeof(*dv) + length)) == NULL) {
346 librad_log("dict_addvendor: out of memory");
350 strcpy(dv->name, name);
351 dv->vendorpec = value;
352 dv->type = dv->length = 1; /* defaults */
354 if (!lrad_hash_table_insert(vendors_byname, dv)) {
357 old_dv = lrad_hash_table_finddata(vendors_byname, dv);
359 librad_log("dict_addvendor: Failed inserting vendor name %s", name);
362 if (old_dv->vendorpec != dv->vendorpec) {
363 librad_log("dict_addvendor: Duplicate vendor name %s", name);
368 * Already inserted. Discard the duplicate entry.
375 * Insert the SAME pointer (not free'd when this table is
376 * deleted), into another table.
378 * We want this behaviour because we want OLD names for
379 * the attributes to be read from the configuration
380 * files, but when we're printing them, (and looking up
381 * by value) we want to use the NEW name.
383 if (!lrad_hash_table_replace(vendors_byvalue, dv)) {
384 librad_log("dict_addvendor: Failed inserting vendor %s",
393 * Add an attribute to the dictionary.
395 int dict_addattr(const char *name, int vendor, int type, int value,
398 static int max_attr = 0;
401 if (strlen(name) > (sizeof(attr->name) -1)) {
402 librad_log("dict_addattr: attribute name too long");
407 * If the value is '-1', that means use a pre-existing
408 * one (if it already exists). If one does NOT already exist,
409 * then create a new attribute, with a non-conflicting value,
413 if (dict_attrbyname(name)) {
414 return 0; /* exists, don't add it again */
419 } else if (vendor == 0) {
423 if (value > max_attr) {
429 librad_log("dict_addattr: ATTRIBUTE has invalid number (less than zero)");
433 if (value >= 65536) {
434 librad_log("dict_addattr: ATTRIBUTE has invalid number (larger than 65535).");
439 DICT_VENDOR *dv = dict_vendorbyvalue(vendor);
442 * If the vendor isn't defined, die/
445 librad_log("dict_addattr: Unknown vendor");
450 * With a few exceptions, attributes can only be
451 * 1..255. The check above catches the less than
454 if ((dv->type == 1) && (value >= 256)) {
455 librad_log("dict_addattr: ATTRIBUTE has invalid number (larger than 255).");
457 } /* else 256..65535 are allowed */
461 * Create a new attribute for the list
463 if ((attr = malloc(sizeof(*attr))) == NULL) {
464 librad_log("dict_addattr: out of memory");
468 strcpy(attr->name, name);
470 attr->attr |= (vendor << 16); /* FIXME: hack */
473 attr->vendor = vendor;
476 * Insert the attribute, only if it's not a duplicate.
478 if (!lrad_hash_table_insert(attributes_byname, attr)) {
482 * If the attribute has identical number, then
483 * ignore the duplicate.
485 a = lrad_hash_table_finddata(attributes_byname, attr);
486 if (a && (strcasecmp(a->name, attr->name) == 0)) {
487 if (a->attr != attr->attr) {
488 librad_log("dict_addattr: Duplicate attribute name %s", name);
494 * Same name, same vendor, same attr,
495 * maybe the flags and/or type is
496 * different. Let the new value
497 * over-ride the old one.
501 lrad_hash_table_delete(attributes_byvalue, a);
503 if (!lrad_hash_table_replace(attributes_byname, attr)) {
504 librad_log("dict_addattr: Internal error storing attribute %s", name);
511 * Insert the SAME pointer (not free'd when this entry is
512 * deleted), into another table.
514 * We want this behaviour because we want OLD names for
515 * the attributes to be read from the configuration
516 * files, but when we're printing them, (and looking up
517 * by value) we want to use the NEW name.
519 if (!lrad_hash_table_replace(attributes_byvalue, attr)) {
520 librad_log("dict_addattr: Failed inserting attribute name %s", name);
529 * Add a value for an attribute to the dictionary.
531 int dict_addvalue(const char *namestr, const char *attrstr, int value)
537 if ((length = strlen(namestr)) >= DICT_VALUE_MAX_NAME_LEN) {
538 librad_log("dict_addvalue: value name too long");
542 if ((dval = malloc(sizeof(*dval) + length)) == NULL) {
543 librad_log("dict_addvalue: out of memory");
546 memset(dval, 0, sizeof(*dval));
548 strcpy(dval->name, namestr);
552 * Remember which attribute is associated with this
553 * value, if possible.
555 dattr = dict_attrbyname(attrstr);
557 dval->attr = dattr->attr;
560 * Octets is allowed as a work-around for the
561 * fact that branch_1_1 doesn't have BYTE or SHORT
563 if ((dattr->type != PW_TYPE_INTEGER) &&
564 (dattr->type != PW_TYPE_OCTETS)) {
566 librad_log("dict_addvalue: VALUEs can only be defined for'integer' types");
571 value_fixup_t *fixup;
573 fixup = (value_fixup_t *) malloc(sizeof(*fixup));
576 librad_log("dict_addvalue: out of memory");
579 memset(fixup, 0, sizeof(*fixup));
581 strNcpy(fixup->attrstr, attrstr, sizeof(fixup->attrstr));
585 * Insert to the head of the list.
587 fixup->next = value_fixup;
594 * Add the value into the dictionary.
596 if (!lrad_hash_table_insert(values_byname, dval)) {
601 * Suppress duplicates with the same
602 * name and value. There are lots in
605 old = dict_valbyname(dattr->attr, namestr);
606 if (old && (old->value == dval->value)) {
613 librad_log("dict_addvalue: Duplicate value name %s for attribute %s", namestr, attrstr);
618 * There are multiple VALUE's, keyed by attribute, so we
619 * take care of that here.
621 if (!lrad_hash_table_replace(values_byvalue, dval)) {
622 librad_log("dict_addvalue: Failed inserting value %s",
631 * Process the ATTRIBUTE command
633 static int process_attribute(const char* fn, const int line,
634 const int block_vendor, char **argv,
643 if ((argc < 3) || (argc > 4)) {
644 librad_log("dict_init: %s[%d]: invalid ATTRIBUTE line",
650 * Validate all entries
652 if (!isdigit((int) argv[1][0])) {
653 librad_log("dict_init: %s[%d]: invalid value", fn, line);
656 sscanf(argv[1], "%i", &value);
659 * find the type of the attribute.
661 type = lrad_str2int(type_table, argv[2], -1);
663 librad_log("dict_init: %s[%d]: invalid type \"%s\"",
669 * Only look up the vendor if the string
672 memset(&flags, 0, sizeof(flags));
674 s = strtok(argv[3], ",");
676 if (strcmp(s, "has_tag") == 0 ||
677 strcmp(s, "has_tag=1") == 0) {
678 /* Boolean flag, means this is a
682 } else if (strncmp(s, "encrypt=", 8) == 0) {
683 /* Encryption method, defaults to 0 (none).
684 Currently valid is just type 2,
685 Tunnel-Password style, which can only
686 be applied to strings. */
687 flags.encrypt = strtol(s + 8, &c, 0);
689 librad_log( "dict_init: %s[%d] invalid option %s",
694 /* Must be a vendor 'flag'... */
695 if (strncmp(s, "vendor=", 7) == 0) {
700 vendor = dict_vendorbyname(s);
702 librad_log( "dict_init: %s[%d]: unknown vendor %s",
706 if (block_vendor && argv[3][0] &&
707 (block_vendor != vendor)) {
708 librad_log("dict_init: %s[%d]: mismatched vendor %s within BEGIN-VENDOR/END-VENDOR block",
713 s = strtok(NULL, ",");
717 if (block_vendor) vendor = block_vendor;
720 * Special checks for tags, they make our life much more
725 * Only string, octets, and integer can be tagged.
729 case PW_TYPE_INTEGER:
733 librad_log("dict_init: %s[%d]: Attributes of type %s cannot be tagged.",
735 lrad_int2str(type_table, type, "?Unknown?"));
744 if (dict_addattr(argv[0], vendor, type, value, flags) < 0) {
745 librad_log("dict_init: %s[%d]: %s",
746 fn, line, librad_errstr);
755 * Process the VALUE command
757 static int process_value(const char* fn, const int line, char **argv,
763 librad_log("dict_init: %s[%d]: invalid VALUE line",
768 * For Compatibility, skip "Server-Config"
770 if (strcasecmp(argv[0], "Server-Config") == 0)
774 * Validate all entries
776 if (!isdigit((int) argv[2][0])) {
777 librad_log("dict_init: %s[%d]: invalid value",
781 sscanf(argv[2], "%i", &value);
783 if (dict_addvalue(argv[1], argv[0], value) < 0) {
784 librad_log("dict_init: %s[%d]: %s",
785 fn, line, librad_errstr);
794 * Process the VENDOR command
796 static int process_vendor(const char* fn, const int line, char **argv,
800 const char *format = NULL;
802 if ((argc < 2) || (argc > 3)) {
803 librad_log( "dict_init: %s[%d] invalid VENDOR entry",
809 * Validate all entries
811 if (!isdigit((int) argv[1][0])) {
812 librad_log("dict_init: %s[%d]: invalid value",
816 value = atoi(argv[1]);
818 /* Create a new VENDOR entry for the list */
819 if (dict_addvendor(argv[0], value) < 0) {
820 librad_log("dict_init: %s[%d]: %s",
821 fn, line, librad_errstr);
826 * Look for a format statement
831 } else if (value == VENDORPEC_USR) { /* catch dictionary screw-ups */
832 format = "format=4,0";
834 } else if (value == VENDORPEC_LUCENT) {
835 format = "format=2,1";
837 } else if (value == VENDORPEC_STARENT) {
838 format = "format=2,2";
840 } /* else no fixups to do */
847 if (strncasecmp(format, "format=", 7) != 0) {
848 librad_log("dict_init: %s[%d]: Invalid format for VENDOR. Expected \"format=\", got \"%s\"",
854 if ((strlen(p) != 3) ||
855 !isdigit((int) p[0]) ||
857 !isdigit((int) p[2])) {
858 librad_log("dict_init: %s[%d]: Invalid format for VENDOR. Expected text like \"1,1\", got \"%s\"",
863 type = (int) (p[0] - '0');
864 length = (int) (p[2] - '0');
866 dv = dict_vendorbyvalue(value);
868 librad_log("dict_init: %s[%d]: Failed adding format for VENDOR",
873 if ((type != 1) && (type != 2) && (type != 4)) {
874 librad_log("dict_init: %s[%d]: invalid type value %d for VENDOR",
879 if ((length != 0) && (length != 1) && (length != 2)) {
880 librad_log("dict_init: %s[%d]: invalid length value %d for VENDOR",
893 * String split routine. Splits an input string IN PLACE
894 * into pieces, based on spaces.
896 static int str2argv(char *str, char **argv, int max_argc)
901 if (argc >= max_argc) return argc;
904 * Chop out comments early.
911 while ((*str == ' ') ||
914 (*str == '\n')) *(str++) = '\0';
916 if (!*str) return argc;
925 (*str != '\n')) str++;
931 #define MAX_ARGV (16)
934 * Initialize the dictionary.
936 static int my_dict_init(const char *dir, const char *fn,
937 const char *src_file, int src_line)
947 char *argv[MAX_ARGV];
951 librad_log("dict_init: No directory specified");
955 if ((strlen(fn) >= sizeof(dirtmp) / 2) ||
956 (strlen(dir) >= sizeof(dirtmp) / 2)) {
957 librad_log("dict_init: filename name too long");
962 * First see if fn is relative to dir. If so, create
963 * new filename. If not, remember the absolute dir.
965 if ((p = strrchr(fn, '/')) != NULL) {
970 } else if (dir[0] && strcmp(dir, ".") != 0) {
971 snprintf(dirtmp, sizeof(dirtmp), "%s/%s", dir, fn);
975 if ((fp = fopen(fn, "r")) == NULL) {
977 librad_log("dict_init: Couldn't open dictionary \"%s\": %s",
978 fn, strerror(errno));
980 librad_log("dict_init: %s[%d]: Couldn't open dictionary \"%s\": %s",
981 src_file, src_line, fn, strerror(errno));
986 stat(fn, &statbuf); /* fopen() guarantees this will succeed */
987 if (!S_ISREG(statbuf.st_mode)) {
989 librad_log("dict_init: Dictionary \"%s\" is not a regular file",
995 * Globally writable dictionaries means that users can control
996 * the server configuration with little difficulty.
998 if ((statbuf.st_mode & S_IWOTH) != 0) {
1000 librad_log("dict_init: Dictionary \"%s\" is globally writable. Refusing to start due to insecure configuration.",
1005 dict_stat_add(fn, &statbuf);
1008 * Seed the random pool with data.
1010 lrad_rand_seed(&statbuf, sizeof(statbuf));
1014 while (fgets(buf, sizeof(buf), fp) != NULL) {
1016 if (buf[0] == '#' || buf[0] == 0 ||
1017 buf[0] == '\n' || buf[0] == '\r')
1021 * Comment characters should NOT be appearing anywhere but
1022 * as start of a comment;
1024 p = strchr(buf, '#');
1027 argc = str2argv(buf, argv, MAX_ARGV);
1028 if (argc == 0) continue;
1031 librad_log( "dict_init: %s[%d] invalid entry",
1040 fprintf(stderr, "ARGC = %d\n",argc);
1041 for (i = 0; i < argc; i++) {
1042 fprintf(stderr, "\t%s\n", argv[i]);
1047 * See if we need to import another dictionary.
1049 if (strcasecmp(argv[0], "$INCLUDE") == 0) {
1050 if (my_dict_init(dir, argv[1], fn, line) < 0) {
1058 * Perhaps this is an attribute.
1060 if (strcasecmp(argv[0], "ATTRIBUTE") == 0) {
1061 if (process_attribute(fn, line, block_vendor,
1062 argv + 1, argc - 1) == -1) {
1070 * Process VALUE lines.
1072 if (strcasecmp(argv[0], "VALUE") == 0) {
1073 if (process_value(fn, line,
1074 argv + 1, argc - 1) == -1) {
1082 * Process VENDOR lines.
1084 if (strcasecmp(argv[0], "VENDOR") == 0) {
1085 if (process_vendor(fn, line,
1086 argv + 1, argc - 1) == -1) {
1093 if (strcasecmp(argv[0], "BEGIN-VENDOR") == 0) {
1096 "dict_init: %s[%d] invalid BEGIN-VENDOR entry",
1102 vendor = dict_vendorbyname(argv[1]);
1105 "dict_init: %s[%d]: unknown vendor %s",
1110 block_vendor = vendor;
1112 } /* BEGIN-VENDOR */
1114 if (strcasecmp(argv[0], "END-VENDOR") == 0) {
1117 "dict_init: %s[%d] invalid END-VENDOR entry",
1123 vendor = dict_vendorbyname(argv[1]);
1126 "dict_init: %s[%d]: unknown vendor %s",
1132 if (vendor != block_vendor) {
1134 "dict_init: %s[%d]: END-VENDOR %s does not match any previous BEGIN-VENDOR",
1144 * Any other string: We don't recognize it.
1147 "dict_init: %s[%d] invalid keyword \"%s\"",
1158 * Empty callback for hash table initialization.
1160 static int null_callback(void *ctx, void *data)
1162 ctx = ctx; /* -Wunused */
1163 data = data; /* -Wunused */
1170 * Initialize the directory, then fix the attr member of
1173 int dict_init(const char *dir, const char *fn)
1175 if (!dir) return -1;
1178 * Check if we need to change anything. If not, don't do
1181 if (dict_stat_check(dir, fn)) {
1186 * Free the dictionaries, and the stat cache.
1189 stat_root_dir = strdup(dir);
1190 stat_root_file = strdup(fn);
1193 * Create the table of vendor by name. There MAY NOT
1194 * be multiple vendors of the same name.
1196 * Each vendor is malloc'd, so the free function is free.
1198 vendors_byname = lrad_hash_table_create(dict_vendor_name_hash,
1199 dict_vendor_name_cmp,
1201 if (!vendors_byname) {
1206 * Create the table of vendors by value. There MAY
1207 * be vendors of the same value. If there are, we
1208 * pick the latest one.
1210 vendors_byvalue = lrad_hash_table_create(dict_vendor_value_hash,
1211 dict_vendor_value_cmp,
1213 if (!vendors_byvalue) {
1218 * Create the table of attributes by name. There MAY NOT
1219 * be multiple attributes of the same name.
1221 * Each attribute is malloc'd, so the free function is free.
1223 attributes_byname = lrad_hash_table_create(dict_attr_name_hash,
1226 if (!attributes_byname) {
1231 * Create the table of attributes by value. There MAY
1232 * be attributes of the same value. If there are, we
1233 * pick the latest one.
1235 attributes_byvalue = lrad_hash_table_create(dict_attr_value_hash,
1236 dict_attr_value_cmp,
1238 if (!attributes_byvalue) {
1242 values_byname = lrad_hash_table_create(dict_value_name_hash,
1243 dict_value_name_cmp,
1245 if (!values_byname) {
1249 values_byvalue = lrad_hash_table_create(dict_value_value_hash,
1250 dict_value_value_cmp,
1252 if (!values_byvalue) {
1256 value_fixup = NULL; /* just to be safe. */
1258 if (my_dict_init(dir, fn, NULL, 0) < 0)
1263 value_fixup_t *this, *next;
1265 for (this = value_fixup; this != NULL; this = next) {
1268 a = dict_attrbyname(this->attrstr);
1271 "dict_init: No ATTRIBUTE \"%s\" defined for VALUE \"%s\"",
1272 this->attrstr, this->dval->name);
1273 return -1; /* leak, but they should die... */
1276 this->dval->attr = a->attr;
1279 * Add the value into the dictionary.
1281 if (!lrad_hash_table_replace(values_byname,
1283 librad_log("dict_addvalue: Duplicate value name %s for attribute %s", this->dval->name, a->name);
1288 * Allow them to use the old name, but
1289 * prefer the new name when printing
1292 if (!lrad_hash_table_finddata(values_byvalue, this->dval)) {
1293 lrad_hash_table_replace(values_byvalue,
1299 * Just so we don't lose track of things.
1306 * Walk over all of the hash tables to ensure they're
1307 * initialized. We do this because the threads may perform
1308 * lookups, and we don't want multi-threaded re-ordering
1309 * of the table entries. That would be bad.
1311 lrad_hash_table_walk(vendors_byname, null_callback, NULL);
1312 lrad_hash_table_walk(vendors_byvalue, null_callback, NULL);
1314 lrad_hash_table_walk(attributes_byname, null_callback, NULL);
1315 lrad_hash_table_walk(attributes_byvalue, null_callback, NULL);
1317 lrad_hash_table_walk(values_byvalue, null_callback, NULL);
1318 lrad_hash_table_walk(values_byname, null_callback, NULL);
1324 * Get an attribute by its numerical value.
1326 DICT_ATTR *dict_attrbyvalue(int attr)
1332 return lrad_hash_table_finddata(attributes_byvalue, &dattr);
1336 * Get an attribute by its name.
1338 DICT_ATTR *dict_attrbyname(const char *name)
1342 if (!name) return NULL;
1344 strNcpy(dattr.name, name, sizeof(dattr.name));
1346 return lrad_hash_table_finddata(attributes_byname, &dattr);
1350 * Associate a value with an attribute and return it.
1352 DICT_VALUE *dict_valbyattr(int attr, int value)
1359 return lrad_hash_table_finddata(values_byvalue, &dval);
1363 * Get a value by its name, keyed off of an attribute.
1365 DICT_VALUE *dict_valbyname(int attr, const char *name)
1368 uint32_t buffer[(sizeof(*dv) + DICT_VALUE_MAX_NAME_LEN + 3)/4];
1370 if (!name) return NULL;
1372 dv = (DICT_VALUE *) buffer;
1374 strNcpy(dv->name, name, DICT_VALUE_MAX_NAME_LEN);
1376 return lrad_hash_table_finddata(values_byname, dv);
1380 * Get the vendor PEC based on the vendor name
1382 * This is efficient only for small numbers of vendors.
1384 int dict_vendorbyname(const char *name)
1387 uint32_t buffer[(sizeof(*dv) + DICT_VENDOR_MAX_NAME_LEN + 3)/4];
1389 if (!name) return 0;
1391 dv = (DICT_VENDOR *) buffer;
1392 strNcpy(dv->name, name, DICT_VENDOR_MAX_NAME_LEN);
1394 dv = lrad_hash_table_finddata(vendors_byname, dv);
1397 return dv->vendorpec;
1401 * Return the vendor struct based on the PEC.
1403 DICT_VENDOR *dict_vendorbyvalue(int vendorpec)
1407 dv.vendorpec = vendorpec;
1409 return lrad_hash_table_finddata(vendors_byvalue, &dv);