From: Arran Cudbard-Bell Date: Tue, 9 May 2017 16:37:54 +0000 (-0400) Subject: Rename FR_TYPE macros to their C equivalents X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3609e5352b85af4df3a9dd759f4686a170bfa892;p=thirdparty%2Ffreeradius-server.git Rename FR_TYPE macros to their C equivalents We'll do this to dictionary types too at some point --- diff --git a/src/include/conf_file.h b/src/include/conf_file.h index 37dde170879..742430f0390 100644 --- a/src/include/conf_file.h +++ b/src/include/conf_file.h @@ -133,13 +133,13 @@ _Generic((_ct), \ _p, (_mismatch_char) 0), \ char const *** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_STRING) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_char_m) 0), \ - bool * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_BOOLEAN) && !((_t) & FR_TYPE_MULTI), \ + bool * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_BOOL) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_bool) 0), \ - bool ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_BOOLEAN) && ((_t) & FR_TYPE_MULTI), \ + bool ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_BOOL) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_bool_m) 0), \ - uint32_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_INTEGER) && !((_t) & FR_TYPE_MULTI), \ + uint32_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT32) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint32) 0), \ - uint32_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_INTEGER) && ((_t) & FR_TYPE_MULTI), \ + uint32_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT32) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint32_m) 0), \ fr_ipaddr_t * : __builtin_choose_expr(((PW_BASE_TYPE(_t) == FR_TYPE_IPV4_ADDR) || \ (PW_BASE_TYPE(_t) == FR_TYPE_IPV4_PREFIX) || \ @@ -161,29 +161,29 @@ _Generic((_ct), \ _p, (_mismatch_uint8) 0), \ uint8_t const **: __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_OCTETS) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint8_m) 0), \ - uint8_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_BYTE) && !((_t) & FR_TYPE_MULTI), \ + uint8_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT8) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint8) 0), \ - uint8_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_BYTE) && ((_t) & FR_TYPE_MULTI), \ + uint8_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT8) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint8_m) 0), \ uint8_t[8] : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_IFID) && !(_t & FR_TYPE_MULTI), \ _p, (_mismatch_ifid) 0), \ uint8_t*[8] : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_IFID) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_ifid_m) 0), \ - uint16_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_SHORT) && !((_t) & FR_TYPE_MULTI), \ + uint16_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT16) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint16) 0), \ - uint16_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_SHORT) && ((_t) & FR_TYPE_MULTI), \ + uint16_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT16) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint16_m) 0), \ uint8_t[6] : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_ETHERNET) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_ethernet) 0), \ uint8_t*[6] : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_ETHERNET) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_ethernet_m) 0), \ - int32_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_SIGNED) && !((_t) & FR_TYPE_MULTI), \ + int32_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_INT32) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_int32) 0), \ - int32_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_SIGNED) && ((_t) & FR_TYPE_MULTI), \ + int32_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_INT32) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_int32_m) 0), \ - uint64_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_INTEGER64) && !((_t) & FR_TYPE_MULTI), \ + uint64_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT64) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint64) 0), \ - uint64_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_INTEGER64) && ((_t) & FR_TYPE_MULTI), \ + uint64_t ** : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_UINT64) && ((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint64_m) 0), \ _timeval_t * : __builtin_choose_expr((PW_BASE_TYPE(_t) == FR_TYPE_TIMEVAL) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_timeval) 0), \ diff --git a/src/include/tmpl.h b/src/include/tmpl.h index 83a478d9ccd..dc3645ed7b6 100644 --- a/src/include/tmpl.h +++ b/src/include/tmpl.h @@ -337,10 +337,10 @@ do {\ char const **: FR_TYPE_STRING, \ uint8_t **: FR_TYPE_OCTETS, \ uint8_t const **: FR_TYPE_OCTETS, \ - uint8_t *: FR_TYPE_BYTE, \ - uint16_t *: FR_TYPE_SHORT, \ - uint32_t *: FR_TYPE_INTEGER, \ - uint64_t *: FR_TYPE_INTEGER64, \ + uint8_t *: FR_TYPE_UINT8, \ + uint16_t *: FR_TYPE_UINT16, \ + uint32_t *: FR_TYPE_UINT32, \ + uint64_t *: FR_TYPE_UINT64, \ struct timeval *: FR_TYPE_TIMEVAL) /** Expand a tmpl to a C type, using existing storage to hold variably sized types diff --git a/src/include/types.h b/src/include/types.h index bbca1315c15..8f434102344 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -43,17 +43,18 @@ typedef enum { FR_TYPE_COMBO_IP_PREFIX, //!< IPv4 or IPv6 address prefix depending on length. FR_TYPE_ETHERNET, //!< 48 Bit Mac-Address. - FR_TYPE_BOOLEAN, //!< A truth value. - FR_TYPE_BYTE, //!< 8 Bit unsigned integer. - FR_TYPE_SHORT, //!< 16 Bit unsigned integer. - FR_TYPE_INTEGER, //!< 32 Bit unsigned integer. - FR_TYPE_INTEGER64, //!< 64 Bit unsigned integer. + FR_TYPE_BOOL, //!< A truth value. + FR_TYPE_UINT8, //!< 8 Bit unsigned integer. + FR_TYPE_UINT16, //!< 16 Bit unsigned integer. + FR_TYPE_UINT32, //!< 32 Bit unsigned integer. + FR_TYPE_UINT64, //!< 64 Bit unsigned integer. + FR_TYPE_INT32, //!< 32 Bit signed integer. + FR_TYPE_FLOAT64, //!< Double precision floating point. + FR_TYPE_SIZE, //!< Unsigned integer capable of representing any memory //!< address on the local system. - FR_TYPE_SIGNED, //!< 32 Bit signed integer. FR_TYPE_TIMEVAL, //!< Time value (struct timeval), only for config items. - FR_TYPE_DECIMAL, //!< Double precision floating point. FR_TYPE_DATE, //!< 32 Bit Unix timestamp. FR_TYPE_ABINARY, //!< Ascend binary format a packed data structure. @@ -77,10 +78,10 @@ typedef enum { * functions that need to deal with all types representing values */ #define FR_TYPE_FIXED_SIZE \ - FR_TYPE_BYTE: \ - case FR_TYPE_SHORT: \ - case FR_TYPE_INTEGER: \ - case FR_TYPE_INTEGER64: \ + FR_TYPE_UINT8: \ + case FR_TYPE_UINT16: \ + case FR_TYPE_UINT32: \ + case FR_TYPE_UINT64: \ case FR_TYPE_SIZE: \ case FR_TYPE_DATE: \ case FR_TYPE_IFID: \ @@ -91,10 +92,10 @@ typedef enum { case FR_TYPE_IPV6_PREFIX: \ case FR_TYPE_COMBO_IP_ADDR: \ case FR_TYPE_COMBO_IP_PREFIX: \ - case FR_TYPE_SIGNED: \ + case FR_TYPE_INT32: \ case FR_TYPE_TIMEVAL: \ - case FR_TYPE_BOOLEAN: \ - case FR_TYPE_DECIMAL + case FR_TYPE_BOOL: \ + case FR_TYPE_FLOAT64 /** Match all variable length types in case statements * @@ -137,13 +138,13 @@ typedef enum { * */ #define FR_TYPE_NUMERIC \ - FR_TYPE_BOOLEAN: \ - case FR_TYPE_BYTE: \ - case FR_TYPE_SHORT: \ - case FR_TYPE_INTEGER: \ - case FR_TYPE_INTEGER64: \ + FR_TYPE_BOOL: \ + case FR_TYPE_UINT8: \ + case FR_TYPE_UINT16: \ + case FR_TYPE_UINT32: \ + case FR_TYPE_UINT64: \ case FR_TYPE_SIZE: \ - case FR_TYPE_SIGNED: \ + case FR_TYPE_INT32: \ case FR_TYPE_DATE #endif /* _FR_TYPES_H */ diff --git a/src/lib/util/dict.c b/src/lib/util/dict.c index f4acef1bb2d..e6139626438 100644 --- a/src/lib/util/dict.c +++ b/src/lib/util/dict.c @@ -104,15 +104,15 @@ FR_NAME_NUMBER const dict_attr_types[] = { { "combo-prefix", FR_TYPE_COMBO_IP_PREFIX }, { "ether", FR_TYPE_ETHERNET }, - { "bool", FR_TYPE_BOOLEAN }, - { "byte", FR_TYPE_BYTE }, - { "short", FR_TYPE_SHORT }, - { "integer", FR_TYPE_INTEGER }, - { "integer64", FR_TYPE_INTEGER64 }, + { "bool", FR_TYPE_BOOL }, + { "byte", FR_TYPE_UINT8 }, + { "short", FR_TYPE_UINT16 }, + { "integer", FR_TYPE_UINT32 }, + { "integer64", FR_TYPE_UINT64 }, { "size", FR_TYPE_SIZE }, - { "signed", FR_TYPE_SIGNED }, + { "signed", FR_TYPE_INT32 }, - { "decimal", FR_TYPE_DECIMAL }, + { "decimal", FR_TYPE_FLOAT64 }, { "timeval", FR_TYPE_TIMEVAL }, { "date", FR_TYPE_DATE }, @@ -132,11 +132,11 @@ FR_NAME_NUMBER const dict_attr_types[] = { * Alternative names */ { "cidr", FR_TYPE_IPV4_PREFIX }, - { "uint8", FR_TYPE_BYTE }, - { "uint16", FR_TYPE_SHORT }, - { "uint32", FR_TYPE_INTEGER }, - { "uint64", FR_TYPE_INTEGER64 }, - { "int32", FR_TYPE_SIGNED }, + { "uint8", FR_TYPE_UINT8 }, + { "uint16", FR_TYPE_UINT16 }, + { "uint32", FR_TYPE_UINT32 }, + { "uint64", FR_TYPE_UINT64 }, + { "int32", FR_TYPE_INT32 }, { NULL, 0 } }; @@ -157,13 +157,13 @@ size_t const dict_attr_sizes[FR_TYPE_MAX + 1][2] = { [FR_TYPE_IFID] = {8, 8}, [FR_TYPE_ETHERNET] = {6, 6}, - [FR_TYPE_BOOLEAN] = {1, 1}, - [FR_TYPE_BYTE] = {1, 1}, - [FR_TYPE_SHORT] = {2, 2}, - [FR_TYPE_INTEGER] = {4, 4}, - [FR_TYPE_INTEGER64] = {8, 8}, + [FR_TYPE_BOOL] = {1, 1}, + [FR_TYPE_UINT8] = {1, 1}, + [FR_TYPE_UINT16] = {2, 2}, + [FR_TYPE_UINT32] = {4, 4}, + [FR_TYPE_UINT64] = {8, 8}, [FR_TYPE_SIZE] = {sizeof(size_t), sizeof(size_t)}, - [FR_TYPE_SIGNED] = {4, 4}, + [FR_TYPE_INT32] = {4, 4}, [FR_TYPE_DATE] = {4, 4}, [FR_TYPE_ABINARY] = {32, ~0}, @@ -219,12 +219,12 @@ bool const fr_dict_non_data_types[FR_TYPE_MAX + 1] = { * @note Must be updated to match the anonymous enum types union in fr_value_box_t */ bool const fr_dict_enum_types[FR_TYPE_MAX + 1] = { - [FR_TYPE_BYTE] = true, - [FR_TYPE_SHORT] = true, - [FR_TYPE_INTEGER] = true, - [FR_TYPE_INTEGER64] = true, + [FR_TYPE_UINT8] = true, + [FR_TYPE_UINT16] = true, + [FR_TYPE_UINT32] = true, + [FR_TYPE_UINT64] = true, [FR_TYPE_SIZE] = true, - [FR_TYPE_SIGNED] = true + [FR_TYPE_INT32] = true }; /* @@ -954,7 +954,7 @@ static fr_dict_attr_t *fr_dict_attr_add_by_name(fr_dict_t *dict, fr_dict_attr_t * Tags can only be used in a few limited situations. */ if (flags.has_tag) { - if ((type != FR_TYPE_INTEGER) && (type != FR_TYPE_STRING)) { + if ((type != FR_TYPE_UINT32) && (type != FR_TYPE_STRING)) { fr_strerror_printf("The 'has_tag' flag can only be used for attributes of type 'integer' " "or 'string'"); goto error; @@ -1068,9 +1068,9 @@ static fr_dict_attr_t *fr_dict_attr_add_by_name(fr_dict_t *dict, fr_dict_attr_t case FR_TYPE_IPV4_ADDR: case FR_TYPE_IPV6_ADDR: - case FR_TYPE_BYTE: - case FR_TYPE_SHORT: - case FR_TYPE_INTEGER: + case FR_TYPE_UINT8: + case FR_TYPE_UINT16: + case FR_TYPE_UINT32: case FR_TYPE_DATE: case FR_TYPE_STRING: break; @@ -1087,7 +1087,7 @@ static fr_dict_attr_t *fr_dict_attr_add_by_name(fr_dict_t *dict, fr_dict_attr_t * caller sets it, we still sanity check it. */ if (flags.has_value) { - if (type != FR_TYPE_INTEGER) { + if (type != FR_TYPE_UINT32) { fr_strerror_printf("The 'has_value' flag can only be used with attributes " "of type 'integer'"); goto error; @@ -1163,7 +1163,7 @@ static fr_dict_attr_t *fr_dict_attr_add_by_name(fr_dict_t *dict, fr_dict_attr_t goto error; case FR_TYPE_IPV4_ADDR: - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: case FR_TYPE_OCTETS: if (flags.encrypt == FLAG_ENCRYPT_ASCEND_SECRET) goto encrypt_fail; @@ -1273,7 +1273,7 @@ static fr_dict_attr_t *fr_dict_attr_add_by_name(fr_dict_t *dict, fr_dict_attr_t case FR_TYPE_INVALID: case FR_TYPE_TIMEVAL: - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: case FR_TYPE_COMBO_IP_PREFIX: fr_strerror_printf("Attributes of type '%s' cannot be used in dictionaries", fr_int2str(dict_attr_types, type, "?Unknown?")); @@ -1287,23 +1287,23 @@ static fr_dict_attr_t *fr_dict_attr_add_by_name(fr_dict_t *dict, fr_dict_attr_t * Force "length" for data types of fixed length; */ switch (type) { - case FR_TYPE_BYTE: - case FR_TYPE_BOOLEAN: + case FR_TYPE_UINT8: + case FR_TYPE_BOOL: flags.length = 1; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: flags.length = 2; break; case FR_TYPE_DATE: case FR_TYPE_IPV4_ADDR: - case FR_TYPE_INTEGER: - case FR_TYPE_SIGNED: + case FR_TYPE_UINT32: + case FR_TYPE_INT32: flags.length = 4; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: flags.length = 8; break; @@ -1580,7 +1580,7 @@ int fr_dict_enum_add(fr_dict_t *dict, char const *attr, char const *alias, int v * Don't worry about fixups... */ switch (da->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: if (value > UINT8_MAX) { talloc_free(dval); fr_strerror_printf("%s: ATTRIBUTEs of type 'byte' cannot have " @@ -1588,7 +1588,7 @@ int fr_dict_enum_add(fr_dict_t *dict, char const *attr, char const *alias, int v return -1; } break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: if (value > UINT16_MAX) { talloc_free(dval); fr_strerror_printf("%s: ATTRIBUTEs of type 'short' cannot have " @@ -1597,7 +1597,7 @@ int fr_dict_enum_add(fr_dict_t *dict, char const *attr, char const *alias, int v } break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: break; default: diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c index 1af8da291dd..c950456133b 100644 --- a/src/lib/util/pair.c +++ b/src/lib/util/pair.c @@ -2263,26 +2263,26 @@ char const *fr_pair_value_enum(VALUE_PAIR const *vp, char buff[20]) } if (vp->da->flags.has_value) switch (vp->vp_type) { - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: return vp->vp_bool ? "yes" : "no"; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: enumv = fr_dict_enum_by_da(NULL, vp->da, vp->vp_byte); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: enumv = fr_dict_enum_by_da(NULL, vp->da, vp->vp_short); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: enumv = fr_dict_enum_by_da(NULL, vp->da, vp->vp_integer); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: enumv = fr_dict_enum_by_da(NULL, vp->da, vp->vp_integer64); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: enumv = fr_dict_enum_by_da(NULL, vp->da, vp->vp_signed); break; @@ -2306,12 +2306,12 @@ char *fr_pair_type_asprint(TALLOC_CTX *ctx, fr_type_t type) case FR_TYPE_STRING : return talloc_typed_strdup(ctx, "_"); - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: case FR_TYPE_SIZE: - case FR_TYPE_SIGNED: - case FR_TYPE_BYTE: - case FR_TYPE_SHORT: - case FR_TYPE_INTEGER: + case FR_TYPE_INT32: + case FR_TYPE_UINT8: + case FR_TYPE_UINT16: + case FR_TYPE_UINT32: case FR_TYPE_DATE : return talloc_typed_strdup(ctx, "0"); diff --git a/src/lib/util/value.c b/src/lib/util/value.c index 234a60c51cf..131fdcce1eb 100644 --- a/src/lib/util/value.c +++ b/src/lib/util/value.c @@ -72,13 +72,13 @@ static size_t const fr_value_box_network_sizes[FR_TYPE_MAX + 1][2] = { [FR_TYPE_IFID] = {8, 8}, [FR_TYPE_ETHERNET] = {6, 6}, - [FR_TYPE_BOOLEAN] = {1, 1}, - [FR_TYPE_BYTE] = {1, 1}, - [FR_TYPE_SHORT] = {2, 2}, - [FR_TYPE_INTEGER] = {4, 4}, - [FR_TYPE_INTEGER64] = {8, 8}, + [FR_TYPE_BOOL] = {1, 1}, + [FR_TYPE_UINT8] = {1, 1}, + [FR_TYPE_UINT16] = {2, 2}, + [FR_TYPE_UINT32] = {4, 4}, + [FR_TYPE_UINT64] = {8, 8}, - [FR_TYPE_SIGNED] = {4, 4}, + [FR_TYPE_INT32] = {4, 4}, [FR_TYPE_DATE] = {4, 4}, //!< 64bit on most machines. @@ -124,17 +124,17 @@ size_t const fr_value_box_field_sizes[] = { [FR_TYPE_IFID] = SIZEOF_MEMBER(fr_value_box_t, datum.ifid), [FR_TYPE_ETHERNET] = SIZEOF_MEMBER(fr_value_box_t, datum.ether), - [FR_TYPE_BOOLEAN] = SIZEOF_MEMBER(fr_value_box_t, datum.boolean), - [FR_TYPE_BYTE] = SIZEOF_MEMBER(fr_value_box_t, datum.byte), - [FR_TYPE_SHORT] = SIZEOF_MEMBER(fr_value_box_t, datum.ushort), - [FR_TYPE_INTEGER] = SIZEOF_MEMBER(fr_value_box_t, datum.integer), - [FR_TYPE_INTEGER64] = SIZEOF_MEMBER(fr_value_box_t, datum.integer64), + [FR_TYPE_BOOL] = SIZEOF_MEMBER(fr_value_box_t, datum.boolean), + [FR_TYPE_UINT8] = SIZEOF_MEMBER(fr_value_box_t, datum.byte), + [FR_TYPE_UINT16] = SIZEOF_MEMBER(fr_value_box_t, datum.ushort), + [FR_TYPE_UINT32] = SIZEOF_MEMBER(fr_value_box_t, datum.integer), + [FR_TYPE_UINT64] = SIZEOF_MEMBER(fr_value_box_t, datum.integer64), [FR_TYPE_SIZE] = SIZEOF_MEMBER(fr_value_box_t, datum.size), - [FR_TYPE_SIGNED] = SIZEOF_MEMBER(fr_value_box_t, datum.sinteger), + [FR_TYPE_INT32] = SIZEOF_MEMBER(fr_value_box_t, datum.sinteger), [FR_TYPE_TIMEVAL] = SIZEOF_MEMBER(fr_value_box_t, datum.timeval), - [FR_TYPE_DECIMAL] = SIZEOF_MEMBER(fr_value_box_t, datum.decimal), + [FR_TYPE_FLOAT64] = SIZEOF_MEMBER(fr_value_box_t, datum.decimal), [FR_TYPE_DATE] = SIZEOF_MEMBER(fr_value_box_t, datum.date), [FR_TYPE_ABINARY] = SIZEOF_MEMBER(fr_value_box_t, datum.filter), @@ -155,17 +155,17 @@ size_t const fr_value_box_offsets[] = { [FR_TYPE_IFID] = offsetof(fr_value_box_t, datum.ifid), [FR_TYPE_ETHERNET] = offsetof(fr_value_box_t, datum.ether), - [FR_TYPE_BOOLEAN] = offsetof(fr_value_box_t, datum.boolean), - [FR_TYPE_BYTE] = offsetof(fr_value_box_t, datum.byte), - [FR_TYPE_SHORT] = offsetof(fr_value_box_t, datum.ushort), - [FR_TYPE_INTEGER] = offsetof(fr_value_box_t, datum.integer), - [FR_TYPE_INTEGER64] = offsetof(fr_value_box_t, datum.integer64), + [FR_TYPE_BOOL] = offsetof(fr_value_box_t, datum.boolean), + [FR_TYPE_UINT8] = offsetof(fr_value_box_t, datum.byte), + [FR_TYPE_UINT16] = offsetof(fr_value_box_t, datum.ushort), + [FR_TYPE_UINT32] = offsetof(fr_value_box_t, datum.integer), + [FR_TYPE_UINT64] = offsetof(fr_value_box_t, datum.integer64), [FR_TYPE_SIZE] = offsetof(fr_value_box_t, datum.size), - [FR_TYPE_SIGNED] = offsetof(fr_value_box_t, datum.sinteger), + [FR_TYPE_INT32] = offsetof(fr_value_box_t, datum.sinteger), [FR_TYPE_TIMEVAL] = offsetof(fr_value_box_t, datum.timeval), - [FR_TYPE_DECIMAL] = offsetof(fr_value_box_t, datum.decimal), + [FR_TYPE_FLOAT64] = offsetof(fr_value_box_t, datum.decimal), [FR_TYPE_DATE] = offsetof(fr_value_box_t, datum.date), @@ -304,12 +304,12 @@ int fr_value_box_cmp(fr_value_box_t const *a, fr_value_box_t const *b) #define CHECK(_type) if (a->datum._type < b->datum._type) { compare = -1; \ } else if (a->datum._type > b->datum._type) { compare = +1; } - case FR_TYPE_BOOLEAN: /* this isn't a RADIUS type, and shouldn't really ever be used */ - case FR_TYPE_BYTE: + case FR_TYPE_BOOL: /* this isn't a RADIUS type, and shouldn't really ever be used */ + case FR_TYPE_UINT8: CHECK(byte); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: CHECK(ushort); break; @@ -317,15 +317,15 @@ int fr_value_box_cmp(fr_value_box_t const *a, fr_value_box_t const *b) CHECK(date); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: CHECK(integer); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: CHECK(sinteger); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: CHECK(integer64); break; @@ -337,7 +337,7 @@ int fr_value_box_cmp(fr_value_box_t const *a, fr_value_box_t const *b) compare = fr_timeval_cmp(&a->datum.timeval, &b->datum.timeval); break; - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: CHECK(decimal); break; @@ -802,21 +802,21 @@ int fr_value_box_hton(fr_value_box_t *dst, fr_value_box_t const *src) /* 8 byte integers */ switch (src->type) { - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: dst->datum.integer64 = htonll(src->datum.integer64); fr_value_box_copy_meta(dst, src); break; /* 4 byte integers */ - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: case FR_TYPE_DATE: - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: dst->datum.integer = htonl(src->datum.integer); fr_value_box_copy_meta(dst, src); break; /* 2 byte integers */ - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: dst->datum.ushort = htons(src->datum.ushort); fr_value_box_copy_meta(dst, src); break; @@ -969,7 +969,7 @@ static inline int fr_value_box_cast_to_octets(TALLOC_CTX *ctx, fr_value_box_t *d * - FR_TYPE_IPV4_PREFIX (with 32bit mask). * - FR_TYPE_IPV6_PREFIX (with v4 prefix and 128bit mask). * - FR_TYPE_OCTETS (of length 4). - * - FR_TYPE_INTEGER + * - FR_TYPE_UINT32 * * @param ctx unused. * @param dst Where to write result of casting. @@ -1041,7 +1041,7 @@ static inline int fr_value_box_cast_to_ipv4addr(TALLOC_CTX *ctx, fr_value_box_t memcpy(&dst->datum.ip.addr.v4, src->datum.octets, sizeof(dst->datum.ip.addr.v4.s_addr)); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: { uint32_t net; @@ -1144,7 +1144,7 @@ static inline int fr_value_box_cast_to_ipv4prefix(TALLOC_CTX *ctx, fr_value_box_ memcpy(&dst->datum.ip.addr.v4, &src->datum.octets[1], sizeof(dst->datum.ip.addr.v4.s_addr)); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: { uint32_t net; @@ -1416,15 +1416,15 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, case FR_TYPE_COMBO_IP_ADDR: case FR_TYPE_COMBO_IP_PREFIX: case FR_TYPE_ETHERNET: - case FR_TYPE_BOOLEAN: - case FR_TYPE_BYTE: - case FR_TYPE_SHORT: - case FR_TYPE_INTEGER: - case FR_TYPE_INTEGER64: + case FR_TYPE_BOOL: + case FR_TYPE_UINT8: + case FR_TYPE_UINT16: + case FR_TYPE_UINT32: + case FR_TYPE_UINT64: case FR_TYPE_SIZE: - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: case FR_TYPE_TIMEVAL: - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: case FR_TYPE_DATE: case FR_TYPE_ABINARY: break; @@ -1445,7 +1445,7 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, src->datum.strvalue, src->datum.length, '\0'); if ((src->type == FR_TYPE_IFID) && - (dst_type == FR_TYPE_INTEGER64)) { + (dst_type == FR_TYPE_UINT64)) { memcpy(&dst->datum.integer64, src->datum.ifid, sizeof(src->datum.ifid)); dst->datum.integer64 = htonll(dst->datum.integer64); @@ -1456,7 +1456,7 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, return 0; } - if ((src->type == FR_TYPE_INTEGER64) && + if ((src->type == FR_TYPE_UINT64) && (dst_type == FR_TYPE_ETHERNET)) { uint8_t array[8]; uint64_t i; @@ -1473,9 +1473,9 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, goto fixed_length; } - if (dst_type == FR_TYPE_SHORT) { + if (dst_type == FR_TYPE_UINT16) { switch (src->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: dst->datum.ushort = src->datum.byte; break; @@ -1492,17 +1492,17 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, * We can cast LONG integers to SHORTER ones, so long * as the long one is on the LHS. */ - if (dst_type == FR_TYPE_INTEGER) { + if (dst_type == FR_TYPE_UINT32) { switch (src->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: dst->datum.integer = src->datum.byte; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: dst->datum.integer = src->datum.ushort; break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: if (src->datum.sinteger < 0 ) { fr_strerror_printf("Invalid cast: From signed to integer. " "signed value %d is negative ", src->datum.sinteger); @@ -1524,17 +1524,17 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, * For integers, we allow the casting of a SMALL type to * a larger type, but not vice-versa. */ - if (dst_type == FR_TYPE_INTEGER64) { + if (dst_type == FR_TYPE_UINT64) { switch (src->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: dst->datum.integer64 = src->datum.byte; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: dst->datum.integer64 = src->datum.ushort; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: dst->datum.integer64 = src->datum.integer; break; @@ -1559,17 +1559,17 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, /* * We can cast integers less that < INT_MAX to signed */ - if (dst_type == FR_TYPE_SIGNED) { + if (dst_type == FR_TYPE_INT32) { switch (src->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: dst->datum.sinteger = src->datum.byte; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: dst->datum.sinteger = src->datum.ushort; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: if (src->datum.integer > INT_MAX) { fr_strerror_printf("Invalid cast: From integer to signed. integer value %u is larger " "than max signed int and would overflow", src->datum.integer); @@ -1578,7 +1578,7 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, dst->datum.sinteger = (int)src->datum.integer; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: if (src->datum.integer > INT_MAX) { fr_strerror_printf("Invalid cast: From integer64 to signed. integer64 value %" PRIu64 " is larger than max signed int and would overflow", src->datum.integer64); @@ -1598,22 +1598,22 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, if (dst_type == FR_TYPE_TIMEVAL) { switch (src->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: dst->datum.timeval.tv_sec = src->datum.byte; dst->datum.timeval.tv_usec = 0; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: dst->datum.timeval.tv_sec = src->datum.ushort; dst->datum.timeval.tv_usec = 0; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: dst->datum.timeval.tv_sec = src->datum.integer; dst->datum.timeval.tv_usec = 0; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: /* * tv_sec is a time_t, which is variable in size * depending on the system. @@ -1692,18 +1692,18 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst, * Convert host order to network byte order. */ if ((dst_type == FR_TYPE_IPV4_ADDR) && - ((src->type == FR_TYPE_INTEGER) || + ((src->type == FR_TYPE_UINT32) || (src->type == FR_TYPE_DATE) || - (src->type == FR_TYPE_SIGNED))) { + (src->type == FR_TYPE_INT32))) { dst->datum.ip.af = AF_INET; dst->datum.ip.prefix = 32; dst->datum.ip.scope_id = 0; dst->datum.ip.addr.v4.s_addr = htonl(src->datum.integer); } else if ((src->type == FR_TYPE_IPV4_ADDR) && - ((dst_type == FR_TYPE_INTEGER) || + ((dst_type == FR_TYPE_UINT32) || (dst_type == FR_TYPE_DATE) || - (dst_type == FR_TYPE_SIGNED))) { + (dst_type == FR_TYPE_INT32))) { dst->datum.integer = htonl(src->datum.ip.addr.v4.s_addr); } else { /* they're of the same byte order */ @@ -2429,7 +2429,7 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: { char *p; unsigned int i; @@ -2462,7 +2462,7 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, break; } - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: { char *p; unsigned int i; @@ -2495,7 +2495,7 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, break; } - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: { char *p; @@ -2553,7 +2553,7 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, } break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: { uint64_t i; @@ -2584,7 +2584,7 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, if (fr_timeval_from_str(&dst->datum.timeval, in) < 0) return -1; break; - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: { double d; @@ -2693,12 +2693,12 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst, } break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: /* Damned code for 1 WiMAX attribute */ dst->datum.sinteger = (int32_t)strtol(in, NULL, 10); break; - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: if ((strcmp(in, "yes") == 0) || strcmp(in, "true") == 0) { dst->datum.boolean = true; } else if ((strcmp(in, "no") == 0) || (strcmp(in, "false") == 0)) { @@ -2759,7 +2759,7 @@ char *fr_value_box_asprint(TALLOC_CTX *ctx, fr_value_box_t const *data, char quo fr_dict_enum_t const *dv; fr_value_box_t tmp; - fr_value_box_cast(ctx, &tmp, FR_TYPE_INTEGER, NULL, data); + fr_value_box_cast(ctx, &tmp, FR_TYPE_UINT32, NULL, data); dv = fr_dict_enum_by_da(NULL, data->datum.enumv, tmp.datum.integer); if (dv) return talloc_typed_strdup(ctx, dv->name); @@ -2846,23 +2846,23 @@ char *fr_value_box_asprint(TALLOC_CTX *ctx, fr_value_box_t const *data, char quo data->datum.ether[4], data->datum.ether[5]); break; - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: p = talloc_typed_strdup(ctx, data->datum.byte ? "yes" : "no"); break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: p = talloc_typed_asprintf(ctx, "%u", data->datum.byte); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: p = talloc_typed_asprintf(ctx, "%u", data->datum.ushort); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: p = talloc_typed_asprintf(ctx, "%u", data->datum.integer); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: p = talloc_typed_asprintf(ctx, "%" PRIu64, data->datum.integer64); break; @@ -2870,7 +2870,7 @@ char *fr_value_box_asprint(TALLOC_CTX *ctx, fr_value_box_t const *data, char quo p = talloc_typed_asprintf(ctx, "%zu", data->datum.size); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: p = talloc_typed_asprintf(ctx, "%d", data->datum.sinteger); break; @@ -2879,7 +2879,7 @@ char *fr_value_box_asprint(TALLOC_CTX *ctx, fr_value_box_t const *data, char quo (uint64_t)data->datum.timeval.tv_sec, (uint64_t)data->datum.timeval.tv_usec); break; - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: p = talloc_typed_asprintf(ctx, "%g", data->datum.decimal); break; @@ -2956,7 +2956,7 @@ size_t fr_value_box_snprint(char *out, size_t outlen, fr_value_box_t const *data fr_dict_enum_t const *dv; fr_value_box_t tmp; - fr_value_box_cast(NULL, &tmp, FR_TYPE_INTEGER, NULL, data); + fr_value_box_cast(NULL, &tmp, FR_TYPE_UINT32, NULL, data); dv = fr_dict_enum_by_da(NULL, data->datum.enumv, tmp.datum.integer); if (dv) return strlcpy(out, dv->name, outlen); @@ -2994,22 +2994,22 @@ size_t fr_value_box_snprint(char *out, size_t outlen, fr_value_box_t const *data return fr_snprint(out, outlen, data->datum.strvalue, data->datum.length, quote); - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: return snprintf(out, outlen, "%u", data->datum.byte); - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: return snprintf(out, outlen, "%u", data->datum.ushort); - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: return snprintf(out, outlen, "%u", data->datum.integer); - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: return snprintf(out, outlen, "%" PRIu64, data->datum.integer64); case FR_TYPE_SIZE: return snprintf(out, outlen, "%zu", data->datum.size); - case FR_TYPE_SIGNED: /* Damned code for 1 WiMAX attribute */ + case FR_TYPE_INT32: /* Damned code for 1 WiMAX attribute */ len = snprintf(buf, sizeof(buf), "%d", data->datum.sinteger); a = buf; break; @@ -3098,7 +3098,7 @@ size_t fr_value_box_snprint(char *out, size_t outlen, fr_value_box_t const *data data->datum.ether[2], data->datum.ether[3], data->datum.ether[4], data->datum.ether[5]); - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: return snprintf(out, outlen, "%g", data->datum.decimal); /* @@ -3112,7 +3112,7 @@ size_t fr_value_box_snprint(char *out, size_t outlen, fr_value_box_t const *data case FR_TYPE_EVS: case FR_TYPE_VSA: case FR_TYPE_VENDOR: - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: case FR_TYPE_STRUCT: case FR_TYPE_MAX: (void)fr_cond_assert(0); diff --git a/src/main/client.c b/src/main/client.c index c84836d1c94..ee307afcda6 100644 --- a/src/main/client.c +++ b/src/main/client.c @@ -467,11 +467,11 @@ static char const *hs_proto = NULL; #ifdef WITH_TCP static CONF_PARSER limit_config[] = { - { FR_CONF_OFFSET("max_connections", FR_TYPE_INTEGER, RADCLIENT, limit.max_connections), .dflt = "16" }, + { FR_CONF_OFFSET("max_connections", FR_TYPE_UINT32, RADCLIENT, limit.max_connections), .dflt = "16" }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_INTEGER, RADCLIENT, limit.lifetime), .dflt = "0" }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, RADCLIENT, limit.lifetime), .dflt = "0" }, - { FR_CONF_OFFSET("idle_timeout", FR_TYPE_INTEGER, RADCLIENT, limit.idle_timeout), .dflt = "30" }, + { FR_CONF_OFFSET("idle_timeout", FR_TYPE_UINT32, RADCLIENT, limit.idle_timeout), .dflt = "30" }, CONF_PARSER_TERMINATOR }; #endif @@ -483,7 +483,7 @@ static const CONF_PARSER client_config[] = { { FR_CONF_POINTER("src_ipaddr", FR_TYPE_STRING, &cl_srcipaddr) }, - { FR_CONF_OFFSET("require_message_authenticator", FR_TYPE_BOOLEAN, RADCLIENT, message_authenticator), .dflt = "no" }, + { FR_CONF_OFFSET("require_message_authenticator", FR_TYPE_BOOL, RADCLIENT, message_authenticator), .dflt = "no" }, { FR_CONF_OFFSET("secret", FR_TYPE_STRING | FR_TYPE_SECRET, RADCLIENT, secret) }, { FR_CONF_OFFSET("shortname", FR_TYPE_STRING, RADCLIENT, shortname) }, @@ -502,8 +502,8 @@ static const CONF_PARSER client_config[] = { #ifdef WITH_DYNAMIC_CLIENTS { FR_CONF_OFFSET("dynamic_clients", FR_TYPE_STRING, RADCLIENT, client_server) }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_INTEGER, RADCLIENT, lifetime) }, - { FR_CONF_OFFSET("rate_limit", FR_TYPE_BOOLEAN, RADCLIENT, rate_limit) }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, RADCLIENT, lifetime) }, + { FR_CONF_OFFSET("rate_limit", FR_TYPE_BOOL, RADCLIENT, rate_limit) }, #endif CONF_PARSER_TERMINATOR }; @@ -692,7 +692,7 @@ static const CONF_PARSER dynamic_config[] = { { FR_CONF_OFFSET("FreeRADIUS-Client-Src-IP-Address", FR_TYPE_IPV4_ADDR, RADCLIENT, src_ipaddr) }, { FR_CONF_OFFSET("FreeRADIUS-Client-Src-IPv6-Address", FR_TYPE_IPV6_ADDR, RADCLIENT, src_ipaddr) }, - { FR_CONF_OFFSET("FreeRADIUS-Client-Require-MA", FR_TYPE_BOOLEAN, RADCLIENT, message_authenticator) }, + { FR_CONF_OFFSET("FreeRADIUS-Client-Require-MA", FR_TYPE_BOOL, RADCLIENT, message_authenticator) }, { FR_CONF_OFFSET("FreeRADIUS-Client-Secret", FR_TYPE_STRING, RADCLIENT, secret), .dflt = "" }, { FR_CONF_OFFSET("FreeRADIUS-Client-Shortname", FR_TYPE_STRING, RADCLIENT, shortname), .dflt = "" }, @@ -1351,7 +1351,7 @@ RADCLIENT *client_afrom_request(RADCLIENT_LIST *clients, REQUEST *request) } break; - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: { CONF_PARSER const *parse; diff --git a/src/main/command.c b/src/main/command.c index 9aed4ceffa9..36dc05377b4 100644 --- a/src/main/command.c +++ b/src/main/command.c @@ -99,8 +99,8 @@ static const CONF_PARSER command_config[] = { { FR_CONF_DEPRECATED("uid", FR_TYPE_STRING, fr_command_socket_t, NULL) }, { FR_CONF_OFFSET("gid", FR_TYPE_STRING, fr_command_socket_t, gid_name) }, { FR_CONF_OFFSET("mode", FR_TYPE_STRING, fr_command_socket_t, mode_name) }, - { FR_CONF_OFFSET("peercred", FR_TYPE_BOOLEAN, fr_command_socket_t, peercred), .dflt = "yes" }, - { FR_CONF_OFFSET("blocking", FR_TYPE_BOOLEAN, fr_command_socket_t, blocking), }, + { FR_CONF_OFFSET("peercred", FR_TYPE_BOOL, fr_command_socket_t, peercred), .dflt = "yes" }, + { FR_CONF_OFFSET("blocking", FR_TYPE_BOOL, fr_command_socket_t, blocking), }, CONF_PARSER_TERMINATOR }; @@ -957,7 +957,7 @@ static void cprint_conf_parser(rad_listen_t *listener, int indent, CONF_SECTION variables[i].name); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: cprintf(listener, "%.*s%s = %u\n", indent, tabs, variables[i].name, *(int const *) data); break; @@ -970,7 +970,7 @@ static void cprint_conf_parser(rad_listen_t *listener, int indent, CONF_SECTION inet_ntop(AF_INET6, data, buffer, sizeof(buffer)); break; - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: cprintf(listener, "%.*s%s = %s\n", indent, tabs, variables[i].name, ((*(bool const *) data) == false) ? "no" : "yes"); diff --git a/src/main/cond_eval.c b/src/main/cond_eval.c index 5923e140508..e34de1ff87a 100644 --- a/src/main/cond_eval.c +++ b/src/main/cond_eval.c @@ -409,7 +409,7 @@ do {\ _l && (_l->type == FR_TYPE_STRING) &&\ _r && (_r->type == FR_TYPE_STRING) &&\ all_digits(lhs->datum.strvalue) && all_digits(rhs->datum.strvalue)) {\ - cast_type = FR_TYPE_INTEGER64;\ + cast_type = FR_TYPE_UINT64;\ EVAL_DEBUG("OPERANDS ARE NUMBER STRINGS, SETTING CAST TO integer64");\ }\ } while (0) diff --git a/src/main/cond_tokenize.c b/src/main/cond_tokenize.c index dfa21e6f1e5..7edfaa43943 100644 --- a/src/main/cond_tokenize.c +++ b/src/main/cond_tokenize.c @@ -329,45 +329,45 @@ static bool cond_type_check(fr_cond_t *c, fr_type_t lhs_type) * If the LHS has a small type, and the RHS has a large type, * then add a cast to the LHS. */ - if (lhs_type == FR_TYPE_INTEGER64) { - if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_INTEGER) || - (c->data.map->rhs->tmpl_da->type == FR_TYPE_SHORT) || - (c->data.map->rhs->tmpl_da->type == FR_TYPE_BYTE)) { + if (lhs_type == FR_TYPE_UINT64) { + if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT32) || + (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT16) || + (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT8)) { c->cast = NULL; return true; } } - if (lhs_type == FR_TYPE_INTEGER) { - if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_SHORT) || - (c->data.map->rhs->tmpl_da->type == FR_TYPE_BYTE)) { + if (lhs_type == FR_TYPE_UINT32) { + if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT16) || + (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT8)) { c->cast = NULL; return true; } - if (c->data.map->rhs->tmpl_da->type == FR_TYPE_INTEGER64) { + if (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT64) { c->cast = c->data.map->rhs->tmpl_da; return true; } } - if (lhs_type == FR_TYPE_SHORT) { - if (c->data.map->rhs->tmpl_da->type == FR_TYPE_BYTE) { + if (lhs_type == FR_TYPE_UINT16) { + if (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT8) { c->cast = NULL; return true; } - if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_INTEGER64) || - (c->data.map->rhs->tmpl_da->type == FR_TYPE_INTEGER)) { + if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT64) || + (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT32)) { c->cast = c->data.map->rhs->tmpl_da; return true; } } - if (lhs_type == FR_TYPE_BYTE) { - if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_INTEGER64) || - (c->data.map->rhs->tmpl_da->type == FR_TYPE_INTEGER) || - (c->data.map->rhs->tmpl_da->type == FR_TYPE_SHORT)) { + if (lhs_type == FR_TYPE_UINT8) { + if ((c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT64) || + (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT32) || + (c->data.map->rhs->tmpl_da->type == FR_TYPE_UINT16)) { c->cast = c->data.map->rhs->tmpl_da; return true; } @@ -793,10 +793,10 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_ITEM *ci, char const *start, if ((map->lhs->type != TMPL_TYPE_ATTR) || !((map->lhs->tmpl_da->type == FR_TYPE_OCTETS) || - (map->lhs->tmpl_da->type == FR_TYPE_BYTE) || - (map->lhs->tmpl_da->type == FR_TYPE_SHORT) || - (map->lhs->tmpl_da->type == FR_TYPE_INTEGER) || - (map->lhs->tmpl_da->type == FR_TYPE_INTEGER64))) { + (map->lhs->tmpl_da->type == FR_TYPE_UINT8) || + (map->lhs->tmpl_da->type == FR_TYPE_UINT16) || + (map->lhs->tmpl_da->type == FR_TYPE_UINT32) || + (map->lhs->tmpl_da->type == FR_TYPE_UINT64))) { c->cast = fr_dict_attr_by_num(NULL, 0, PW_CAST_BASE + FR_TYPE_OCTETS); } } @@ -921,7 +921,7 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_ITEM *ci, char const *start, * ifid to integer64 is OK */ if ((c->data.map->lhs->tmpl_da->type == FR_TYPE_IFID) && - (c->cast->type == FR_TYPE_INTEGER64)) { + (c->cast->type == FR_TYPE_UINT64)) { goto cast_ok; } @@ -944,7 +944,7 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_ITEM *ci, char const *start, /* * integer64 to ethernet is OK. */ - if ((c->data.map->lhs->tmpl_da->type == FR_TYPE_INTEGER64) && + if ((c->data.map->lhs->tmpl_da->type == FR_TYPE_UINT64) && (c->cast->type == FR_TYPE_ETHERNET)) { goto cast_ok; } diff --git a/src/main/conf_file.c b/src/main/conf_file.c index ca61299a611..cec3cd2a170 100644 --- a/src/main/conf_file.c +++ b/src/main/conf_file.c @@ -1741,7 +1741,7 @@ static int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, CONF_SECTION *cs, CON } switch (type) { - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: /* * Allow yes/no, true/false, and on/off */ @@ -1762,7 +1762,7 @@ static int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, CONF_SECTION *cs, CON cf_log_info(cs, "%.*s\t%s = %s", cs->depth, parse_spaces, cf_pair_attr(cp), cp->value); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: { unsigned long v = strtoul(cp->value, 0, 0); @@ -1785,7 +1785,7 @@ static int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, CONF_SECTION *cs, CON } break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: { unsigned long v = strtoul(cp->value, 0, 0); @@ -1800,7 +1800,7 @@ static int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, CONF_SECTION *cs, CON } break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: { unsigned long v = strtoul(cp->value, 0, 0); @@ -1815,7 +1815,7 @@ static int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, CONF_SECTION *cs, CON } break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: *(uint64_t *)out = strtoull(cp->value, NULL, 10); cf_log_info(cs, "%.*s\t%s = %" PRIu64, cs->depth, parse_spaces, cf_pair_attr(cp), *(uint64_t *)out); break; @@ -1832,7 +1832,7 @@ static int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, CONF_SECTION *cs, CON break; } - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: *(int32_t *)out = strtol(cp->value, NULL, 10); cf_log_info(cs, "%.*s\t%s = %d", cs->depth, parse_spaces, cf_pair_attr(cp), *(int32_t *)out); break; @@ -2040,11 +2040,11 @@ static int cf_pair_default(CONF_PAIR **out, CONF_SECTION *cs, char const *name, * | fr_type_t | Data type | Dynamically allocated | * | ----------------------- | ------------------ | ---------------------- | * | FR_TYPE_TMPL | ``vp_tmpl_t`` | Yes | - * | FR_TYPE_BOOLEAN | ``bool`` | No | - * | FR_TYPE_INTEGER | ``uint32_t`` | No | - * | FR_TYPE_SHORT | ``uint16_t`` | No | - * | FR_TYPE_INTEGER64 | ``uint64_t`` | No | - * | FR_TYPE_SIGNED | ``int32_t`` | No | + * | FR_TYPE_BOOL | ``bool`` | No | + * | FR_TYPE_UINT32 | ``uint32_t`` | No | + * | FR_TYPE_UINT16 | ``uint16_t`` | No | + * | FR_TYPE_UINT64 | ``uint64_t`` | No | + * | FR_TYPE_INT32 | ``int32_t`` | No | * | FR_TYPE_STRING | ``char const *`` | Yes | * | FR_TYPE_IPV4_ADDR | ``fr_ipaddr_t`` | No | * | FR_TYPE_IPV4_PREFIX | ``fr_ipaddr_t`` | No | @@ -2063,11 +2063,11 @@ static int cf_pair_default(CONF_PAIR **out, CONF_SECTION *cs, char const *name, * - ``data`` #FR_TYPE_TMPL - @copybrief FR_TYPE_TMPL * Feeds the value into #tmpl_afrom_str. Value can be * obtained when processing requests, with #tmpl_expand or #tmpl_aexpand. - * - ``data`` #FR_TYPE_BOOLEAN - @copybrief FR_TYPE_BOOLEAN - * - ``data`` #FR_TYPE_INTEGER - @copybrief FR_TYPE_INTEGER - * - ``data`` #FR_TYPE_SHORT - @copybrief FR_TYPE_SHORT - * - ``data`` #FR_TYPE_INTEGER64 - @copybrief FR_TYPE_INTEGER64 - * - ``data`` #FR_TYPE_SIGNED - @copybrief FR_TYPE_SIGNED + * - ``data`` #FR_TYPE_BOOL - @copybrief FR_TYPE_BOOL + * - ``data`` #FR_TYPE_UINT32 - @copybrief FR_TYPE_UINT32 + * - ``data`` #FR_TYPE_UINT16 - @copybrief FR_TYPE_UINT16 + * - ``data`` #FR_TYPE_UINT64 - @copybrief FR_TYPE_UINT64 + * - ``data`` #FR_TYPE_INT32 - @copybrief FR_TYPE_INT32 * - ``data`` #FR_TYPE_STRING - @copybrief FR_TYPE_STRING * - ``data`` #FR_TYPE_IPV4_ADDR - @copybrief FR_TYPE_IPV4_ADDR (IPv4 address with prefix 32). * - ``data`` #FR_TYPE_IPV4_PREFIX - @copybrief FR_TYPE_IPV4_PREFIX (IPv4 address with variable prefix). @@ -2165,23 +2165,23 @@ int cf_pair_parse(TALLOC_CTX *ctx, CONF_SECTION *cs, * talloc_array_length(). */ } else switch (PW_BASE_TYPE(type)) { - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: array = (void **)talloc_zero_array(ctx, bool, count); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: array = (void **)talloc_zero_array(ctx, uint32_t, count); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: array = (void **)talloc_zero_array(ctx, uint16_t, count); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: array = (void **)talloc_zero_array(ctx, uint64_t, count); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: array = (void **)talloc_zero_array(ctx, int32_t, count); break; diff --git a/src/main/connection.c b/src/main/connection.c index 8863faa1bb0..5eeea0afe05 100644 --- a/src/main/connection.c +++ b/src/main/connection.c @@ -142,21 +142,21 @@ struct fr_connection_pool_t { }; static const CONF_PARSER connection_config[] = { - { FR_CONF_OFFSET("start", FR_TYPE_INTEGER, fr_connection_pool_t, start), .dflt = "5" }, - { FR_CONF_OFFSET("min", FR_TYPE_INTEGER, fr_connection_pool_t, min), .dflt = "5" }, - { FR_CONF_OFFSET("max", FR_TYPE_INTEGER, fr_connection_pool_t, max), .dflt = "10" }, - { FR_CONF_OFFSET("max_pending", FR_TYPE_INTEGER, fr_connection_pool_t, max_pending), .dflt = "0" }, - { FR_CONF_OFFSET("spare", FR_TYPE_INTEGER, fr_connection_pool_t, spare), .dflt = "3" }, - { FR_CONF_OFFSET("uses", FR_TYPE_INTEGER64, fr_connection_pool_t, max_uses), .dflt = "0" }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_INTEGER, fr_connection_pool_t, lifetime), .dflt = "0" }, - { FR_CONF_OFFSET("cleanup_delay", FR_TYPE_INTEGER, fr_connection_pool_t, cleanup_interval) }, - { FR_CONF_OFFSET("cleanup_interval", FR_TYPE_INTEGER, fr_connection_pool_t, cleanup_interval), .dflt = "30" }, - { FR_CONF_OFFSET("idle_timeout", FR_TYPE_INTEGER, fr_connection_pool_t, idle_timeout), .dflt = "60" }, + { FR_CONF_OFFSET("start", FR_TYPE_UINT32, fr_connection_pool_t, start), .dflt = "5" }, + { FR_CONF_OFFSET("min", FR_TYPE_UINT32, fr_connection_pool_t, min), .dflt = "5" }, + { FR_CONF_OFFSET("max", FR_TYPE_UINT32, fr_connection_pool_t, max), .dflt = "10" }, + { FR_CONF_OFFSET("max_pending", FR_TYPE_UINT32, fr_connection_pool_t, max_pending), .dflt = "0" }, + { FR_CONF_OFFSET("spare", FR_TYPE_UINT32, fr_connection_pool_t, spare), .dflt = "3" }, + { FR_CONF_OFFSET("uses", FR_TYPE_UINT64, fr_connection_pool_t, max_uses), .dflt = "0" }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, fr_connection_pool_t, lifetime), .dflt = "0" }, + { FR_CONF_OFFSET("cleanup_delay", FR_TYPE_UINT32, fr_connection_pool_t, cleanup_interval) }, + { FR_CONF_OFFSET("cleanup_interval", FR_TYPE_UINT32, fr_connection_pool_t, cleanup_interval), .dflt = "30" }, + { FR_CONF_OFFSET("idle_timeout", FR_TYPE_UINT32, fr_connection_pool_t, idle_timeout), .dflt = "60" }, { FR_CONF_OFFSET("connect_timeout", FR_TYPE_TIMEVAL, fr_connection_pool_t, connect_timeout), .dflt = "3.0" }, { FR_CONF_OFFSET("held_trigger_min", FR_TYPE_TIMEVAL, fr_connection_pool_t, held_trigger_min), .dflt = "0.0" }, { FR_CONF_OFFSET("held_trigger_max", FR_TYPE_TIMEVAL, fr_connection_pool_t, held_trigger_max), .dflt = "0.5" }, - { FR_CONF_OFFSET("retry_delay", FR_TYPE_INTEGER, fr_connection_pool_t, retry_delay), .dflt = "1" }, - { FR_CONF_OFFSET("spread", FR_TYPE_BOOLEAN, fr_connection_pool_t, spread), .dflt = "no" }, + { FR_CONF_OFFSET("retry_delay", FR_TYPE_UINT32, fr_connection_pool_t, retry_delay), .dflt = "1" }, + { FR_CONF_OFFSET("spread", FR_TYPE_BOOL, fr_connection_pool_t, spread), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/main/listen.c b/src/main/listen.c index 4944fb21729..315c9506fa7 100644 --- a/src/main/listen.c +++ b/src/main/listen.c @@ -1235,19 +1235,19 @@ void common_packet_debug(REQUEST *request, RADIUS_PACKET *packet, bool received) } } static CONF_PARSER performance_config[] = { - { FR_CONF_OFFSET("skip_duplicate_checks", FR_TYPE_BOOLEAN, rad_listen_t, nodup) }, + { FR_CONF_OFFSET("skip_duplicate_checks", FR_TYPE_BOOL, rad_listen_t, nodup) }, CONF_PARSER_TERMINATOR }; static CONF_PARSER limit_config[] = { - { FR_CONF_OFFSET("max_pps", FR_TYPE_INTEGER, listen_socket_t, max_rate) }, + { FR_CONF_OFFSET("max_pps", FR_TYPE_UINT32, listen_socket_t, max_rate) }, #ifdef WITH_TCP - { FR_CONF_OFFSET("max_connections", FR_TYPE_INTEGER, listen_socket_t, limit.max_connections), .dflt = "16" }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_INTEGER, listen_socket_t, limit.lifetime), .dflt = "0" }, - { FR_CONF_OFFSET("idle_timeout", FR_TYPE_INTEGER, listen_socket_t, limit.idle_timeout), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("max_connections", FR_TYPE_UINT32, listen_socket_t, limit.max_connections), .dflt = "16" }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, listen_socket_t, limit.lifetime), .dflt = "0" }, + { FR_CONF_OFFSET("idle_timeout", FR_TYPE_UINT32, listen_socket_t, limit.idle_timeout), .dflt = STRINGIFY(30) }, #endif CONF_PARSER_TERMINATOR }; @@ -1316,10 +1316,10 @@ int common_socket_parse(CONF_SECTION *cs, rad_listen_t *this) ipaddr.addr.v6 = in6addr_any; /* in6addr_any binds to all addresses */ } - rcode = cf_pair_parse(NULL, cs, "port", FR_ITEM_POINTER(FR_TYPE_SHORT, &sock->my_port), "0", T_BARE_WORD); + rcode = cf_pair_parse(NULL, cs, "port", FR_ITEM_POINTER(FR_TYPE_UINT16, &sock->my_port), "0", T_BARE_WORD); if (rcode < 0) return -1; - rcode = cf_pair_parse(NULL, cs, "recv_buff", FR_ITEM_POINTER(FR_TYPE_INTEGER, &recv_buff), "0", T_BARE_WORD); + rcode = cf_pair_parse(NULL, cs, "recv_buff", FR_ITEM_POINTER(FR_TYPE_UINT32, &recv_buff), "0", T_BARE_WORD); if (rcode < 0) return -1; if (recv_buff) { FR_INTEGER_BOUND_CHECK("recv_buff", recv_buff, >=, 32); diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c index 5b9f57df377..f075205600c 100644 --- a/src/main/mainconfig.c +++ b/src/main/mainconfig.c @@ -129,8 +129,8 @@ static const CONF_PARSER startup_server_config[] = { { FR_CONF_POINTER("log_file", FR_TYPE_STRING, &main_config.log_file) }, { FR_CONF_POINTER("log_destination", FR_TYPE_STRING, &radlog_dest) }, - { FR_CONF_POINTER("use_utc", FR_TYPE_BOOLEAN, &log_dates_utc) }, - { FR_CONF_IS_SET_POINTER("timestamp", FR_TYPE_BOOLEAN, &log_timestamp) }, + { FR_CONF_POINTER("use_utc", FR_TYPE_BOOL, &log_dates_utc) }, + { FR_CONF_IS_SET_POINTER("timestamp", FR_TYPE_BOOL, &log_timestamp) }, CONF_PARSER_TERMINATOR }; @@ -142,15 +142,15 @@ static const CONF_PARSER startup_server_config[] = { * **********************************************************************/ static const CONF_PARSER log_config[] = { - { FR_CONF_POINTER("stripped_names", FR_TYPE_BOOLEAN, &log_stripped_names), .dflt = "no" }, - { FR_CONF_POINTER("auth", FR_TYPE_BOOLEAN, &main_config.log_auth), .dflt = "no" }, - { FR_CONF_POINTER("auth_badpass", FR_TYPE_BOOLEAN, &main_config.log_auth_badpass), .dflt = "no" }, - { FR_CONF_POINTER("auth_goodpass", FR_TYPE_BOOLEAN, &main_config.log_auth_goodpass), .dflt = "no" }, + { FR_CONF_POINTER("stripped_names", FR_TYPE_BOOL, &log_stripped_names), .dflt = "no" }, + { FR_CONF_POINTER("auth", FR_TYPE_BOOL, &main_config.log_auth), .dflt = "no" }, + { FR_CONF_POINTER("auth_badpass", FR_TYPE_BOOL, &main_config.log_auth_badpass), .dflt = "no" }, + { FR_CONF_POINTER("auth_goodpass", FR_TYPE_BOOL, &main_config.log_auth_goodpass), .dflt = "no" }, { FR_CONF_POINTER("msg_badpass", FR_TYPE_STRING, &main_config.auth_badpass_msg) }, { FR_CONF_POINTER("msg_goodpass", FR_TYPE_STRING, &main_config.auth_goodpass_msg) }, - { FR_CONF_POINTER("colourise", FR_TYPE_BOOLEAN, &do_colourise) }, - { FR_CONF_POINTER("timestamp", FR_TYPE_BOOLEAN, &log_timestamp) }, - { FR_CONF_POINTER("use_utc", FR_TYPE_BOOLEAN, &log_dates_utc) }, + { FR_CONF_POINTER("colourise", FR_TYPE_BOOL, &do_colourise) }, + { FR_CONF_POINTER("timestamp", FR_TYPE_BOOL, &log_timestamp) }, + { FR_CONF_POINTER("use_utc", FR_TYPE_BOOL, &log_dates_utc) }, { FR_CONF_POINTER("msg_denied", FR_TYPE_STRING, &main_config.denied_msg), .dflt = "You are already logged in - access denied" }, #ifdef WITH_CONF_WRITE { FR_CONF_POINTER("write_dir", FR_TYPE_STRING, &main_config.write_dir), .dflt = NULL }, @@ -163,19 +163,19 @@ static const CONF_PARSER log_config[] = { * Security configuration for the server. */ static const CONF_PARSER security_config[] = { - { FR_CONF_POINTER("max_attributes", FR_TYPE_INTEGER, &fr_max_attributes), .dflt = STRINGIFY(0) }, + { FR_CONF_POINTER("max_attributes", FR_TYPE_UINT32, &fr_max_attributes), .dflt = STRINGIFY(0) }, { FR_CONF_POINTER("reject_delay", FR_TYPE_TIMEVAL, &main_config.reject_delay), .dflt = STRINGIFY(0) }, - { FR_CONF_POINTER("status_server", FR_TYPE_BOOLEAN, &main_config.status_server), .dflt = "no" }, + { FR_CONF_POINTER("status_server", FR_TYPE_BOOL, &main_config.status_server), .dflt = "no" }, /* * No default, so it isn't printed in debug mode. */ - { FR_CONF_POINTER("tunnel_password_zeros", FR_TYPE_BOOLEAN, &fr_tunnel_password_zeros) }, + { FR_CONF_POINTER("tunnel_password_zeros", FR_TYPE_BOOL, &fr_tunnel_password_zeros) }, #ifdef ENABLE_OPENSSL_VERSION_CHECK { FR_CONF_POINTER("allow_vulnerable_openssl", FR_TYPE_STRING, &main_config.allow_vulnerable_openssl), .dflt = "no" }, #endif - { FR_CONF_POINTER("server_id", FR_TYPE_BYTE, &main_config.state_server_id) }, + { FR_CONF_POINTER("server_id", FR_TYPE_UINT8, &main_config.state_server_id) }, CONF_PARSER_TERMINATOR }; @@ -187,7 +187,7 @@ static const CONF_PARSER resources[] = { */ { FR_CONF_POINTER("talloc_pool_size", FR_TYPE_SIZE, &main_config.talloc_pool_size) }, /* DO NOT SET DEFAULT */ { FR_CONF_POINTER("talloc_memory_limit", FR_TYPE_SIZE, &main_config.talloc_memory_limit) }, /* DO NOT SET DEFAULT */ - { FR_CONF_POINTER("talloc_memory_report", FR_TYPE_BOOLEAN, &main_config.talloc_memory_report) }, /* DO NOT SET DEFAULT */ + { FR_CONF_POINTER("talloc_memory_report", FR_TYPE_BOOL, &main_config.talloc_memory_report) }, /* DO NOT SET DEFAULT */ CONF_PARSER_TERMINATOR }; @@ -208,18 +208,18 @@ static const CONF_PARSER server_config[] = { { FR_CONF_POINTER("libdir", FR_TYPE_STRING, &radlib_dir), .dflt = "${prefix}/lib"}, { FR_CONF_POINTER("radacctdir", FR_TYPE_STRING, &radacct_dir), .dflt = "${logdir}/radacct" }, { FR_CONF_POINTER("panic_action", FR_TYPE_STRING, &main_config.panic_action) }, - { FR_CONF_POINTER("hostname_lookups", FR_TYPE_BOOLEAN, &fr_dns_lookups), .dflt = "no" }, - { FR_CONF_POINTER("max_request_time", FR_TYPE_INTEGER, &main_config.max_request_time), .dflt = STRINGIFY(MAX_REQUEST_TIME) }, - { FR_CONF_POINTER("cleanup_delay", FR_TYPE_INTEGER, &main_config.cleanup_delay), .dflt = STRINGIFY(CLEANUP_DELAY) }, - { FR_CONF_POINTER("continuation_timeout", FR_TYPE_INTEGER, &main_config.continuation_timeout), .dflt = "15" }, - { FR_CONF_POINTER("max_requests", FR_TYPE_INTEGER, &main_config.max_requests), .dflt = STRINGIFY(MAX_REQUESTS) }, + { FR_CONF_POINTER("hostname_lookups", FR_TYPE_BOOL, &fr_dns_lookups), .dflt = "no" }, + { FR_CONF_POINTER("max_request_time", FR_TYPE_UINT32, &main_config.max_request_time), .dflt = STRINGIFY(MAX_REQUEST_TIME) }, + { FR_CONF_POINTER("cleanup_delay", FR_TYPE_UINT32, &main_config.cleanup_delay), .dflt = STRINGIFY(CLEANUP_DELAY) }, + { FR_CONF_POINTER("continuation_timeout", FR_TYPE_UINT32, &main_config.continuation_timeout), .dflt = "15" }, + { FR_CONF_POINTER("max_requests", FR_TYPE_UINT32, &main_config.max_requests), .dflt = STRINGIFY(MAX_REQUESTS) }, { FR_CONF_POINTER("pidfile", FR_TYPE_STRING, &main_config.pid_file), .dflt = "${run_dir}/radiusd.pid"}, { FR_CONF_POINTER("checkrad", FR_TYPE_STRING, &main_config.checkrad), .dflt = "${sbindir}/checkrad" }, - { FR_CONF_POINTER("debug_level", FR_TYPE_INTEGER, &main_config.debug_level), .dflt = "0" }, + { FR_CONF_POINTER("debug_level", FR_TYPE_UINT32, &main_config.debug_level), .dflt = "0" }, #ifdef WITH_PROXY - { FR_CONF_POINTER("proxy_requests", FR_TYPE_BOOLEAN, &main_config.proxy_requests), .dflt = "yes" }, + { FR_CONF_POINTER("proxy_requests", FR_TYPE_BOOL, &main_config.proxy_requests), .dflt = "yes" }, #endif { FR_CONF_POINTER("log", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) log_config }, @@ -233,10 +233,10 @@ static const CONF_PARSER server_config[] = { * DON'T exist in radiusd.conf, then the previously parsed * values for "log { foo = bar}" will be used. */ - { FR_CONF_POINTER("log_auth", FR_TYPE_BOOLEAN | FR_TYPE_DEPRECATED, &main_config.log_auth) }, - { FR_CONF_POINTER("log_auth_badpass", FR_TYPE_BOOLEAN | FR_TYPE_DEPRECATED, &main_config.log_auth_badpass) }, - { FR_CONF_POINTER("log_auth_goodpass", FR_TYPE_BOOLEAN | FR_TYPE_DEPRECATED, &main_config.log_auth_goodpass) }, - { FR_CONF_POINTER("log_stripped_names", FR_TYPE_BOOLEAN | FR_TYPE_DEPRECATED, &log_stripped_names) }, + { FR_CONF_POINTER("log_auth", FR_TYPE_BOOL | FR_TYPE_DEPRECATED, &main_config.log_auth) }, + { FR_CONF_POINTER("log_auth_badpass", FR_TYPE_BOOL | FR_TYPE_DEPRECATED, &main_config.log_auth_badpass) }, + { FR_CONF_POINTER("log_auth_goodpass", FR_TYPE_BOOL | FR_TYPE_DEPRECATED, &main_config.log_auth_goodpass) }, + { FR_CONF_POINTER("log_stripped_names", FR_TYPE_BOOL | FR_TYPE_DEPRECATED, &log_stripped_names) }, { FR_CONF_POINTER("security", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) security_config }, CONF_PARSER_TERMINATOR @@ -262,7 +262,7 @@ static const CONF_PARSER bootstrap_security_config[] = { { FR_CONF_POINTER("group", FR_TYPE_STRING, &gid_name) }, #endif { FR_CONF_POINTER("chroot", FR_TYPE_STRING, &chroot_dir) }, - { FR_CONF_POINTER("allow_core_dumps", FR_TYPE_BOOLEAN, &allow_core_dumps), .dflt = "no" }, + { FR_CONF_POINTER("allow_core_dumps", FR_TYPE_BOOL, &allow_core_dumps), .dflt = "no" }, CONF_PARSER_TERMINATOR }; @@ -284,7 +284,7 @@ static const CONF_PARSER bootstrap_config[] = { { FR_CONF_POINTER("group", FR_TYPE_STRING | FR_TYPE_DEPRECATED, &gid_name) }, #endif { FR_CONF_POINTER("chroot", FR_TYPE_STRING | FR_TYPE_DEPRECATED, &chroot_dir) }, - { FR_CONF_POINTER("allow_core_dumps", FR_TYPE_BOOLEAN | FR_TYPE_DEPRECATED, &allow_core_dumps) }, + { FR_CONF_POINTER("allow_core_dumps", FR_TYPE_BOOL | FR_TYPE_DEPRECATED, &allow_core_dumps) }, CONF_PARSER_TERMINATOR }; diff --git a/src/main/pair.c b/src/main/pair.c index 16039f10f1f..672db431f6e 100644 --- a/src/main/pair.c +++ b/src/main/pair.c @@ -182,17 +182,17 @@ int radius_compare_vps(UNUSED REQUEST *request, VALUE_PAIR *check, VALUE_PAIR *v check->vp_strvalue); break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: ret = vp->vp_byte - check->vp_byte; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: ret = vp->vp_short - check->vp_short; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: ret = vp->vp_integer - check->vp_integer; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: /* * Don't want integer overflow! */ @@ -205,7 +205,7 @@ int radius_compare_vps(UNUSED REQUEST *request, VALUE_PAIR *check, VALUE_PAIR *v } break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: if (vp->vp_signed < check->vp_signed) { ret = -1; } else if (vp->vp_signed > check->vp_signed) { diff --git a/src/main/radsnmp.c b/src/main/radsnmp.c index 49aa8f88872..7b72d4aaee3 100644 --- a/src/main/radsnmp.c +++ b/src/main/radsnmp.c @@ -224,7 +224,7 @@ static ssize_t radsnmp_pair_from_oid(TALLOC_CTX *ctx, radsnmp_conf_t *conf, vp_c break; } - if (index_attr->type != FR_TYPE_INTEGER) { + if (index_attr->type != FR_TYPE_UINT32) { fr_strerror_printf("Index is not a \"integer\""); break; } @@ -433,7 +433,7 @@ static int radsnmp_get_response(int fd, slen = dict_print_attr_oid(p, end - p, parent, vp->da->parent); if (slen < 0) return -1; - if (vp->vp_type != FR_TYPE_INTEGER) { + if (vp->vp_type != FR_TYPE_UINT32) { fr_strerror_printf("Index attribute \"%s\" is not of type \"integer\"", vp->da->name); return -1; } diff --git a/src/main/realms.c b/src/main/realms.c index 922bb8c05c3..f5b8f11246d 100644 --- a/src/main/realms.c +++ b/src/main/realms.c @@ -93,17 +93,17 @@ static rbtree_t *home_pools_byname = NULL; * Map the proxy server configuration parameters to variables. */ static const CONF_PARSER proxy_config[] = { - { FR_CONF_OFFSET("retry_delay", FR_TYPE_INTEGER, realm_config_t, retry_delay), .dflt = STRINGIFY(RETRY_DELAY) }, + { FR_CONF_OFFSET("retry_delay", FR_TYPE_UINT32, realm_config_t, retry_delay), .dflt = STRINGIFY(RETRY_DELAY) }, - { FR_CONF_OFFSET("retry_count", FR_TYPE_INTEGER, realm_config_t, retry_count), .dflt = STRINGIFY(RETRY_COUNT) }, + { FR_CONF_OFFSET("retry_count", FR_TYPE_UINT32, realm_config_t, retry_count), .dflt = STRINGIFY(RETRY_COUNT) }, - { FR_CONF_OFFSET("default_fallback", FR_TYPE_BOOLEAN, realm_config_t, fallback), .dflt = "no" }, + { FR_CONF_OFFSET("default_fallback", FR_TYPE_BOOL, realm_config_t, fallback), .dflt = "no" }, - { FR_CONF_OFFSET("dynamic", FR_TYPE_BOOLEAN, realm_config_t, dynamic) }, + { FR_CONF_OFFSET("dynamic", FR_TYPE_BOOL, realm_config_t, dynamic) }, - { FR_CONF_OFFSET("dead_time", FR_TYPE_INTEGER, realm_config_t, dead_time), .dflt = STRINGIFY(DEAD_TIME) }, + { FR_CONF_OFFSET("dead_time", FR_TYPE_UINT32, realm_config_t, dead_time), .dflt = STRINGIFY(DEAD_TIME) }, - { FR_CONF_OFFSET("wake_all_if_all_dead", FR_TYPE_BOOLEAN, realm_config_t, wake_all_if_all_dead), .dflt = "no" }, + { FR_CONF_OFFSET("wake_all_if_all_dead", FR_TYPE_BOOL, realm_config_t, wake_all_if_all_dead), .dflt = "no" }, CONF_PARSER_TERMINATOR }; #endif @@ -322,19 +322,19 @@ void realms_free(void) #ifdef WITH_PROXY static CONF_PARSER limit_config[] = { - { FR_CONF_OFFSET("max_connections", FR_TYPE_INTEGER, home_server_t, limit.max_connections), .dflt = "16" }, - { FR_CONF_OFFSET("max_requests", FR_TYPE_INTEGER, home_server_t, limit.max_requests), .dflt = "0" }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_INTEGER, home_server_t, limit.lifetime), .dflt = "0" }, - { FR_CONF_OFFSET("idle_timeout", FR_TYPE_INTEGER, home_server_t, limit.idle_timeout), .dflt = "0" }, + { FR_CONF_OFFSET("max_connections", FR_TYPE_UINT32, home_server_t, limit.max_connections), .dflt = "16" }, + { FR_CONF_OFFSET("max_requests", FR_TYPE_UINT32, home_server_t, limit.max_requests), .dflt = "0" }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, home_server_t, limit.lifetime), .dflt = "0" }, + { FR_CONF_OFFSET("idle_timeout", FR_TYPE_UINT32, home_server_t, limit.idle_timeout), .dflt = "0" }, CONF_PARSER_TERMINATOR }; #ifdef WITH_COA static CONF_PARSER home_server_coa[] = { - { FR_CONF_OFFSET("irt", FR_TYPE_INTEGER, home_server_t, coa_irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("mrt", FR_TYPE_INTEGER, home_server_t, coa_mrt), .dflt = STRINGIFY(16) }, - { FR_CONF_OFFSET("mrc", FR_TYPE_INTEGER, home_server_t, coa_mrc), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("mrd", FR_TYPE_INTEGER, home_server_t, coa_mrd), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("irt", FR_TYPE_UINT32, home_server_t, coa_irt), .dflt = STRINGIFY(2) }, + { FR_CONF_OFFSET("mrt", FR_TYPE_UINT32, home_server_t, coa_mrt), .dflt = STRINGIFY(16) }, + { FR_CONF_OFFSET("mrc", FR_TYPE_UINT32, home_server_t, coa_mrc), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("mrd", FR_TYPE_UINT32, home_server_t, coa_mrd), .dflt = STRINGIFY(30) }, CONF_PARSER_TERMINATOR }; #endif @@ -345,7 +345,7 @@ static CONF_PARSER home_server_config[] = { { FR_CONF_OFFSET("ipv6addr", FR_TYPE_IPV6_ADDR, home_server_t, ipaddr) }, { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING | FR_TYPE_NOT_EMPTY, home_server_t, server) }, - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, home_server_t, port), .dflt = "0" }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, home_server_t, port), .dflt = "0" }, { FR_CONF_OFFSET("type", FR_TYPE_STRING, home_server_t, type_str) }, @@ -358,28 +358,28 @@ static CONF_PARSER home_server_config[] = { { FR_CONF_OFFSET("src_ipaddr", FR_TYPE_STRING, home_server_t, src_ipaddr_str) }, { FR_CONF_OFFSET("response_window", FR_TYPE_TIMEVAL, home_server_t, response_window), .dflt = "30" }, - { FR_CONF_OFFSET("response_timeouts", FR_TYPE_INTEGER, home_server_t, max_response_timeouts), .dflt = "1" }, - { FR_CONF_OFFSET("max_outstanding", FR_TYPE_INTEGER, home_server_t, max_outstanding), .dflt = "65536" }, + { FR_CONF_OFFSET("response_timeouts", FR_TYPE_UINT32, home_server_t, max_response_timeouts), .dflt = "1" }, + { FR_CONF_OFFSET("max_outstanding", FR_TYPE_UINT32, home_server_t, max_outstanding), .dflt = "65536" }, - { FR_CONF_OFFSET("zombie_period", FR_TYPE_INTEGER, home_server_t, zombie_period), .dflt = "40" }, + { FR_CONF_OFFSET("zombie_period", FR_TYPE_UINT32, home_server_t, zombie_period), .dflt = "40" }, { FR_CONF_OFFSET("status_check", FR_TYPE_STRING, home_server_t, ping_check_str), .dflt = "none" }, { FR_CONF_OFFSET("ping_check", FR_TYPE_STRING, home_server_t, ping_check_str) }, - { FR_CONF_OFFSET("ping_interval", FR_TYPE_INTEGER, home_server_t, ping_interval), .dflt = "30" }, - { FR_CONF_OFFSET("check_interval", FR_TYPE_INTEGER, home_server_t, ping_interval) }, + { FR_CONF_OFFSET("ping_interval", FR_TYPE_UINT32, home_server_t, ping_interval), .dflt = "30" }, + { FR_CONF_OFFSET("check_interval", FR_TYPE_UINT32, home_server_t, ping_interval) }, - { FR_CONF_OFFSET("check_timeout", FR_TYPE_INTEGER, home_server_t, ping_timeout), .dflt = "4" }, - { FR_CONF_OFFSET("status_check_timeout", FR_TYPE_INTEGER, home_server_t, ping_timeout) }, + { FR_CONF_OFFSET("check_timeout", FR_TYPE_UINT32, home_server_t, ping_timeout), .dflt = "4" }, + { FR_CONF_OFFSET("status_check_timeout", FR_TYPE_UINT32, home_server_t, ping_timeout) }, - { FR_CONF_OFFSET("num_answers_to_alive", FR_TYPE_INTEGER, home_server_t, num_pings_to_alive), .dflt = "3" }, - { FR_CONF_OFFSET("revive_interval", FR_TYPE_INTEGER, home_server_t, revive_interval), .dflt = "300" }, + { FR_CONF_OFFSET("num_answers_to_alive", FR_TYPE_UINT32, home_server_t, num_pings_to_alive), .dflt = "3" }, + { FR_CONF_OFFSET("revive_interval", FR_TYPE_UINT32, home_server_t, revive_interval), .dflt = "300" }, { FR_CONF_OFFSET("username", FR_TYPE_STRING | FR_TYPE_NOT_EMPTY, home_server_t, ping_user_name) }, { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_NOT_EMPTY, home_server_t, ping_user_password) }, #ifdef WITH_STATS - { FR_CONF_OFFSET("historic_average_window", FR_TYPE_INTEGER, home_server_t, ema.window) }, + { FR_CONF_OFFSET("historic_average_window", FR_TYPE_UINT32, home_server_t, ema.window) }, #endif { FR_CONF_POINTER("limit", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) limit_config }, @@ -388,7 +388,7 @@ static CONF_PARSER home_server_config[] = { { FR_CONF_POINTER("coa", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) home_server_coa }, #endif - { FR_CONF_OFFSET("self", FR_TYPE_BOOLEAN, home_server_t, is_ourself), }, + { FR_CONF_OFFSET("self", FR_TYPE_BOOL, home_server_t, is_ourself), }, CONF_PARSER_TERMINATOR }; diff --git a/src/main/snmp.c b/src/main/snmp.c index b7a618b93c2..51f78d64a1c 100644 --- a/src/main/snmp.c +++ b/src/main/snmp.c @@ -95,7 +95,7 @@ static int snmp_value_uptime_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, ND struct timeval now; struct timeval diff; - rad_assert(map->da->type == FR_TYPE_INTEGER); + rad_assert(map->da->type == FR_TYPE_UINT32); gettimeofday(&now, NULL); fr_timeval_subtract(&diff, &now, &uptime); @@ -112,7 +112,7 @@ static int snmp_config_reset_time_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *ou struct timeval now; struct timeval diff; - rad_assert(map->da->type == FR_TYPE_INTEGER); + rad_assert(map->da->type == FR_TYPE_UINT32); gettimeofday(&now, NULL); fr_timeval_subtract(&diff, &now, &reset_time); @@ -126,7 +126,7 @@ static int snmp_config_reset_time_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *ou static int snmp_config_reset_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED void *snmp_ctx) { - rad_assert(map->da->type == FR_TYPE_INTEGER); + rad_assert(map->da->type == FR_TYPE_UINT32); out->datum.integer = reset_state; @@ -135,7 +135,7 @@ static int snmp_config_reset_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, ND static int snmp_config_reset_set(NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED void *snmp_ctx, fr_value_box_t *in) { - rad_assert(map->da->type == FR_TYPE_INTEGER); + rad_assert(map->da->type == FR_TYPE_UINT32); switch (in->datum.integer) { case PW_RADIUS_AUTH_SERV_CONFIG_RESET_VALUE_RESET: @@ -152,7 +152,7 @@ static int snmp_config_reset_set(NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED static int snmp_auth_stats_offset_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, fr_snmp_map_t const *map, UNUSED void *snmp_ctx) { - rad_assert(map->da->type == FR_TYPE_INTEGER); + rad_assert(map->da->type == FR_TYPE_UINT32); out->datum.integer = *(uint32_t *)((uint8_t *)(&radius_auth_stats) + map->offset); @@ -231,7 +231,7 @@ static int snmp_auth_client_stats_offset_get(UNUSED TALLOC_CTX *ctx, fr_value_bo RADCLIENT *client = snmp_ctx; rad_assert(client); - rad_assert(map->da->type == FR_TYPE_INTEGER); + rad_assert(map->da->type == FR_TYPE_UINT32); out->datum.integer = *(uint32_t *)((uint8_t *)(&client->auth) + map->offset); @@ -613,7 +613,7 @@ static ssize_t snmp_process_index_attr(vp_cursor_t *out, REQUEST *request, goto error; } - if (tlv_stack[depth]->type != FR_TYPE_INTEGER) { + if (tlv_stack[depth]->type != FR_TYPE_UINT32) { fr_strerror_printf("Bad index attribute: Index attribute \"%s\" should be a integer, " "but is a %s", tlv_stack[depth]->name, fr_int2str(dict_attr_types, tlv_stack[depth]->type, "?Unknown?")); diff --git a/src/main/stats.c b/src/main/stats.c index 28b60ffffb6..8bb34873d88 100644 --- a/src/main/stats.c +++ b/src/main/stats.c @@ -584,7 +584,7 @@ void request_stats_reply(REQUEST *request) * When retrieving client by number, also * echo back it's IP address. */ - if ((vp->vp_type == FR_TYPE_INTEGER) && + if ((vp->vp_type == FR_TYPE_UINT32) && (client->ipaddr.af == AF_INET)) { vp = radius_pair_create(request->reply, &request->reply->vps, diff --git a/src/main/threads.c b/src/main/threads.c index 1e82add6703..ca23ecc0592 100644 --- a/src/main/threads.c +++ b/src/main/threads.c @@ -171,17 +171,17 @@ static THREAD_HANDLE *thread_spawn(time_t now, int do_trigger); * A mapping of configuration file names to internal integers */ static const CONF_PARSER thread_config[] = { - { FR_CONF_POINTER("start_servers", FR_TYPE_INTEGER, &thread_pool.start_threads), .dflt = "5" }, - { FR_CONF_POINTER("max_servers", FR_TYPE_INTEGER, &thread_pool.max_threads), .dflt = "32" }, - { FR_CONF_POINTER("min_spare_servers", FR_TYPE_INTEGER, &thread_pool.min_spare_threads), .dflt = "3" }, - { FR_CONF_POINTER("max_spare_servers", FR_TYPE_INTEGER, &thread_pool.max_spare_threads), .dflt = "10" }, - { FR_CONF_POINTER("max_requests_per_server", FR_TYPE_INTEGER, &thread_pool.max_requests_per_thread), .dflt = "0" }, - { FR_CONF_POINTER("cleanup_delay", FR_TYPE_INTEGER, &thread_pool.cleanup_delay), .dflt = "5" }, - { FR_CONF_POINTER("max_queue_size", FR_TYPE_INTEGER, &thread_pool.max_queue_size), .dflt = "65536" }, + { FR_CONF_POINTER("start_servers", FR_TYPE_UINT32, &thread_pool.start_threads), .dflt = "5" }, + { FR_CONF_POINTER("max_servers", FR_TYPE_UINT32, &thread_pool.max_threads), .dflt = "32" }, + { FR_CONF_POINTER("min_spare_servers", FR_TYPE_UINT32, &thread_pool.min_spare_threads), .dflt = "3" }, + { FR_CONF_POINTER("max_spare_servers", FR_TYPE_UINT32, &thread_pool.max_spare_threads), .dflt = "10" }, + { FR_CONF_POINTER("max_requests_per_server", FR_TYPE_UINT32, &thread_pool.max_requests_per_thread), .dflt = "0" }, + { FR_CONF_POINTER("cleanup_delay", FR_TYPE_UINT32, &thread_pool.cleanup_delay), .dflt = "5" }, + { FR_CONF_POINTER("max_queue_size", FR_TYPE_UINT32, &thread_pool.max_queue_size), .dflt = "65536" }, { FR_CONF_POINTER("queue_priority", FR_TYPE_STRING, &thread_pool.queue_priority), .dflt = NULL }, #ifdef WITH_STATS #ifdef WITH_ACCOUNTING - { FR_CONF_POINTER("auto_limit_acct", FR_TYPE_BOOLEAN, &thread_pool.auto_limit_acct) }, + { FR_CONF_POINTER("auto_limit_acct", FR_TYPE_BOOL, &thread_pool.auto_limit_acct) }, #endif #endif CONF_PARSER_TERMINATOR diff --git a/src/main/tls/conf.c b/src/main/tls/conf.c index 8018aad5556..d02a0836b01 100644 --- a/src/main/tls/conf.c +++ b/src/main/tls/conf.c @@ -42,16 +42,16 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ static CONF_PARSER cache_config[] = { { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING, fr_tls_conf_t, session_cache_server) }, { FR_CONF_OFFSET("name", FR_TYPE_STRING, fr_tls_conf_t, session_id_name) }, - { FR_CONF_OFFSET("lifetime", FR_TYPE_INTEGER, fr_tls_conf_t, session_cache_lifetime), .dflt = "86400" }, - { FR_CONF_OFFSET("verify", FR_TYPE_BOOLEAN, fr_tls_conf_t, session_cache_verify), .dflt = "no" }, + { FR_CONF_OFFSET("lifetime", FR_TYPE_UINT32, fr_tls_conf_t, session_cache_lifetime), .dflt = "86400" }, + { FR_CONF_OFFSET("verify", FR_TYPE_BOOL, fr_tls_conf_t, session_cache_verify), .dflt = "no" }, #if OPENSSL_VERSION_NUMBER >= 0x10100000L - { FR_CONF_OFFSET("require_extended_master_secret", FR_TYPE_BOOLEAN, fr_tls_conf_t, session_cache_require_extms), .dflt = "yes" }, - { FR_CONF_OFFSET("require_perfect_forward_secrecy", FR_TYPE_BOOLEAN, fr_tls_conf_t, session_cache_require_pfs), .dflt = "no" }, + { FR_CONF_OFFSET("require_extended_master_secret", FR_TYPE_BOOL, fr_tls_conf_t, session_cache_require_extms), .dflt = "yes" }, + { FR_CONF_OFFSET("require_perfect_forward_secrecy", FR_TYPE_BOOL, fr_tls_conf_t, session_cache_require_pfs), .dflt = "no" }, #endif - { FR_CONF_DEPRECATED("enable", FR_TYPE_BOOLEAN, fr_tls_conf_t, NULL) }, - { FR_CONF_DEPRECATED("max_entries", FR_TYPE_INTEGER, fr_tls_conf_t, NULL) }, + { FR_CONF_DEPRECATED("enable", FR_TYPE_BOOL, fr_tls_conf_t, NULL) }, + { FR_CONF_DEPRECATED("max_entries", FR_TYPE_UINT32, fr_tls_conf_t, NULL) }, { FR_CONF_DEPRECATED("persist_dir", FR_TYPE_STRING, fr_tls_conf_t, NULL) }, CONF_PARSER_TERMINATOR @@ -65,24 +65,24 @@ static CONF_PARSER verify_config[] = { #ifdef HAVE_OPENSSL_OCSP_H static CONF_PARSER ocsp_config[] = { - { FR_CONF_OFFSET("enable", FR_TYPE_BOOLEAN, fr_tls_ocsp_conf_t, enable), .dflt = "no" }, + { FR_CONF_OFFSET("enable", FR_TYPE_BOOL, fr_tls_ocsp_conf_t, enable), .dflt = "no" }, { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING, fr_tls_ocsp_conf_t, cache_server) }, - { FR_CONF_OFFSET("override_cert_url", FR_TYPE_BOOLEAN, fr_tls_ocsp_conf_t, override_url), .dflt = "no" }, + { FR_CONF_OFFSET("override_cert_url", FR_TYPE_BOOL, fr_tls_ocsp_conf_t, override_url), .dflt = "no" }, { FR_CONF_OFFSET("url", FR_TYPE_STRING, fr_tls_ocsp_conf_t, url) }, - { FR_CONF_OFFSET("use_nonce", FR_TYPE_BOOLEAN, fr_tls_ocsp_conf_t, use_nonce), .dflt = "yes" }, - { FR_CONF_OFFSET("timeout", FR_TYPE_INTEGER, fr_tls_ocsp_conf_t, timeout), .dflt = "yes" }, - { FR_CONF_OFFSET("softfail", FR_TYPE_BOOLEAN, fr_tls_ocsp_conf_t, softfail), .dflt = "no" }, + { FR_CONF_OFFSET("use_nonce", FR_TYPE_BOOL, fr_tls_ocsp_conf_t, use_nonce), .dflt = "yes" }, + { FR_CONF_OFFSET("timeout", FR_TYPE_UINT32, fr_tls_ocsp_conf_t, timeout), .dflt = "yes" }, + { FR_CONF_OFFSET("softfail", FR_TYPE_BOOL, fr_tls_ocsp_conf_t, softfail), .dflt = "no" }, CONF_PARSER_TERMINATOR }; #endif static CONF_PARSER tls_server_config[] = { - { FR_CONF_OFFSET("verify_depth", FR_TYPE_INTEGER, fr_tls_conf_t, verify_depth), .dflt = "0" }, + { FR_CONF_OFFSET("verify_depth", FR_TYPE_UINT32, fr_tls_conf_t, verify_depth), .dflt = "0" }, { FR_CONF_OFFSET("ca_path", FR_TYPE_FILE_INPUT, fr_tls_conf_t, ca_path) }, - { FR_CONF_OFFSET("pem_file_type", FR_TYPE_BOOLEAN, fr_tls_conf_t, file_type), .dflt = "yes" }, + { FR_CONF_OFFSET("pem_file_type", FR_TYPE_BOOL, fr_tls_conf_t, file_type), .dflt = "yes" }, { FR_CONF_OFFSET("private_key_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, private_key_file) }, { FR_CONF_OFFSET("certificate_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, certificate_file) }, { FR_CONF_OFFSET("ca_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, ca_file) }, @@ -94,22 +94,22 @@ static CONF_PARSER tls_server_config[] = { #endif { FR_CONF_OFFSET("dh_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, dh_file) }, { FR_CONF_OFFSET("random_file", FR_TYPE_FILE_EXISTS, fr_tls_conf_t, random_file) }, - { FR_CONF_OFFSET("fragment_size", FR_TYPE_INTEGER, fr_tls_conf_t, fragment_size), .dflt = "1024" }, - { FR_CONF_OFFSET("auto_chain", FR_TYPE_BOOLEAN, fr_tls_conf_t, auto_chain), .dflt = "yes" }, - { FR_CONF_OFFSET("disable_single_dh_use", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_single_dh_use) }, - { FR_CONF_OFFSET("check_crl", FR_TYPE_BOOLEAN, fr_tls_conf_t, check_crl), .dflt = "no" }, + { FR_CONF_OFFSET("fragment_size", FR_TYPE_UINT32, fr_tls_conf_t, fragment_size), .dflt = "1024" }, + { FR_CONF_OFFSET("auto_chain", FR_TYPE_BOOL, fr_tls_conf_t, auto_chain), .dflt = "yes" }, + { FR_CONF_OFFSET("disable_single_dh_use", FR_TYPE_BOOL, fr_tls_conf_t, disable_single_dh_use) }, + { FR_CONF_OFFSET("check_crl", FR_TYPE_BOOL, fr_tls_conf_t, check_crl), .dflt = "no" }, #ifdef X509_V_FLAG_CRL_CHECK_ALL - { FR_CONF_DEPRECATED("check_all_crl", FR_TYPE_BOOLEAN, fr_tls_conf_t, NULL) }, + { FR_CONF_DEPRECATED("check_all_crl", FR_TYPE_BOOL, fr_tls_conf_t, NULL) }, #endif - { FR_CONF_OFFSET("allow_expired_crl", FR_TYPE_BOOLEAN, fr_tls_conf_t, allow_expired_crl) }, + { FR_CONF_OFFSET("allow_expired_crl", FR_TYPE_BOOL, fr_tls_conf_t, allow_expired_crl) }, { FR_CONF_OFFSET("check_cert_cn", FR_TYPE_STRING, fr_tls_conf_t, check_cert_cn) }, { FR_CONF_OFFSET("cipher_list", FR_TYPE_STRING, fr_tls_conf_t, cipher_list) }, - { FR_CONF_OFFSET("cipher_server_preference", FR_TYPE_BOOLEAN, fr_tls_conf_t, cipher_server_preference), .dflt = "yes" }, + { FR_CONF_OFFSET("cipher_server_preference", FR_TYPE_BOOL, fr_tls_conf_t, cipher_server_preference), .dflt = "yes" }, #ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS - { FR_CONF_OFFSET("allow_renegotiation", FR_TYPE_BOOLEAN, fr_tls_conf_t, allow_renegotiation), .dflt = "no" }, + { FR_CONF_OFFSET("allow_renegotiation", FR_TYPE_BOOL, fr_tls_conf_t, allow_renegotiation), .dflt = "no" }, #endif { FR_CONF_OFFSET("check_cert_issuer", FR_TYPE_STRING, fr_tls_conf_t, check_cert_issuer) }, - { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOLEAN, fr_tls_conf_t, require_client_cert) }, + { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOL, fr_tls_conf_t, require_client_cert) }, #if OPENSSL_VERSION_NUMBER >= 0x0090800fL #ifndef OPENSSL_NO_ECDH @@ -118,15 +118,15 @@ static CONF_PARSER tls_server_config[] = { #endif #ifdef SSL_OP_NO_TLSv1 - { FR_CONF_OFFSET("disable_tlsv1", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_tlsv1) }, + { FR_CONF_OFFSET("disable_tlsv1", FR_TYPE_BOOL, fr_tls_conf_t, disable_tlsv1) }, #endif #ifdef SSL_OP_NO_TLSv1_1 - { FR_CONF_OFFSET("disable_tlsv1_1", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_tlsv1_1) }, + { FR_CONF_OFFSET("disable_tlsv1_1", FR_TYPE_BOOL, fr_tls_conf_t, disable_tlsv1_1) }, #endif #ifdef SSL_OP_NO_TLSv1_2 - { FR_CONF_OFFSET("disable_tlsv1_2", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_tlsv1_2) }, + { FR_CONF_OFFSET("disable_tlsv1_2", FR_TYPE_BOOL, fr_tls_conf_t, disable_tlsv1_2) }, #endif { FR_CONF_POINTER("cache", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) cache_config }, @@ -142,17 +142,17 @@ static CONF_PARSER tls_server_config[] = { }; static CONF_PARSER tls_client_config[] = { - { FR_CONF_OFFSET("verify_depth", FR_TYPE_INTEGER, fr_tls_conf_t, verify_depth), .dflt = "0" }, + { FR_CONF_OFFSET("verify_depth", FR_TYPE_UINT32, fr_tls_conf_t, verify_depth), .dflt = "0" }, { FR_CONF_OFFSET("ca_path", FR_TYPE_FILE_INPUT, fr_tls_conf_t, ca_path) }, - { FR_CONF_OFFSET("pem_file_type", FR_TYPE_BOOLEAN, fr_tls_conf_t, file_type), .dflt = "yes" }, + { FR_CONF_OFFSET("pem_file_type", FR_TYPE_BOOL, fr_tls_conf_t, file_type), .dflt = "yes" }, { FR_CONF_OFFSET("private_key_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, private_key_file) }, { FR_CONF_OFFSET("certificate_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, certificate_file) }, { FR_CONF_OFFSET("ca_file", FR_TYPE_FILE_INPUT, fr_tls_conf_t, ca_file) }, { FR_CONF_OFFSET("private_key_password", FR_TYPE_STRING | FR_TYPE_SECRET, fr_tls_conf_t, private_key_password) }, { FR_CONF_OFFSET("dh_file", FR_TYPE_STRING, fr_tls_conf_t, dh_file) }, { FR_CONF_OFFSET("random_file", FR_TYPE_STRING, fr_tls_conf_t, random_file) }, - { FR_CONF_OFFSET("fragment_size", FR_TYPE_INTEGER, fr_tls_conf_t, fragment_size), .dflt = "1024" }, - { FR_CONF_OFFSET("check_crl", FR_TYPE_BOOLEAN, fr_tls_conf_t, check_crl), .dflt = "no" }, + { FR_CONF_OFFSET("fragment_size", FR_TYPE_UINT32, fr_tls_conf_t, fragment_size), .dflt = "1024" }, + { FR_CONF_OFFSET("check_crl", FR_TYPE_BOOL, fr_tls_conf_t, check_crl), .dflt = "no" }, { FR_CONF_OFFSET("check_cert_cn", FR_TYPE_STRING, fr_tls_conf_t, check_cert_cn) }, { FR_CONF_OFFSET("cipher_list", FR_TYPE_STRING, fr_tls_conf_t, cipher_list) }, { FR_CONF_OFFSET("check_cert_issuer", FR_TYPE_STRING, fr_tls_conf_t, check_cert_issuer) }, @@ -164,15 +164,15 @@ static CONF_PARSER tls_client_config[] = { #endif #ifdef SSL_OP_NO_TLSv1 - { FR_CONF_OFFSET("disable_tlsv1", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_tlsv1) }, + { FR_CONF_OFFSET("disable_tlsv1", FR_TYPE_BOOL, fr_tls_conf_t, disable_tlsv1) }, #endif #ifdef SSL_OP_NO_TLSv1_1 - { FR_CONF_OFFSET("disable_tlsv1_1", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_tlsv1_1) }, + { FR_CONF_OFFSET("disable_tlsv1_1", FR_TYPE_BOOL, fr_tls_conf_t, disable_tlsv1_1) }, #endif #ifdef SSL_OP_NO_TLSv1_2 - { FR_CONF_OFFSET("disable_tlsv1_2", FR_TYPE_BOOLEAN, fr_tls_conf_t, disable_tlsv1_2) }, + { FR_CONF_OFFSET("disable_tlsv1_2", FR_TYPE_BOOL, fr_tls_conf_t, disable_tlsv1_2) }, #endif CONF_PARSER_TERMINATOR }; diff --git a/src/main/unlang_interpret.c b/src/main/unlang_interpret.c index 7ecad4f1c7c..772055187bf 100644 --- a/src/main/unlang_interpret.c +++ b/src/main/unlang_interpret.c @@ -184,10 +184,10 @@ static unlang_action_t unlang_load_balance(REQUEST *request, unlang_stack_t *sta * select which frame is being used. */ if ((g->vpt->type == TMPL_TYPE_ATTR) && - ((g->vpt->tmpl_da->type == FR_TYPE_BYTE) || - (g->vpt->tmpl_da->type == FR_TYPE_SHORT) || - (g->vpt->tmpl_da->type == FR_TYPE_INTEGER) || - (g->vpt->tmpl_da->type == FR_TYPE_INTEGER64))) { + ((g->vpt->tmpl_da->type == FR_TYPE_UINT8) || + (g->vpt->tmpl_da->type == FR_TYPE_UINT16) || + (g->vpt->tmpl_da->type == FR_TYPE_UINT32) || + (g->vpt->tmpl_da->type == FR_TYPE_UINT64))) { VALUE_PAIR *vp; slen = tmpl_find_vp(&vp, request, g->vpt); @@ -197,19 +197,19 @@ static unlang_action_t unlang_load_balance(REQUEST *request, unlang_stack_t *sta } switch (g->vpt->tmpl_da->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: start = ((uint32_t) vp->vp_byte) % g->num_children; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: start = ((uint32_t) vp->vp_short) % g->num_children; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: start = vp->vp_integer % g->num_children; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: start = (uint32_t) (vp->vp_integer64 % ((uint64_t) g->num_children)); break; diff --git a/src/main/xlat_func.c b/src/main/xlat_func.c index 30d3ba8af09..7249570f32b 100644 --- a/src/main/xlat_func.c +++ b/src/main/xlat_func.c @@ -111,7 +111,7 @@ static ssize_t xlat_integer(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen, memcpy(&int32, vp->vp_octets, vp->vp_length); return snprintf(*out, outlen, "%i", htonl(int32)); - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: return snprintf(*out, outlen, "%" PRIu64, vp->vp_integer64); /* @@ -122,16 +122,16 @@ static ssize_t xlat_integer(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen, case FR_TYPE_IPV4_PREFIX: /* Same addr field */ return snprintf(*out, outlen, "%u", htonl(vp->vp_ipv4addr)); - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: return snprintf(*out, outlen, "%u", vp->vp_integer); case FR_TYPE_DATE: return snprintf(*out, outlen, "%u", vp->vp_date); - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: return snprintf(*out, outlen, "%u", (unsigned int) vp->vp_byte); - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: return snprintf(*out, outlen, "%u", (unsigned int) vp->vp_short); /* @@ -142,7 +142,7 @@ static ssize_t xlat_integer(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen, memcpy(&int64, vp->vp_ether, sizeof(vp->vp_ether)); return snprintf(*out, outlen, "%" PRIu64, htonll(int64)); - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: return snprintf(*out, outlen, "%i", vp->vp_signed); case FR_TYPE_IPV6_ADDR: diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c index b609b324bc7..faa5d836c5f 100644 --- a/src/modules/proto_bfd/proto_bfd.c +++ b/src/modules/proto_bfd/proto_bfd.c @@ -495,26 +495,26 @@ static bfd_state_t *bfd_new_session(bfd_socket_t *sock, int sockfd, /* * Allow over-riding of variables per session. */ - rcode = cf_pair_parse(NULL, cs, "demand", FR_ITEM_POINTER(FR_TYPE_BOOLEAN, &flag), NULL, T_INVALID); + rcode = cf_pair_parse(NULL, cs, "demand", FR_ITEM_POINTER(FR_TYPE_BOOL, &flag), NULL, T_INVALID); if (rcode == 0) { session->demand_mode = flag; } - rcode = cf_pair_parse(NULL, cs, "min_transmit_interval", FR_ITEM_POINTER(FR_TYPE_INTEGER, &number), NULL, T_INVALID); + rcode = cf_pair_parse(NULL, cs, "min_transmit_interval", FR_ITEM_POINTER(FR_TYPE_UINT32, &number), NULL, T_INVALID); if (rcode == 0) { if (number < 100) number = 100; if (number > 10000) number = 10000; session->desired_min_tx_interval = number * 1000; } - rcode = cf_pair_parse(NULL, cs, "min_receive_interval", FR_ITEM_POINTER(FR_TYPE_INTEGER, &number), NULL, T_INVALID); + rcode = cf_pair_parse(NULL, cs, "min_receive_interval", FR_ITEM_POINTER(FR_TYPE_UINT32, &number), NULL, T_INVALID); if (rcode == 0) { if (number < 100) number = 100; if (number > 10000) number = 10000; session->required_min_rx_interval = number * 1000; } - rcode = cf_pair_parse(NULL, cs, "max_timeouts", FR_ITEM_POINTER(FR_TYPE_INTEGER, &number), NULL, T_INVALID); + rcode = cf_pair_parse(NULL, cs, "max_timeouts", FR_ITEM_POINTER(FR_TYPE_UINT32, &number), NULL, T_INVALID); if (rcode == 0) { if (number == 0) number = 1; if (number > 10) number = 10; @@ -1562,7 +1562,7 @@ static int bfd_parse_ip_port(CONF_SECTION *cs, fr_ipaddr_t *ipaddr, uint16_t *po ipaddr->af = AF_INET6; } - rcode = cf_pair_parse(NULL, cs, "port", FR_ITEM_POINTER(FR_TYPE_SHORT, port), "0", T_INVALID); + rcode = cf_pair_parse(NULL, cs, "port", FR_ITEM_POINTER(FR_TYPE_UINT16, port), "0", T_INVALID); if (rcode < 0) return -1; return 0; @@ -1669,9 +1669,9 @@ static int bfd_socket_parse(CONF_SECTION *cs, rad_listen_t *this) cf_pair_parse(sock, cs, "interface", FR_ITEM_POINTER(FR_TYPE_STRING, &sock->interface), NULL, T_INVALID); - cf_pair_parse(sock, cs, "min_receive_interval", FR_ITEM_POINTER(FR_TYPE_INTEGER, &sock->min_rx_interval), "1000", T_BARE_WORD); - cf_pair_parse(sock, cs, "max_timeouts", FR_ITEM_POINTER(FR_TYPE_INTEGER, &sock->max_timeouts), "3", T_BARE_WORD); - cf_pair_parse(sock, cs, "demand", FR_ITEM_POINTER(FR_TYPE_BOOLEAN, &sock->demand), "no", T_DOUBLE_QUOTED_STRING); + cf_pair_parse(sock, cs, "min_receive_interval", FR_ITEM_POINTER(FR_TYPE_UINT32, &sock->min_rx_interval), "1000", T_BARE_WORD); + cf_pair_parse(sock, cs, "max_timeouts", FR_ITEM_POINTER(FR_TYPE_UINT32, &sock->max_timeouts), "3", T_BARE_WORD); + cf_pair_parse(sock, cs, "demand", FR_ITEM_POINTER(FR_TYPE_BOOL, &sock->demand), "no", T_DOUBLE_QUOTED_STRING); cf_pair_parse(NULL, cs, "auth_type", FR_ITEM_POINTER(FR_TYPE_STRING, &auth_type_str), NULL, T_INVALID); if (!this->server) { diff --git a/src/modules/proto_detail/proto_detail.c b/src/modules/proto_detail/proto_detail.c index a197f957792..5d94dd875be 100644 --- a/src/modules/proto_detail/proto_detail.c +++ b/src/modules/proto_detail/proto_detail.c @@ -1017,11 +1017,11 @@ static void *detail_handler_thread(void *arg) static const CONF_PARSER detail_config[] = { { FR_CONF_OFFSET("detail", FR_TYPE_FILE_OUTPUT | FR_TYPE_DEPRECATED, listen_detail_t, filename) }, { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_REQUIRED, listen_detail_t, filename) }, - { FR_CONF_OFFSET("load_factor", FR_TYPE_INTEGER, listen_detail_t, load_factor), .dflt = STRINGIFY(10) }, - { FR_CONF_OFFSET("poll_interval", FR_TYPE_INTEGER, listen_detail_t, poll_interval), .dflt = STRINGIFY(1) }, - { FR_CONF_OFFSET("retry_interval", FR_TYPE_INTEGER, listen_detail_t, retry_interval), .dflt = STRINGIFY(30) }, - { FR_CONF_OFFSET("one_shot", FR_TYPE_BOOLEAN, listen_detail_t, one_shot), .dflt = "no" }, - { FR_CONF_OFFSET("track", FR_TYPE_BOOLEAN, listen_detail_t, track), .dflt = "no" }, + { FR_CONF_OFFSET("load_factor", FR_TYPE_UINT32, listen_detail_t, load_factor), .dflt = STRINGIFY(10) }, + { FR_CONF_OFFSET("poll_interval", FR_TYPE_UINT32, listen_detail_t, poll_interval), .dflt = STRINGIFY(1) }, + { FR_CONF_OFFSET("retry_interval", FR_TYPE_UINT32, listen_detail_t, retry_interval), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("one_shot", FR_TYPE_BOOL, listen_detail_t, one_shot), .dflt = "no" }, + { FR_CONF_OFFSET("track", FR_TYPE_BOOL, listen_detail_t, track), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/proto_dhcp/dhcp.c b/src/modules/proto_dhcp/dhcp.c index db209601f3d..bd2a0c3e4b9 100644 --- a/src/modules/proto_dhcp/dhcp.c +++ b/src/modules/proto_dhcp/dhcp.c @@ -693,18 +693,18 @@ static int fr_dhcp_array_members(size_t *out, size_t len, fr_dict_attr_t const * * Could be an array of bytes, integers, etc. */ if (da->flags.array) switch (da->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: num_entries = len; *out = 1; break; - case FR_TYPE_SHORT: /* ignore any trailing data */ + case FR_TYPE_UINT16: /* ignore any trailing data */ num_entries = len >> 1; *out = 2; break; case FR_TYPE_IPV4_ADDR: - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: case FR_TYPE_DATE: /* ignore any trailing data */ num_entries = len >> 2; *out = 4; @@ -747,20 +747,20 @@ static ssize_t decode_value_internal(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_di if (da->flags.is_unknown) talloc_steal(vp, da); switch (da->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: if (data_len != 1) goto raw; vp->vp_byte = p[0]; p++; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: if (data_len != 2) goto raw; memcpy(&vp->vp_short, p, 2); vp->vp_short = ntohs(vp->vp_short); p += 2; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: if (data_len != 4) goto raw; memcpy(&vp->vp_integer, p, 4); vp->vp_integer = ntohl(vp->vp_integer); @@ -1167,15 +1167,15 @@ int fr_dhcp_decode(RADIUS_PACKET *packet) } switch (vp->vp_type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: vp->vp_byte = p[0]; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: vp->vp_short = (p[0] << 8) | p[1]; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: memcpy(&vp->vp_integer, p, 4); vp->vp_integer = ntohl(vp->vp_integer); break; @@ -1381,18 +1381,18 @@ static ssize_t encode_value(uint8_t *out, size_t outlen, if (outlen < vp->vp_length) return 0; switch (tlv_stack[depth]->type) { - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: p[0] = vp->vp_byte; p ++; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: p[0] = (vp->vp_short >> 8) & 0xff; p[1] = vp->vp_short & 0xff; p += 2; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: lvalue = htonl(vp->vp_integer); memcpy(p, &lvalue, 4); p += 4; diff --git a/src/modules/proto_dhcp/proto_dhcp.c b/src/modules/proto_dhcp/proto_dhcp.c index f010f32abe8..32cf59b4dca 100644 --- a/src/modules/proto_dhcp/proto_dhcp.c +++ b/src/modules/proto_dhcp/proto_dhcp.c @@ -736,7 +736,7 @@ static int dhcp_socket_parse(CONF_SECTION *cs, rad_listen_t *this) cp = cf_pair_find(cs, "suppress_responses"); if (cp) { rcode = cf_pair_parse(sock, cs, "suppress_responses", - FR_ITEM_POINTER(FR_TYPE_BOOLEAN, &sock->suppress_responses), NULL, T_INVALID); + FR_ITEM_POINTER(FR_TYPE_BOOL, &sock->suppress_responses), NULL, T_INVALID); if (rcode < 0) return -1; } diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c index 94dda6ad4bc..1c45fa4b388 100644 --- a/src/modules/proto_ldap_sync/proto_ldap_sync.c +++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c @@ -116,29 +116,29 @@ static CONF_PARSER ldap_sync_search_config[] = { { FR_CONF_OFFSET("attrs", FR_TYPE_STRING | FR_TYPE_MULTI, sync_config_t, attrs) }, - { FR_CONF_OFFSET("allow_refresh", FR_TYPE_BOOLEAN, sync_config_t, allow_refresh), .dflt = "no" }, + { FR_CONF_OFFSET("allow_refresh", FR_TYPE_BOOL, sync_config_t, allow_refresh), .dflt = "no" }, CONF_PARSER_TERMINATOR }; static CONF_PARSER option_config[] = { #ifdef LDAP_OPT_X_KEEPALIVE_IDLE - { FR_CONF_OFFSET("idle", FR_TYPE_INTEGER, fr_ldap_handle_config_t, keepalive_idle), .dflt = "60" }, + { FR_CONF_OFFSET("idle", FR_TYPE_UINT32, fr_ldap_handle_config_t, keepalive_idle), .dflt = "60" }, #endif #ifdef LDAP_OPT_X_KEEPALIVE_PROBES - { FR_CONF_OFFSET("probes", FR_TYPE_INTEGER, fr_ldap_handle_config_t, keepalive_probes), .dflt = "3" }, + { FR_CONF_OFFSET("probes", FR_TYPE_UINT32, fr_ldap_handle_config_t, keepalive_probes), .dflt = "3" }, #endif #ifdef LDAP_OPT_X_KEEPALIVE_INTERVAL - { FR_CONF_OFFSET("interval", FR_TYPE_INTEGER, fr_ldap_handle_config_t, keepalive_interval), .dflt = "30" }, + { FR_CONF_OFFSET("interval", FR_TYPE_UINT32, fr_ldap_handle_config_t, keepalive_interval), .dflt = "30" }, #endif { FR_CONF_OFFSET("dereference", FR_TYPE_STRING, fr_ldap_handle_config_t, dereference_str) }, /* allow server unlimited time for search (server-side limit) */ - { FR_CONF_OFFSET("srv_timelimit", FR_TYPE_INTEGER, fr_ldap_handle_config_t, srv_timelimit), .dflt = "20" }, + { FR_CONF_OFFSET("srv_timelimit", FR_TYPE_UINT32, fr_ldap_handle_config_t, srv_timelimit), .dflt = "20" }, /* timeout for search results */ { FR_CONF_OFFSET("res_timeout", FR_TYPE_TIMEVAL, fr_ldap_handle_config_t, res_timeout), .dflt = "20" }, #ifdef LDAP_OPT_NETWORK_TIMEOUT /* timeout on network activity */ - { FR_CONF_DEPRECATED("net_timeout", FR_TYPE_INTEGER, fr_ldap_handle_config_t, net_timeout), .dflt = "10" }, + { FR_CONF_DEPRECATED("net_timeout", FR_TYPE_UINT32, fr_ldap_handle_config_t, net_timeout), .dflt = "10" }, #endif CONF_PARSER_TERMINATOR @@ -146,7 +146,7 @@ static CONF_PARSER option_config[] = { static const CONF_PARSER global_config[] = { { FR_CONF_OFFSET("random_file", FR_TYPE_FILE_EXISTS, proto_ldap_inst_t, tls_random_file) }, - { FR_CONF_OFFSET("ldap_debug", FR_TYPE_INTEGER, proto_ldap_inst_t, ldap_debug), .dflt = "0x0000" }, /* Debugging flags to the server */ + { FR_CONF_OFFSET("ldap_debug", FR_TYPE_UINT32, proto_ldap_inst_t, ldap_debug), .dflt = "0x0000" }, /* Debugging flags to the server */ CONF_PARSER_TERMINATOR }; @@ -159,7 +159,7 @@ static CONF_PARSER tls_config[] = { { FR_CONF_OFFSET("ca_path", FR_TYPE_FILE_INPUT, fr_ldap_handle_config_t, tls_ca_path) }, { FR_CONF_OFFSET("certificate_file", FR_TYPE_FILE_INPUT, fr_ldap_handle_config_t, tls_certificate_file) }, { FR_CONF_OFFSET("private_key_file", FR_TYPE_FILE_INPUT, fr_ldap_handle_config_t, tls_private_key_file) }, - { FR_CONF_OFFSET("start_tls", FR_TYPE_BOOLEAN, fr_ldap_handle_config_t, start_tls), .dflt = "no" }, + { FR_CONF_OFFSET("start_tls", FR_TYPE_BOOL, fr_ldap_handle_config_t, start_tls), .dflt = "no" }, { FR_CONF_OFFSET("require_cert", FR_TYPE_STRING, fr_ldap_handle_config_t, tls_require_cert_str) }, CONF_PARSER_TERMINATOR @@ -170,7 +170,7 @@ static const CONF_PARSER module_config[] = { * LDAP server definition */ { FR_CONF_OFFSET("server", FR_TYPE_STRING | FR_TYPE_MULTI | FR_TYPE_REQUIRED, proto_ldap_inst_t, handle_config.server_str) }, - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, proto_ldap_inst_t, handle_config.port) }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, proto_ldap_inst_t, handle_config.port) }, { FR_CONF_OFFSET("identity", FR_TYPE_STRING, proto_ldap_inst_t, handle_config.admin_identity) }, { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_SECRET, proto_ldap_inst_t, handle_config.admin_password) }, { FR_CONF_OFFSET("sasl", FR_TYPE_SUBSECTION, proto_ldap_inst_t, handle_config.admin_sasl), .subcs = (void const *) sasl_mech_static }, diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c index c99e64c0943..22a7e6cef51 100644 --- a/src/modules/rlm_always/rlm_always.c +++ b/src/modules/rlm_always/rlm_always.c @@ -49,8 +49,8 @@ typedef struct rlm_always_t { */ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("rcode", FR_TYPE_STRING, rlm_always_t, rcode_str), .dflt = "fail" }, - { FR_CONF_OFFSET("simulcount", FR_TYPE_INTEGER, rlm_always_t, simulcount), .dflt = "0" }, - { FR_CONF_OFFSET("mpp", FR_TYPE_BOOLEAN, rlm_always_t, mpp), .dflt = "no" }, + { FR_CONF_OFFSET("simulcount", FR_TYPE_UINT32, rlm_always_t, simulcount), .dflt = "0" }, + { FR_CONF_OFFSET("mpp", FR_TYPE_BOOL, rlm_always_t, mpp), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c index 0a8d00740b0..997b72fc749 100644 --- a/src/modules/rlm_attr_filter/rlm_attr_filter.c +++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c @@ -47,7 +47,7 @@ typedef struct rlm_attr_filter { static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_INPUT | FR_TYPE_REQUIRED, rlm_attr_filter_t, filename) }, { FR_CONF_OFFSET("key", FR_TYPE_TMPL, rlm_attr_filter_t, key), .dflt = "&Realm", .quote = T_BARE_WORD }, - { FR_CONF_OFFSET("relaxed", FR_TYPE_BOOLEAN, rlm_attr_filter_t, relaxed), .dflt = "no" }, + { FR_CONF_OFFSET("relaxed", FR_TYPE_BOOL, rlm_attr_filter_t, relaxed), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c index c305e314d36..22b1a546df3 100644 --- a/src/modules/rlm_cache/rlm_cache.c +++ b/src/modules/rlm_cache/rlm_cache.c @@ -39,12 +39,12 @@ extern rad_module_t rlm_cache; static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("driver", FR_TYPE_STRING, rlm_cache_config_t, driver_name), .dflt = "rlm_cache_rbtree" }, { FR_CONF_OFFSET("key", FR_TYPE_TMPL | FR_TYPE_REQUIRED, rlm_cache_config_t, key) }, - { FR_CONF_OFFSET("ttl", FR_TYPE_INTEGER, rlm_cache_config_t, ttl), .dflt = "500" }, - { FR_CONF_OFFSET("max_entries", FR_TYPE_INTEGER, rlm_cache_config_t, max_entries), .dflt = "0" }, + { FR_CONF_OFFSET("ttl", FR_TYPE_UINT32, rlm_cache_config_t, ttl), .dflt = "500" }, + { FR_CONF_OFFSET("max_entries", FR_TYPE_UINT32, rlm_cache_config_t, max_entries), .dflt = "0" }, /* Should be a type which matches time_t, @fixme before 2038 */ - { FR_CONF_OFFSET("epoch", FR_TYPE_SIGNED, rlm_cache_config_t, epoch), .dflt = "0" }, - { FR_CONF_OFFSET("add_stats", FR_TYPE_BOOLEAN, rlm_cache_config_t, stats), .dflt = "no" }, + { FR_CONF_OFFSET("epoch", FR_TYPE_INT32, rlm_cache_config_t, epoch), .dflt = "0" }, + { FR_CONF_OFFSET("add_stats", FR_TYPE_BOOL, rlm_cache_config_t, stats), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c index 96e3c631f98..04d820ee771 100644 --- a/src/modules/rlm_couchbase/mod.c +++ b/src/modules/rlm_couchbase/mod.c @@ -389,15 +389,15 @@ json_object *mod_value_pair_to_json_object(REQUEST *request, VALUE_PAIR *vp) unsigned int i; switch (vp->vp_type) { - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: i = vp->vp_integer; goto print_int; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: i = vp->vp_short; goto print_int; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: i = vp->vp_byte; print_int: @@ -415,7 +415,7 @@ json_object *mod_value_pair_to_json_object(REQUEST *request, VALUE_PAIR *vp) return json_object_new_int(i); #endif - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: #ifdef HAVE_JSON_OBJECT_NEW_INT64 /* debug */ RDEBUG3("creating new int64 for signed 32 bit integer '%s'", vp->da->name); @@ -427,7 +427,7 @@ json_object *mod_value_pair_to_json_object(REQUEST *request, VALUE_PAIR *vp) return json_object_new_int(vp->vp_signed); #endif - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: #ifdef HAVE_JSON_OBJECT_NEW_INT64 /* debug */ RDEBUG3("creating new int64 for 64 bit integer '%s'", vp->da->name); diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c index 576a3b02aa8..f2fa4fbf613 100644 --- a/src/modules/rlm_couchbase/rlm_couchbase.c +++ b/src/modules/rlm_couchbase/rlm_couchbase.c @@ -57,16 +57,16 @@ static const CONF_PARSER module_config[] = { #ifdef WITH_ACCOUNTING { FR_CONF_OFFSET("acct_key", FR_TYPE_TMPL, rlm_couchbase_t, acct_key), .dflt = "radacct_%{%{Acct-Unique-Session-Id}:-%{Acct-Session-Id}}", .quote = T_DOUBLE_QUOTED_STRING }, { FR_CONF_OFFSET("doctype", FR_TYPE_STRING, rlm_couchbase_t, doctype), .dflt = "radacct" }, - { FR_CONF_OFFSET("expire", FR_TYPE_INTEGER, rlm_couchbase_t, expire), .dflt = 0 }, + { FR_CONF_OFFSET("expire", FR_TYPE_UINT32, rlm_couchbase_t, expire), .dflt = 0 }, #endif { FR_CONF_OFFSET("user_key", FR_TYPE_TMPL, rlm_couchbase_t, user_key), .dflt = "raduser_%{md5:%{tolower:%{%{Stripped-User-Name}:-%{User-Name}}}}", .quote = T_DOUBLE_QUOTED_STRING }, - { FR_CONF_OFFSET("read_clients", FR_TYPE_BOOLEAN, rlm_couchbase_t, read_clients) }, /* NULL defaults to "no" */ + { FR_CONF_OFFSET("read_clients", FR_TYPE_BOOL, rlm_couchbase_t, read_clients) }, /* NULL defaults to "no" */ { FR_CONF_POINTER("client", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) client_config }, #ifdef WITH_SESSION_MGMT - { FR_CONF_OFFSET("check_simul", FR_TYPE_BOOLEAN, rlm_couchbase_t, check_simul) }, /* NULL defaults to "no" */ + { FR_CONF_OFFSET("check_simul", FR_TYPE_BOOL, rlm_couchbase_t, check_simul) }, /* NULL defaults to "no" */ { FR_CONF_OFFSET("simul_view", FR_TYPE_STRING, rlm_couchbase_t, simul_view), .dflt = "_design/acct/_view/by_user" }, { FR_CONF_OFFSET("simul_vkey", FR_TYPE_TMPL, rlm_couchbase_t, simul_vkey), .dflt = "%{tolower:%{%{Stripped-User-Name}:-%{User-Name}}}", .quote = T_DOUBLE_QUOTED_STRING }, - { FR_CONF_OFFSET("verify_simul", FR_TYPE_BOOLEAN, rlm_couchbase_t, verify_simul) }, /* NULL defaults to "no" */ + { FR_CONF_OFFSET("verify_simul", FR_TYPE_BOOL, rlm_couchbase_t, verify_simul) }, /* NULL defaults to "no" */ #endif CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_date/rlm_date.c b/src/modules/rlm_date/rlm_date.c index 83a03385923..7960c0f5310 100644 --- a/src/modules/rlm_date/rlm_date.c +++ b/src/modules/rlm_date/rlm_date.c @@ -63,8 +63,8 @@ static ssize_t xlat_date_convert(UNUSED TALLOC_CTX *ctx, char **out, size_t outl date = vp->vp_date; goto encode; - case FR_TYPE_INTEGER: - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT32: + case FR_TYPE_UINT64: date = (time_t) vp->vp_integer; encode: diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c index 9ed9c534a7e..664a45f4491 100644 --- a/src/modules/rlm_delay/rlm_delay.c +++ b/src/modules/rlm_delay/rlm_delay.c @@ -41,8 +41,8 @@ typedef struct rlm_delay_t { */ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("delay", FR_TYPE_TMPL, rlm_delay_t, delay) }, - { FR_CONF_OFFSET("relative", FR_TYPE_BOOLEAN, rlm_delay_t, relative), .dflt = "no" }, - { FR_CONF_OFFSET("force_reschedule", FR_TYPE_BOOLEAN, rlm_delay_t, force_reschedule), .dflt = "no" }, + { FR_CONF_OFFSET("relative", FR_TYPE_BOOL, rlm_delay_t, relative), .dflt = "no" }, + { FR_CONF_OFFSET("force_reschedule", FR_TYPE_BOOL, rlm_delay_t, force_reschedule), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c index 51318172f6f..3b53d2640a1 100644 --- a/src/modules/rlm_detail/rlm_detail.c +++ b/src/modules/rlm_detail/rlm_detail.c @@ -77,11 +77,11 @@ typedef struct detail_instance { static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_REQUIRED | FR_TYPE_XLAT, rlm_detail_t, filename), .dflt = "%A/%{Client-IP-Address}/detail" }, { FR_CONF_OFFSET("header", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_detail_t, header), .dflt = "%t" }, - { FR_CONF_OFFSET("permissions", FR_TYPE_INTEGER, rlm_detail_t, perm), .dflt = "0600" }, + { FR_CONF_OFFSET("permissions", FR_TYPE_UINT32, rlm_detail_t, perm), .dflt = "0600" }, { FR_CONF_OFFSET("group", FR_TYPE_STRING, rlm_detail_t, group) }, - { FR_CONF_OFFSET("locking", FR_TYPE_BOOLEAN, rlm_detail_t, locking), .dflt = "no" }, - { FR_CONF_OFFSET("escape_filenames", FR_TYPE_BOOLEAN, rlm_detail_t, escape), .dflt = "no" }, - { FR_CONF_OFFSET("log_packet_header", FR_TYPE_BOOLEAN, rlm_detail_t, log_srcdst), .dflt = "no" }, + { FR_CONF_OFFSET("locking", FR_TYPE_BOOL, rlm_detail_t, locking), .dflt = "no" }, + { FR_CONF_OFFSET("escape_filenames", FR_TYPE_BOOL, rlm_detail_t, escape), .dflt = "no" }, + { FR_CONF_OFFSET("log_packet_header", FR_TYPE_BOOL, rlm_detail_t, log_srcdst), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_eap/lib/sim/sim_proto.c b/src/modules/rlm_eap/lib/sim/sim_proto.c index dd6639bb724..08875607044 100644 --- a/src/modules/rlm_eap/lib/sim/sim_proto.c +++ b/src/modules/rlm_eap/lib/sim/sim_proto.c @@ -454,7 +454,7 @@ static ssize_t sim_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_di case FR_TYPE_OCTETS: break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: if (attr_len != 2) goto raw; break; @@ -529,11 +529,11 @@ static ssize_t sim_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_di * | AT_ | Length = 1 | Reserved | * +---------------+---------------+-------------------------------+ */ - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: vp->vp_bool = true; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: vp->vp_short = (p[0] << 8) | p[1]; break; @@ -912,7 +912,7 @@ ssize_t fr_sim_encode(REQUEST *request, fr_dict_attr_t const *parent, uint8_t ty * | AT_ | Length = 1 | Reserved | * +---------------+---------------+-------------------------------+ */ - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: break; /* @@ -927,11 +927,11 @@ ssize_t fr_sim_encode(REQUEST *request, fr_dict_attr_t const *parent, uint8_t ty * | AT_ | Length = 1 | Short 1 | Short 2 | * +---------------+---------------+-------------------------------+ */ - case FR_TYPE_BYTE: //!< 8 Bit unsigned integer. - case FR_TYPE_SHORT: //!< 16 Bit unsigned integer. - case FR_TYPE_INTEGER: //!< 32 Bit unsigned integer. - case FR_TYPE_INTEGER64: //!< 64 Bit unsigned integer. - case FR_TYPE_SIGNED: //!< 32 Bit signed integer. + case FR_TYPE_UINT8: //!< 8 Bit unsigned integer. + case FR_TYPE_UINT16: //!< 16 Bit unsigned integer. + case FR_TYPE_UINT32: //!< 32 Bit unsigned integer. + case FR_TYPE_UINT64: //!< 64 Bit unsigned integer. + case FR_TYPE_INT32: //!< 32 Bit signed integer. { fr_value_box_t data; diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index 499b083dd4a..c17deee472b 100644 --- a/src/modules/rlm_eap/rlm_eap.c +++ b/src/modules/rlm_eap/rlm_eap.c @@ -37,11 +37,11 @@ extern rad_module_t rlm_eap; static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("default_eap_type", FR_TYPE_STRING, rlm_eap_config_t, default_method_name), .dflt = "md5" }, - { FR_CONF_DEPRECATED("timer_expire", FR_TYPE_INTEGER, rlm_eap_config_t, timer_limit), .dflt = "60" }, - { FR_CONF_OFFSET("ignore_unknown_eap_types", FR_TYPE_BOOLEAN, rlm_eap_config_t, ignore_unknown_types), .dflt = "no" }, - { FR_CONF_OFFSET("cisco_accounting_username_bug", FR_TYPE_BOOLEAN, rlm_eap_config_t, + { FR_CONF_DEPRECATED("timer_expire", FR_TYPE_UINT32, rlm_eap_config_t, timer_limit), .dflt = "60" }, + { FR_CONF_OFFSET("ignore_unknown_eap_types", FR_TYPE_BOOL, rlm_eap_config_t, ignore_unknown_types), .dflt = "no" }, + { FR_CONF_OFFSET("cisco_accounting_username_bug", FR_TYPE_BOOL, rlm_eap_config_t, cisco_accounting_username_bug), .dflt = "no" }, - { FR_CONF_DEPRECATED("max_sessions", FR_TYPE_INTEGER, rlm_eap_config_t, max_sessions), .dflt = "2048" }, + { FR_CONF_DEPRECATED("max_sessions", FR_TYPE_UINT32, rlm_eap_config_t, max_sessions), .dflt = "2048" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c index 2a59ecac6e4..73b9ce8b6cb 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c @@ -59,9 +59,9 @@ static CONF_PARSER submodule_config[] = { { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING | FR_TYPE_REQUIRED | FR_TYPE_NOT_EMPTY, rlm_eap_fast_t, virtual_server) }, - { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOLEAN, rlm_eap_fast_t, req_client_cert), .dflt = "no" }, + { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOL, rlm_eap_fast_t, req_client_cert), .dflt = "no" }, - { FR_CONF_OFFSET("pac_lifetime", FR_TYPE_INTEGER, rlm_eap_fast_t, pac_lifetime), .dflt = "604800" }, + { FR_CONF_OFFSET("pac_lifetime", FR_TYPE_UINT32, rlm_eap_fast_t, pac_lifetime), .dflt = "604800" }, { FR_CONF_OFFSET("authority_identity", FR_TYPE_STRING | FR_TYPE_REQUIRED, rlm_eap_fast_t, authority_identity) }, { FR_CONF_OFFSET("pac_opaque_key", FR_TYPE_STRING | FR_TYPE_REQUIRED, rlm_eap_fast_t, pac_opaque_key) }, diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index 29b0f874d52..5a8cca056ea 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -37,9 +37,9 @@ typedef struct rlm_eap_mschapv2_t { } rlm_eap_mschapv2_t; static CONF_PARSER submodule_config[] = { - { FR_CONF_OFFSET("with_ntdomain_hack", FR_TYPE_BOOLEAN, rlm_eap_mschapv2_t, with_ntdomain_hack), .dflt = "no" }, + { FR_CONF_OFFSET("with_ntdomain_hack", FR_TYPE_BOOL, rlm_eap_mschapv2_t, with_ntdomain_hack), .dflt = "no" }, - { FR_CONF_OFFSET("send_error", FR_TYPE_BOOLEAN, rlm_eap_mschapv2_t, send_error), .dflt = "no" }, + { FR_CONF_OFFSET("send_error", FR_TYPE_BOOL, rlm_eap_mschapv2_t, send_error), .dflt = "no" }, { FR_CONF_OFFSET("identity", FR_TYPE_STRING, rlm_eap_mschapv2_t, identity) }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c index 1a04d2486b4..c75b01fa174 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c @@ -54,19 +54,19 @@ static CONF_PARSER submodule_config[] = { { FR_CONF_OFFSET("inner_eap_module", FR_TYPE_STRING, rlm_eap_peap_t, inner_eap_module), }, - { FR_CONF_DEPRECATED("copy_request_to_tunnel", FR_TYPE_BOOLEAN, rlm_eap_peap_t, NULL), .dflt = "no" }, + { FR_CONF_DEPRECATED("copy_request_to_tunnel", FR_TYPE_BOOL, rlm_eap_peap_t, NULL), .dflt = "no" }, - { FR_CONF_DEPRECATED("use_tunneled_reply", FR_TYPE_BOOLEAN, rlm_eap_peap_t, NULL), .dflt = "no" }, + { FR_CONF_DEPRECATED("use_tunneled_reply", FR_TYPE_BOOL, rlm_eap_peap_t, NULL), .dflt = "no" }, #ifdef WITH_PROXY - { FR_CONF_OFFSET("proxy_tunneled_request_as_eap", FR_TYPE_BOOLEAN, rlm_eap_peap_t, proxy_tunneled_request_as_eap), .dflt = "yes" }, + { FR_CONF_OFFSET("proxy_tunneled_request_as_eap", FR_TYPE_BOOL, rlm_eap_peap_t, proxy_tunneled_request_as_eap), .dflt = "yes" }, #endif { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING | FR_TYPE_REQUIRED | FR_TYPE_NOT_EMPTY, rlm_eap_peap_t, virtual_server) }, - { FR_CONF_OFFSET("soh", FR_TYPE_BOOLEAN, rlm_eap_peap_t, soh), .dflt = "no" }, + { FR_CONF_OFFSET("soh", FR_TYPE_BOOL, rlm_eap_peap_t, soh), .dflt = "no" }, - { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOLEAN, rlm_eap_peap_t, req_client_cert), .dflt = "no" }, + { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOL, rlm_eap_peap_t, req_client_cert), .dflt = "no" }, { FR_CONF_OFFSET("soh_virtual_server", FR_TYPE_STRING, rlm_eap_peap_t, soh_virtual_server) }, CONF_PARSER_TERMINATOR diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c index de465b58367..64794414ca9 100644 --- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c +++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c @@ -43,8 +43,8 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #define MSK_EMSK_LEN (2 * MPPE_KEY_LEN) static CONF_PARSER submodule_config[] = { - { FR_CONF_OFFSET("group", FR_TYPE_INTEGER, rlm_eap_pwd_t, group), .dflt = "19" }, - { FR_CONF_OFFSET("fragment_size", FR_TYPE_INTEGER, rlm_eap_pwd_t, fragment_size), .dflt = "1020" }, + { FR_CONF_OFFSET("group", FR_TYPE_UINT32, rlm_eap_pwd_t, group), .dflt = "19" }, + { FR_CONF_OFFSET("fragment_size", FR_TYPE_UINT32, rlm_eap_pwd_t, fragment_size), .dflt = "1020" }, { FR_CONF_OFFSET("server_id", FR_TYPE_STRING | FR_TYPE_REQUIRED, rlm_eap_pwd_t, server_id) }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c index d53809343e5..a60ac79c0db 100644 --- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c +++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c @@ -44,8 +44,8 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ static CONF_PARSER submodule_config[] = { { FR_CONF_OFFSET("tls", FR_TYPE_STRING, rlm_eap_tls_t, tls_conf_name) }, - { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOLEAN, rlm_eap_tls_t, req_client_cert), .dflt = "yes" }, - { FR_CONF_OFFSET("include_length", FR_TYPE_BOOLEAN, rlm_eap_tls_t, include_length), .dflt = "yes" }, + { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOL, rlm_eap_tls_t, req_client_cert), .dflt = "yes" }, + { FR_CONF_OFFSET("include_length", FR_TYPE_BOOL, rlm_eap_tls_t, include_length), .dflt = "yes" }, { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING, rlm_eap_tls_t, virtual_server) }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c index be53d4ef45f..a6f93fe83d6 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c @@ -60,11 +60,11 @@ typedef struct rlm_eap_ttls { static CONF_PARSER submodule_config[] = { { FR_CONF_OFFSET("tls", FR_TYPE_STRING, rlm_eap_ttls_t, tls_conf_name) }, - { FR_CONF_DEPRECATED("copy_request_to_tunnel", FR_TYPE_BOOLEAN, rlm_eap_ttls_t, NULL), .dflt = "no" }, - { FR_CONF_DEPRECATED("use_tunneled_reply", FR_TYPE_BOOLEAN, rlm_eap_ttls_t, NULL), .dflt = "no" }, + { FR_CONF_DEPRECATED("copy_request_to_tunnel", FR_TYPE_BOOL, rlm_eap_ttls_t, NULL), .dflt = "no" }, + { FR_CONF_DEPRECATED("use_tunneled_reply", FR_TYPE_BOOL, rlm_eap_ttls_t, NULL), .dflt = "no" }, { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING | FR_TYPE_REQUIRED | FR_TYPE_NOT_EMPTY, rlm_eap_ttls_t, virtual_server) }, - { FR_CONF_OFFSET("include_length", FR_TYPE_BOOLEAN, rlm_eap_ttls_t, include_length), .dflt = "yes" }, - { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOLEAN, rlm_eap_ttls_t, req_client_cert), .dflt = "no" }, + { FR_CONF_OFFSET("include_length", FR_TYPE_BOOL, rlm_eap_ttls_t, include_length), .dflt = "yes" }, + { FR_CONF_OFFSET("require_client_cert", FR_TYPE_BOOL, rlm_eap_ttls_t, req_client_cert), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c index 38d359a4fa5..4056b65a89c 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c @@ -396,14 +396,14 @@ static int vp2diameter(REQUEST *request, tls_session_t *tls_session, VALUE_PAIR } switch (vp->vp_type) { - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: case FR_TYPE_DATE: attr = htonl(vp->vp_integer); /* stored in host order */ memcpy(p, &attr, sizeof(attr)); length = 4; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: attr64 = htonll(vp->vp_integer64); /* stored in host order */ memcpy(p, &attr64, sizeof(attr64)); length = 8; diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c index 2693c7224ec..d59785bffea 100644 --- a/src/modules/rlm_example/rlm_example.c +++ b/src/modules/rlm_example/rlm_example.c @@ -46,8 +46,8 @@ typedef struct rlm_example_t { * A mapping of configuration file names to internal variables. */ static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("integer", FR_TYPE_INTEGER, rlm_example_t, value), .dflt = "1" }, - { FR_CONF_OFFSET("boolean", FR_TYPE_BOOLEAN, rlm_example_t, boolean), .dflt = "no" }, + { FR_CONF_OFFSET("integer", FR_TYPE_UINT32, rlm_example_t, value), .dflt = "1" }, + { FR_CONF_OFFSET("boolean", FR_TYPE_BOOL, rlm_example_t, boolean), .dflt = "no" }, { FR_CONF_OFFSET("string", FR_TYPE_STRING, rlm_example_t, string) }, { FR_CONF_OFFSET("ipaddr", FR_TYPE_IPV4_ADDR, rlm_example_t, ipaddr), .dflt = "*" }, CONF_PARSER_TERMINATOR diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index e905bc25435..3e7e7bcb949 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -50,13 +50,13 @@ typedef struct rlm_exec_t { } rlm_exec_t; static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("wait", FR_TYPE_BOOLEAN, rlm_exec_t, wait), .dflt = "yes" }, + { FR_CONF_OFFSET("wait", FR_TYPE_BOOL, rlm_exec_t, wait), .dflt = "yes" }, { FR_CONF_OFFSET("program", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_exec_t, program) }, { FR_CONF_OFFSET("input_pairs", FR_TYPE_STRING, rlm_exec_t, input) }, { FR_CONF_OFFSET("output_pairs", FR_TYPE_STRING, rlm_exec_t, output) }, { FR_CONF_OFFSET("packet_type", FR_TYPE_STRING, rlm_exec_t, packet_type) }, - { FR_CONF_OFFSET("shell_escape", FR_TYPE_BOOLEAN, rlm_exec_t, shell_escape), .dflt = "yes" }, - { FR_CONF_OFFSET("timeout", FR_TYPE_INTEGER, rlm_exec_t, timeout) }, + { FR_CONF_OFFSET("shell_escape", FR_TYPE_BOOL, rlm_exec_t, shell_escape), .dflt = "yes" }, + { FR_CONF_OFFSET("timeout", FR_TYPE_UINT32, rlm_exec_t, timeout) }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c index a5903b69c4b..11645ab2c28 100644 --- a/src/modules/rlm_expr/rlm_expr.c +++ b/src/modules/rlm_expr/rlm_expr.c @@ -257,10 +257,10 @@ static bool get_number(REQUEST *request, char const **string, int64_t *answer) i++, vp = tmpl_cursor_next(&cursor, vpt)) { int64_t y; - if (vp->vp_type != FR_TYPE_INTEGER64) { + if (vp->vp_type != FR_TYPE_UINT64) { fr_value_box_t value; - if (fr_value_box_cast(vp, &value, FR_TYPE_INTEGER64, NULL, &vp->data) < 0) { + if (fr_value_box_cast(vp, &value, FR_TYPE_UINT64, NULL, &vp->data) < 0) { REDEBUG("Failed converting &%.*s to an integer value: %s", (int) vpt->len, vpt->name, fr_strerror()); return false; diff --git a/src/modules/rlm_idn/rlm_idn.c b/src/modules/rlm_idn/rlm_idn.c index dc2c5821217..a2356b1aed1 100644 --- a/src/modules/rlm_idn/rlm_idn.c +++ b/src/modules/rlm_idn/rlm_idn.c @@ -82,8 +82,8 @@ static const CONF_PARSER mod_config[] = { * be used. */ - { FR_CONF_OFFSET("allow_unassigned", FR_TYPE_BOOLEAN, rlm_idn_t, allow_unassigned), .dflt = "no" }, - { FR_CONF_OFFSET("use_std3_ascii_rules", FR_TYPE_BOOLEAN, rlm_idn_t, use_std3_ascii_rules), .dflt = "yes" }, + { FR_CONF_OFFSET("allow_unassigned", FR_TYPE_BOOL, rlm_idn_t, allow_unassigned), .dflt = "no" }, + { FR_CONF_OFFSET("use_std3_ascii_rules", FR_TYPE_BOOL, rlm_idn_t, use_std3_ascii_rules), .dflt = "yes" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_json/json.c b/src/modules/rlm_json/json.c index d4533d3080f..f721e8d7c85 100644 --- a/src/modules/rlm_json/json.c +++ b/src/modules/rlm_json/json.c @@ -54,7 +54,7 @@ int fr_json_object_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *out, json_objec break; case json_type_double: - in.type = FR_TYPE_DECIMAL; + in.type = FR_TYPE_FLOAT64; in.datum.decimal = json_object_get_double(object); break; @@ -66,7 +66,7 @@ int fr_json_object_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *out, json_objec int32_t num; #endif #ifndef HAVE_JSON_OBJECT_GET_INT64 - if (dst_type == FR_TYPE_INTEGER64) { + if (dst_type == FR_TYPE_UINT64) { fr_strerror_printf("64bit integers are not supported by linked json-c. " "Upgrade to json-c > 0.10 to use this feature"); return -1; @@ -82,28 +82,28 @@ int fr_json_object_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *out, json_objec return -1; } if (num > UINT32_MAX) { /* 64bit unsigned (supported) */ - in.type = FR_TYPE_INTEGER64; + in.type = FR_TYPE_UINT64; in.datum.integer64 = (uint64_t) num; } else #endif if (num < 0) { /* 32bit signed (supported) */ - in.type = FR_TYPE_SIGNED; + in.type = FR_TYPE_INT32; in.datum.sinteger = num; } else if (num > UINT16_MAX) { /* 32bit unsigned (supported) */ - in.type = FR_TYPE_INTEGER; + in.type = FR_TYPE_UINT32; in.datum.integer = (uint32_t) num; } else if (num > UINT8_MAX) { /* 16bit unsigned (supported) */ - in.type = FR_TYPE_SHORT; + in.type = FR_TYPE_UINT16; in.datum.ushort = (uint16_t) num; } else { /* 8bit unsigned (supported) */ - in.type = FR_TYPE_BYTE; + in.type = FR_TYPE_UINT8; in.datum.byte = (uint8_t) num; } } break; case json_type_boolean: - in.type = FR_TYPE_BOOLEAN; + in.type = FR_TYPE_BOOL; in.datum.boolean = json_object_get_boolean(object); break; @@ -144,23 +144,23 @@ json_object *json_object_from_value_box(TALLOC_CTX *ctx, fr_value_box_t const *d return obj; } - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: return json_object_new_boolean(data->datum.byte); - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: return json_object_new_int(data->datum.byte); - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: return json_object_new_int(data->datum.ushort); - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: return json_object_new_int64((int64_t)data->datum.integer64); /* uint32_t (max) > int32_t (max) */ - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: if (data->datum.integer64 > INT64_MAX) goto do_string; return json_object_new_int64(data->datum.integer64); - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: return json_object_new_int(data->datum.sinteger); } } @@ -214,22 +214,22 @@ size_t fr_json_from_pair(char *out, size_t outlen, VALUE_PAIR const *vp) if (!vp->da->flags.has_tag) { switch (vp->vp_type) { - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: if (vp->da->flags.has_value) break; return snprintf(out, freespace, "%u", vp->vp_integer); - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: if (vp->da->flags.has_value) break; return snprintf(out, freespace, "%u", (unsigned int) vp->vp_short); - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: if (vp->da->flags.has_value) break; return snprintf(out, freespace, "%u", (unsigned int) vp->vp_byte); - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: return snprintf(out, freespace, "%d", vp->vp_signed); default: diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c index 3cccf9423ad..fcad9103e1c 100644 --- a/src/modules/rlm_json/rlm_json.c +++ b/src/modules/rlm_json/rlm_json.c @@ -135,7 +135,7 @@ static int mod_map_proc_instantiate(CONF_SECTION *cs, UNUSED void *mod_inst, voi char const *p; #ifndef HAVE_JSON_OBJECT_GET_INT64 - if ((map->lhs->type == TMPL_TYPE_ATTR) && (map->lhs->tmpl_da->type == FR_TYPE_INTEGER64)) { + if ((map->lhs->type == TMPL_TYPE_ATTR) && (map->lhs->tmpl_da->type == FR_TYPE_UINT64)) { cf_log_err_cp(cp, "64bit integers are not supported by linked json-c. " "Upgrade to json-c >= 0.10 to use this feature"); return -1; diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index e8b8ca9c748..5e10947515d 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -67,7 +67,7 @@ static CONF_PARSER tls_config[] = { /* * LDAP Specific TLS attributes */ - { FR_CONF_OFFSET("start_tls", FR_TYPE_BOOLEAN, fr_ldap_handle_config_t, start_tls), .dflt = "no" }, + { FR_CONF_OFFSET("start_tls", FR_TYPE_BOOL, fr_ldap_handle_config_t, start_tls), .dflt = "no" }, { FR_CONF_OFFSET("require_cert", FR_TYPE_STRING, fr_ldap_handle_config_t, tls_require_cert_str) }, @@ -92,7 +92,7 @@ static CONF_PARSER user_config[] = { { FR_CONF_OFFSET("sort_by", FR_TYPE_STRING, rlm_ldap_t, userobj_sort_by) }, { FR_CONF_OFFSET("access_attribute", FR_TYPE_STRING, rlm_ldap_t, userobj_access_attr) }, - { FR_CONF_OFFSET("access_positive", FR_TYPE_BOOLEAN, rlm_ldap_t, access_positive), .dflt = "yes" }, + { FR_CONF_OFFSET("access_positive", FR_TYPE_BOOL, rlm_ldap_t, access_positive), .dflt = "yes" }, /* Should be deprecated */ { FR_CONF_OFFSET("sasl", FR_TYPE_SUBSECTION, rlm_ldap_t, user_sasl), .subcs = (void const *) sasl_mech_dynamic }, @@ -110,8 +110,8 @@ static CONF_PARSER group_config[] = { { FR_CONF_OFFSET("name_attribute", FR_TYPE_STRING, rlm_ldap_t, groupobj_name_attr), .dflt = "cn" }, { FR_CONF_OFFSET("membership_attribute", FR_TYPE_STRING, rlm_ldap_t, userobj_membership_attr) }, { FR_CONF_OFFSET("membership_filter", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_ldap_t, groupobj_membership_filter) }, - { FR_CONF_OFFSET("cacheable_name", FR_TYPE_BOOLEAN, rlm_ldap_t, cacheable_group_name), .dflt = "no" }, - { FR_CONF_OFFSET("cacheable_dn", FR_TYPE_BOOLEAN, rlm_ldap_t, cacheable_group_dn), .dflt = "no" }, + { FR_CONF_OFFSET("cacheable_name", FR_TYPE_BOOL, rlm_ldap_t, cacheable_group_name), .dflt = "no" }, + { FR_CONF_OFFSET("cacheable_dn", FR_TYPE_BOOL, rlm_ldap_t, cacheable_group_dn), .dflt = "no" }, { FR_CONF_OFFSET("cache_attribute", FR_TYPE_STRING, rlm_ldap_t, cache_attribute) }, { FR_CONF_OFFSET("group_attribute", FR_TYPE_STRING, rlm_ldap_t, group_attribute) }, CONF_PARSER_TERMINATOR @@ -141,31 +141,31 @@ static CONF_PARSER option_config[] = { /* * Pool config items */ - { FR_CONF_OFFSET("chase_referrals", FR_TYPE_BOOLEAN, rlm_ldap_t, handle_config.chase_referrals) }, + { FR_CONF_OFFSET("chase_referrals", FR_TYPE_BOOL, rlm_ldap_t, handle_config.chase_referrals) }, - { FR_CONF_OFFSET("use_referral_credentials", FR_TYPE_BOOLEAN, rlm_ldap_t, handle_config.use_referral_credentials), .dflt = "no" }, + { FR_CONF_OFFSET("use_referral_credentials", FR_TYPE_BOOL, rlm_ldap_t, handle_config.use_referral_credentials), .dflt = "no" }, - { FR_CONF_OFFSET("rebind", FR_TYPE_BOOLEAN, rlm_ldap_t, handle_config.rebind) }, + { FR_CONF_OFFSET("rebind", FR_TYPE_BOOL, rlm_ldap_t, handle_config.rebind) }, #ifdef LDAP_OPT_NETWORK_TIMEOUT /* timeout on network activity */ - { FR_CONF_DEPRECATED("net_timeout", FR_TYPE_INTEGER, rlm_ldap_t, handle_config.net_timeout), .dflt = "10" }, + { FR_CONF_DEPRECATED("net_timeout", FR_TYPE_UINT32, rlm_ldap_t, handle_config.net_timeout), .dflt = "10" }, #endif #ifdef LDAP_OPT_X_KEEPALIVE_IDLE - { FR_CONF_OFFSET("idle", FR_TYPE_INTEGER, rlm_ldap_t, handle_config.keepalive_idle), .dflt = "60" }, + { FR_CONF_OFFSET("idle", FR_TYPE_UINT32, rlm_ldap_t, handle_config.keepalive_idle), .dflt = "60" }, #endif #ifdef LDAP_OPT_X_KEEPALIVE_PROBES - { FR_CONF_OFFSET("probes", FR_TYPE_INTEGER, rlm_ldap_t, handle_config.keepalive_probes), .dflt = "3" }, + { FR_CONF_OFFSET("probes", FR_TYPE_UINT32, rlm_ldap_t, handle_config.keepalive_probes), .dflt = "3" }, #endif #ifdef LDAP_OPT_X_KEEPALIVE_INTERVAL - { FR_CONF_OFFSET("interval", FR_TYPE_INTEGER, rlm_ldap_t, handle_config.keepalive_interval), .dflt = "30" }, + { FR_CONF_OFFSET("interval", FR_TYPE_UINT32, rlm_ldap_t, handle_config.keepalive_interval), .dflt = "30" }, #endif { FR_CONF_OFFSET("dereference", FR_TYPE_STRING, rlm_ldap_t, handle_config.dereference_str) }, /* allow server unlimited time for search (server-side limit) */ - { FR_CONF_OFFSET("srv_timelimit", FR_TYPE_INTEGER, rlm_ldap_t, handle_config.srv_timelimit), .dflt = "20" }, + { FR_CONF_OFFSET("srv_timelimit", FR_TYPE_UINT32, rlm_ldap_t, handle_config.srv_timelimit), .dflt = "20" }, /* * Instance config items @@ -179,7 +179,7 @@ static CONF_PARSER option_config[] = { static const CONF_PARSER global_config[] = { { FR_CONF_OFFSET("random_file", FR_TYPE_FILE_EXISTS, rlm_ldap_t, tls_random_file) }, - { FR_CONF_OFFSET("ldap_debug", FR_TYPE_INTEGER, rlm_ldap_t, ldap_debug), .dflt = "0x0000" }, /* Debugging flags to the server */ + { FR_CONF_OFFSET("ldap_debug", FR_TYPE_UINT32, rlm_ldap_t, ldap_debug), .dflt = "0x0000" }, /* Debugging flags to the server */ CONF_PARSER_TERMINATOR }; @@ -190,7 +190,7 @@ static const CONF_PARSER module_config[] = { */ { FR_CONF_OFFSET("server", FR_TYPE_STRING | FR_TYPE_MULTI, rlm_ldap_t, handle_config.server_str) }, /* Do not set to required */ - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, rlm_ldap_t, handle_config.port) }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, rlm_ldap_t, handle_config.port) }, { FR_CONF_OFFSET("identity", FR_TYPE_STRING, rlm_ldap_t, handle_config.admin_identity) }, { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_SECRET, rlm_ldap_t, handle_config.admin_password) }, @@ -200,21 +200,21 @@ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("valuepair_attribute", FR_TYPE_STRING, rlm_ldap_t, valuepair_attr) }, #ifdef LDAP_CONTROL_X_SESSION_TRACKING - { FR_CONF_OFFSET("session_tracking", FR_TYPE_BOOLEAN, rlm_ldap_t, session_tracking), .dflt = "no" }, + { FR_CONF_OFFSET("session_tracking", FR_TYPE_BOOL, rlm_ldap_t, session_tracking), .dflt = "no" }, #endif #ifdef WITH_EDIR /* support for eDirectory Universal Password */ - { FR_CONF_OFFSET("edir", FR_TYPE_BOOLEAN, rlm_ldap_t, edir) }, /* NULL defaults to "no" */ + { FR_CONF_OFFSET("edir", FR_TYPE_BOOL, rlm_ldap_t, edir) }, /* NULL defaults to "no" */ /* * Attempt to bind with the cleartext password we got from eDirectory * Universal password for additional authorization checks. */ - { FR_CONF_OFFSET("edir_autz", FR_TYPE_BOOLEAN, rlm_ldap_t, edir_autz) }, /* NULL defaults to "no" */ + { FR_CONF_OFFSET("edir_autz", FR_TYPE_BOOL, rlm_ldap_t, edir_autz) }, /* NULL defaults to "no" */ #endif - { FR_CONF_OFFSET("read_clients", FR_TYPE_BOOLEAN, rlm_ldap_t, do_clients) }, /* NULL defaults to "no" */ + { FR_CONF_OFFSET("read_clients", FR_TYPE_BOOL, rlm_ldap_t, do_clients) }, /* NULL defaults to "no" */ { FR_CONF_POINTER("user", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) user_config }, diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c index 9f98ca23dd5..1f60f0f27f6 100644 --- a/src/modules/rlm_linelog/rlm_linelog.c +++ b/src/modules/rlm_linelog/rlm_linelog.c @@ -126,9 +126,9 @@ typedef struct linelog_conn { static const CONF_PARSER file_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_XLAT, linelog_instance_t, file.name) }, - { FR_CONF_OFFSET("permissions", FR_TYPE_INTEGER, linelog_instance_t, file.permissions), .dflt = "0600" }, + { FR_CONF_OFFSET("permissions", FR_TYPE_UINT32, linelog_instance_t, file.permissions), .dflt = "0600" }, { FR_CONF_OFFSET("group", FR_TYPE_STRING, linelog_instance_t, file.group_str) }, - { FR_CONF_OFFSET("escape_filenames", FR_TYPE_BOOLEAN, linelog_instance_t, file.escape), .dflt = "no" }, + { FR_CONF_OFFSET("escape_filenames", FR_TYPE_BOOL, linelog_instance_t, file.escape), .dflt = "no" }, CONF_PARSER_TERMINATOR }; @@ -145,14 +145,14 @@ static const CONF_PARSER unix_config[] = { static const CONF_PARSER udp_config[] = { { FR_CONF_OFFSET("server", FR_TYPE_COMBO_IP_ADDR, linelog_net_t, dst_ipaddr) }, - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, linelog_net_t, port) }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, linelog_net_t, port) }, { FR_CONF_OFFSET("timeout", FR_TYPE_TIMEVAL, linelog_net_t, timeout), .dflt = "1000" }, CONF_PARSER_TERMINATOR }; static const CONF_PARSER tcp_config[] = { { FR_CONF_OFFSET("server", FR_TYPE_COMBO_IP_ADDR, linelog_net_t, dst_ipaddr) }, - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, linelog_net_t, port) }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, linelog_net_t, port) }, { FR_CONF_OFFSET("timeout", FR_TYPE_TIMEVAL, linelog_net_t, timeout), .dflt = "1000" }, CONF_PARSER_TERMINATOR }; @@ -177,7 +177,7 @@ static const CONF_PARSER module_config[] = { * Deprecated config items */ { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_DEPRECATED, linelog_instance_t, file.name) }, - { FR_CONF_OFFSET("permissions", FR_TYPE_INTEGER | FR_TYPE_DEPRECATED, linelog_instance_t, file.permissions) }, + { FR_CONF_OFFSET("permissions", FR_TYPE_UINT32 | FR_TYPE_DEPRECATED, linelog_instance_t, file.permissions) }, { FR_CONF_OFFSET("group", FR_TYPE_STRING | FR_TYPE_DEPRECATED, linelog_instance_t, file.group_str) }, { FR_CONF_OFFSET("syslog_facility", FR_TYPE_STRING | FR_TYPE_DEPRECATED, linelog_instance_t, syslog.facility) }, diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c index 76e8dd89d3b..6ae8d2413e7 100644 --- a/src/modules/rlm_logintime/rlm_logintime.c +++ b/src/modules/rlm_logintime/rlm_logintime.c @@ -44,7 +44,7 @@ typedef struct rlm_logintime_t { } rlm_logintime_t; static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("minimum_timeout", FR_TYPE_INTEGER, rlm_logintime_t, min_time), .dflt = "60" }, + { FR_CONF_OFFSET("minimum_timeout", FR_TYPE_UINT32, rlm_logintime_t, min_time), .dflt = "60" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c index d4bc2b2c7f0..332b5822535 100644 --- a/src/modules/rlm_lua/lua.c +++ b/src/modules/rlm_lua/lua.c @@ -62,7 +62,7 @@ static int rlm_lua_marshall(lua_State *L, VALUE_PAIR const *vp) case FR_TYPE_IPV6_PREFIX: case FR_TYPE_IFID: case FR_TYPE_TLV: - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: fr_pair_value_snprint(buffer, sizeof(buffer), vp, '\0'); lua_pushstring(L, buffer); break; @@ -75,10 +75,10 @@ static int rlm_lua_marshall(lua_State *L, VALUE_PAIR const *vp) lua_pushlstring(L, (char const *)vp->vp_octets, vp->vp_length); /* lstring variant is embedded NULL safe */ break; - case FR_TYPE_BYTE: - case FR_TYPE_SHORT: - case FR_TYPE_INTEGER: - case FR_TYPE_SIGNED: + case FR_TYPE_UINT8: + case FR_TYPE_UINT16: + case FR_TYPE_UINT32: + case FR_TYPE_INT32: lua_pushinteger(L, vp->vp_integer); break; @@ -116,7 +116,7 @@ static int rlm_lua_unmarshall(VALUE_PAIR **out, REQUEST *request, lua_State *L, break; } - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: vp->vp_integer = (uint32_t) lua_tointeger(L, -1); break; @@ -136,19 +136,19 @@ static int rlm_lua_unmarshall(VALUE_PAIR **out, REQUEST *request, lua_State *L, } break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: vp->vp_byte = (uint8_t) lua_tointeger(L, -1); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: vp->vp_short = (uint16_t) lua_tointeger(L, -1); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: vp->vp_signed = (int32_t) lua_tointeger(L, -1); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: vp->vp_integer64 = (uint64_t) lua_tointeger(L, -1); break; diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c index 471aa32f080..f2f20009b7f 100644 --- a/src/modules/rlm_lua/rlm_lua.c +++ b/src/modules/rlm_lua/rlm_lua.c @@ -42,7 +42,7 @@ RCSID("$Id$") */ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_INPUT | FR_TYPE_REQUIRED, rlm_lua_t, module), NULL}, - { FR_CONF_OFFSET("threads", FR_TYPE_BOOLEAN, rlm_lua_t, threads), .dflt = "no"}, + { FR_CONF_OFFSET("threads", FR_TYPE_BOOL, rlm_lua_t, threads), .dflt = "no"}, { FR_CONF_OFFSET("func_instantiate", FR_TYPE_STRING, rlm_lua_t, func_instantiate), NULL}, { FR_CONF_OFFSET("func_detach", FR_TYPE_STRING, rlm_lua_t, func_detach), NULL}, { FR_CONF_OFFSET("func_authorize", FR_TYPE_STRING, rlm_lua_t, func_authorize), NULL}, diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c index 84ca73b9c36..42d1388beb2 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -552,22 +552,22 @@ static const CONF_PARSER module_config[] = { /* * Cache the password by default. */ - { FR_CONF_OFFSET("use_mppe", FR_TYPE_BOOLEAN, rlm_mschap_t, use_mppe), .dflt = "yes" }, - { FR_CONF_OFFSET("require_encryption", FR_TYPE_BOOLEAN, rlm_mschap_t, require_encryption), .dflt = "no" }, - { FR_CONF_OFFSET("require_strong", FR_TYPE_BOOLEAN, rlm_mschap_t, require_strong), .dflt = "no" }, - { FR_CONF_OFFSET("with_ntdomain_hack", FR_TYPE_BOOLEAN, rlm_mschap_t, with_ntdomain_hack), .dflt = "yes" }, + { FR_CONF_OFFSET("use_mppe", FR_TYPE_BOOL, rlm_mschap_t, use_mppe), .dflt = "yes" }, + { FR_CONF_OFFSET("require_encryption", FR_TYPE_BOOL, rlm_mschap_t, require_encryption), .dflt = "no" }, + { FR_CONF_OFFSET("require_strong", FR_TYPE_BOOL, rlm_mschap_t, require_strong), .dflt = "no" }, + { FR_CONF_OFFSET("with_ntdomain_hack", FR_TYPE_BOOL, rlm_mschap_t, with_ntdomain_hack), .dflt = "yes" }, { FR_CONF_OFFSET("ntlm_auth", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_mschap_t, ntlm_auth) }, - { FR_CONF_OFFSET("ntlm_auth_timeout", FR_TYPE_INTEGER, rlm_mschap_t, ntlm_auth_timeout) }, + { FR_CONF_OFFSET("ntlm_auth_timeout", FR_TYPE_UINT32, rlm_mschap_t, ntlm_auth_timeout) }, { FR_CONF_POINTER("passchange", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) passchange_config }, - { FR_CONF_OFFSET("allow_retry", FR_TYPE_BOOLEAN, rlm_mschap_t, allow_retry), .dflt = "yes" }, + { FR_CONF_OFFSET("allow_retry", FR_TYPE_BOOL, rlm_mschap_t, allow_retry), .dflt = "yes" }, { FR_CONF_OFFSET("retry_msg", FR_TYPE_STRING, rlm_mschap_t, retry_msg) }, { FR_CONF_OFFSET("winbind_username", FR_TYPE_TMPL, rlm_mschap_t, wb_username) }, { FR_CONF_OFFSET("winbind_domain", FR_TYPE_TMPL, rlm_mschap_t, wb_domain) }, #ifdef WITH_AUTH_WINBIND - { FR_CONF_OFFSET("winbind_retry_with_normalised_username", FR_TYPE_BOOLEAN, rlm_mschap_t, wb_retry_with_normalised_username), .dflt = "no" }, + { FR_CONF_OFFSET("winbind_retry_with_normalised_username", FR_TYPE_BOOL, rlm_mschap_t, wb_retry_with_normalised_username), .dflt = "no" }, #endif #ifdef __APPLE__ - { FR_CONF_OFFSET("use_open_directory", FR_TYPE_BOOLEAN, rlm_mschap_t, open_directory), .dflt = "yes" }, + { FR_CONF_OFFSET("use_open_directory", FR_TYPE_BOOL, rlm_mschap_t, open_directory), .dflt = "yes" }, #endif CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index d0d5c2254db..b8aa9cb196b 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -54,7 +54,7 @@ typedef struct rlm_pap_t { } rlm_pap_t; static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("normalise", FR_TYPE_BOOLEAN, rlm_pap_t, normify), .dflt = "yes" }, + { FR_CONF_OFFSET("normalise", FR_TYPE_BOOL, rlm_pap_t, normify), .dflt = "yes" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c index 0cab650ef0c..12722dbb616 100644 --- a/src/modules/rlm_passwd/rlm_passwd.c +++ b/src/modules/rlm_passwd/rlm_passwd.c @@ -368,13 +368,13 @@ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("format", FR_TYPE_STRING | FR_TYPE_REQUIRED, rlm_passwd_t, format) }, { FR_CONF_OFFSET("delimiter", FR_TYPE_STRING, rlm_passwd_t, delimiter), .dflt = ":" }, - { FR_CONF_OFFSET("ignore_nislike", FR_TYPE_BOOLEAN, rlm_passwd_t, ignore_nislike), .dflt = "yes" }, + { FR_CONF_OFFSET("ignore_nislike", FR_TYPE_BOOL, rlm_passwd_t, ignore_nislike), .dflt = "yes" }, - { FR_CONF_OFFSET("ignore_empty", FR_TYPE_BOOLEAN, rlm_passwd_t, ignore_empty), .dflt = "yes" }, + { FR_CONF_OFFSET("ignore_empty", FR_TYPE_BOOL, rlm_passwd_t, ignore_empty), .dflt = "yes" }, - { FR_CONF_OFFSET("allow_multiple_keys", FR_TYPE_BOOLEAN, rlm_passwd_t, allow_multiple), .dflt = "no" }, + { FR_CONF_OFFSET("allow_multiple_keys", FR_TYPE_BOOL, rlm_passwd_t, allow_multiple), .dflt = "no" }, - { FR_CONF_OFFSET("hash_size", FR_TYPE_INTEGER, rlm_passwd_t, hash_size), .dflt = "100" }, + { FR_CONF_OFFSET("hash_size", FR_TYPE_UINT32, rlm_passwd_t, hash_size), .dflt = "100" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c index ac29a5690f3..b78cd175550 100644 --- a/src/modules/rlm_preprocess/rlm_preprocess.c +++ b/src/modules/rlm_preprocess/rlm_preprocess.c @@ -48,13 +48,13 @@ typedef struct rlm_preprocess_t { static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("huntgroups", FR_TYPE_FILE_INPUT, rlm_preprocess_t, huntgroup_file) }, { FR_CONF_OFFSET("hints", FR_TYPE_FILE_INPUT, rlm_preprocess_t, hints_file) }, - { FR_CONF_OFFSET("with_ascend_hack", FR_TYPE_BOOLEAN, rlm_preprocess_t, with_ascend_hack), .dflt = "no" }, - { FR_CONF_OFFSET("ascend_channels_per_line", FR_TYPE_INTEGER, rlm_preprocess_t, ascend_channels_per_line), .dflt = "23" }, + { FR_CONF_OFFSET("with_ascend_hack", FR_TYPE_BOOL, rlm_preprocess_t, with_ascend_hack), .dflt = "no" }, + { FR_CONF_OFFSET("ascend_channels_per_line", FR_TYPE_UINT32, rlm_preprocess_t, ascend_channels_per_line), .dflt = "23" }, - { FR_CONF_OFFSET("with_ntdomain_hack", FR_TYPE_BOOLEAN, rlm_preprocess_t, with_ntdomain_hack), .dflt = "no" }, - { FR_CONF_OFFSET("with_specialix_jetstream_hack", FR_TYPE_BOOLEAN, rlm_preprocess_t, with_specialix_jetstream_hack), .dflt = "no" }, - { FR_CONF_OFFSET("with_cisco_vsa_hack", FR_TYPE_BOOLEAN, rlm_preprocess_t, with_cisco_vsa_hack), .dflt = "no" }, - { FR_CONF_OFFSET("with_alvarion_vsa_hack", FR_TYPE_BOOLEAN, rlm_preprocess_t, with_alvarion_vsa_hack), .dflt = "no" }, + { FR_CONF_OFFSET("with_ntdomain_hack", FR_TYPE_BOOL, rlm_preprocess_t, with_ntdomain_hack), .dflt = "no" }, + { FR_CONF_OFFSET("with_specialix_jetstream_hack", FR_TYPE_BOOL, rlm_preprocess_t, with_specialix_jetstream_hack), .dflt = "no" }, + { FR_CONF_OFFSET("with_cisco_vsa_hack", FR_TYPE_BOOL, rlm_preprocess_t, with_cisco_vsa_hack), .dflt = "no" }, + { FR_CONF_OFFSET("with_alvarion_vsa_hack", FR_TYPE_BOOL, rlm_preprocess_t, with_alvarion_vsa_hack), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c index f80c7c582d7..4b94620e158 100644 --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -121,7 +121,7 @@ static CONF_PARSER module_config[] = { #undef A { FR_CONF_OFFSET("python_path", FR_TYPE_STRING, rlm_python_t, python_path) }, - { FR_CONF_OFFSET("cext_compat", FR_TYPE_BOOLEAN, rlm_python_t, cext_compat), .dflt = false }, + { FR_CONF_OFFSET("cext_compat", FR_TYPE_BOOL, rlm_python_t, cext_compat), .dflt = false }, CONF_PARSER_TERMINATOR }; @@ -365,23 +365,23 @@ static int mod_populate_vptuple(PyObject *pp, VALUE_PAIR *vp) value = PyString_FromStringAndSize((char const *)vp->vp_octets, vp->vp_length); break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: value = PyLong_FromUnsignedLong(vp->vp_integer); break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: value = PyLong_FromUnsignedLong(vp->vp_byte); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: value = PyLong_FromUnsignedLong(vp->vp_short); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: value = PyLong_FromLong(vp->vp_signed); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: value = PyLong_FromUnsignedLongLong(vp->vp_integer64); break; @@ -389,11 +389,11 @@ static int mod_populate_vptuple(PyObject *pp, VALUE_PAIR *vp) value = PyLong_FromUnsignedLongLong((unsigned long long)vp->vp_size); break; - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: value = PyFloat_FromDouble(vp->vp_decimal); break; - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: value = PyBool_FromLong(vp->vp_bool); break; diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c index 1c17ad237d6..3c4edeecfef 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp.c +++ b/src/modules/rlm_radutmp/rlm_radutmp.c @@ -60,10 +60,10 @@ typedef struct rlm_radutmp_t { static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_REQUIRED, rlm_radutmp_t, filename), .dflt = RADUTMP }, { FR_CONF_OFFSET("username", FR_TYPE_STRING | FR_TYPE_REQUIRED | FR_TYPE_XLAT, rlm_radutmp_t, username), .dflt = "%{User-Name}" }, - { FR_CONF_OFFSET("case_sensitive", FR_TYPE_BOOLEAN, rlm_radutmp_t, case_sensitive), .dflt = "yes" }, - { FR_CONF_OFFSET("check_with_nas", FR_TYPE_BOOLEAN, rlm_radutmp_t, check_nas), .dflt = "yes" }, - { FR_CONF_OFFSET("permissions", FR_TYPE_INTEGER, rlm_radutmp_t, permission), .dflt = "0644" }, - { FR_CONF_OFFSET("caller_id", FR_TYPE_BOOLEAN, rlm_radutmp_t, caller_id_ok), .dflt = "no" }, + { FR_CONF_OFFSET("case_sensitive", FR_TYPE_BOOL, rlm_radutmp_t, case_sensitive), .dflt = "yes" }, + { FR_CONF_OFFSET("check_with_nas", FR_TYPE_BOOL, rlm_radutmp_t, check_nas), .dflt = "yes" }, + { FR_CONF_OFFSET("permissions", FR_TYPE_UINT32, rlm_radutmp_t, permission), .dflt = "0644" }, + { FR_CONF_OFFSET("caller_id", FR_TYPE_BOOL, rlm_radutmp_t, caller_id_ok), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_realm/rlm_realm.c b/src/modules/rlm_realm/rlm_realm.c index bec20bf211c..457e9f82bac 100644 --- a/src/modules/rlm_realm/rlm_realm.c +++ b/src/modules/rlm_realm/rlm_realm.c @@ -49,14 +49,14 @@ typedef struct rlm_realm_t { static CONF_PARSER module_config[] = { { FR_CONF_OFFSET("format", FR_TYPE_STRING, rlm_realm_t, format_string), .dflt = "suffix" }, { FR_CONF_OFFSET("delimiter", FR_TYPE_STRING, rlm_realm_t, delim), .dflt = "@" }, - { FR_CONF_OFFSET("ignore_default", FR_TYPE_BOOLEAN, rlm_realm_t, ignore_default), .dflt = "no" }, - { FR_CONF_OFFSET("ignore_null", FR_TYPE_BOOLEAN, rlm_realm_t, ignore_null), .dflt = "no" }, + { FR_CONF_OFFSET("ignore_default", FR_TYPE_BOOL, rlm_realm_t, ignore_default), .dflt = "no" }, + { FR_CONF_OFFSET("ignore_null", FR_TYPE_BOOL, rlm_realm_t, ignore_null), .dflt = "no" }, #ifdef HAVE_TRUST_ROUTER_TR_DH_H { FR_CONF_OFFSET("default_community", FR_TYPE_STRING, rlm_realm_t, default_community) }, { FR_CONF_OFFSET("rp_realm", FR_TYPE_STRING, rlm_realm_t, rp_realm) }, { FR_CONF_OFFSET("trust_router", FR_TYPE_STRING, rlm_realm_t, trust_router) }, - { FR_CONF_OFFSET("tr_port", FR_TYPE_INTEGER, rlm_realm_t, tr_port), .dflt = "0" }, + { FR_CONF_OFFSET("tr_port", FR_TYPE_UINT32, rlm_realm_t, tr_port), .dflt = "0" }, #endif CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_redis/redis.c b/src/modules/rlm_redis/redis.c index 6ad716a4a7d..4560e87f304 100644 --- a/src/modules/rlm_redis/redis.c +++ b/src/modules/rlm_redis/redis.c @@ -172,7 +172,7 @@ void fr_redis_reply_print(log_lvl_t lvl, redisReply *reply, REQUEST *request, in * * Will work with REDIS_REPLY_STRING (which is converted to #FR_TYPE_STRING * then cast to dst_type), or REDIS_REPLY_INTEGER (which is converted to - * #FR_TYPE_INTEGER64, then cast to dst_type). + * #FR_TYPE_UINT64, then cast to dst_type). * * @note Any unsupported types will trigger an assert. You must check the * reply type prior to calling this function. @@ -210,23 +210,23 @@ int fr_redis_reply_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *out, redisReply return -1; } if (reply->integer < 0) { /* 32bit signed (supported) */ - in.type = FR_TYPE_SIGNED; + in.type = FR_TYPE_INT32; in.datum.sinteger = (int32_t) reply->integer; } else if (reply->integer > UINT32_MAX) { /* 64bit unsigned (supported) */ - in.type = FR_TYPE_INTEGER64; + in.type = FR_TYPE_UINT64; in.datum.integer64 = (uint64_t) reply->integer; } else if (reply->integer > UINT16_MAX) { /* 32bit unsigned (supported) */ - in.type = FR_TYPE_INTEGER; + in.type = FR_TYPE_UINT32; in.datum.integer = (uint32_t) reply->integer; } else if (reply->integer > UINT8_MAX) { /* 16bit unsigned (supported) */ - in.type = FR_TYPE_SHORT; + in.type = FR_TYPE_UINT16; in.datum.ushort = (uint16_t) reply->integer; } else { /* 8bit unsigned (supported) */ - in.type = FR_TYPE_BYTE; + in.type = FR_TYPE_UINT8; in.datum.byte = (uint8_t) reply->integer; } break; diff --git a/src/modules/rlm_redis/redis.h b/src/modules/rlm_redis/redis.h index adefc679513..ad9930fe754 100644 --- a/src/modules/rlm_redis/redis.h +++ b/src/modules/rlm_redis/redis.h @@ -103,12 +103,12 @@ typedef struct redis_common_conf { #define REDIS_COMMON_CONFIG \ { FR_CONF_OFFSET("server", FR_TYPE_STRING | FR_TYPE_REQUIRED | FR_TYPE_MULTI, fr_redis_conf_t, hostname) }, \ - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, fr_redis_conf_t, port), .dflt = "6379" }, \ - { FR_CONF_OFFSET("database", FR_TYPE_INTEGER, fr_redis_conf_t, database), .dflt = "0" }, \ + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, fr_redis_conf_t, port), .dflt = "6379" }, \ + { FR_CONF_OFFSET("database", FR_TYPE_UINT32, fr_redis_conf_t, database), .dflt = "0" }, \ { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_SECRET, fr_redis_conf_t, password) }, \ - { FR_CONF_OFFSET("max_nodes", FR_TYPE_BYTE, fr_redis_conf_t, max_nodes), .dflt = "20" }, \ - { FR_CONF_OFFSET("max_alt", FR_TYPE_INTEGER, fr_redis_conf_t, max_alt), .dflt = "3" }, \ - { FR_CONF_OFFSET("max_redirects", FR_TYPE_INTEGER, fr_redis_conf_t, max_redirects), .dflt = "2" } + { FR_CONF_OFFSET("max_nodes", FR_TYPE_UINT8, fr_redis_conf_t, max_nodes), .dflt = "20" }, \ + { FR_CONF_OFFSET("max_alt", FR_TYPE_UINT32, fr_redis_conf_t, max_alt), .dflt = "3" }, \ + { FR_CONF_OFFSET("max_redirects", FR_TYPE_UINT32, fr_redis_conf_t, max_redirects), .dflt = "2" } void fr_redis_version_print(void); diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c index cc2b5b21a67..a8ca47d1740 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c @@ -110,7 +110,7 @@ static CONF_PARSER module_config[] = { { FR_CONF_OFFSET("offer_time", FR_TYPE_TMPL, rlm_redis_ippool_t, offer_time) }, { FR_CONF_OFFSET("lease_time", FR_TYPE_TMPL | FR_TYPE_REQUIRED, rlm_redis_ippool_t, lease_time) }, - { FR_CONF_OFFSET("wait_num", FR_TYPE_INTEGER, rlm_redis_ippool_t, wait_num) }, + { FR_CONF_OFFSET("wait_num", FR_TYPE_UINT32, rlm_redis_ippool_t, wait_num) }, { FR_CONF_OFFSET("wait_timeout", FR_TYPE_TIMEVAL, rlm_redis_ippool_t, wait_timeout) }, { FR_CONF_OFFSET("requested_address", FR_TYPE_TMPL | FR_TYPE_REQUIRED, rlm_redis_ippool_t, requested_address), .dflt = "%{%{DHCP-Requested-IP-Address}:-%{DHCP-Client-IP-Address}}", .quote = T_DOUBLE_QUOTED_STRING }, @@ -122,8 +122,8 @@ static CONF_PARSER module_config[] = { { FR_CONF_OFFSET("range_attr", FR_TYPE_TMPL | FR_TYPE_ATTRIBUTE | FR_TYPE_REQUIRED, rlm_redis_ippool_t, range_attr), .dflt = "&reply:Pool-Range", .quote = T_BARE_WORD }, { FR_CONF_OFFSET("expiry_attr", FR_TYPE_TMPL | FR_TYPE_ATTRIBUTE, rlm_redis_ippool_t, expiry_attr) }, - { FR_CONF_OFFSET("ipv4_integer", FR_TYPE_BOOLEAN, rlm_redis_ippool_t, ipv4_integer) }, - { FR_CONF_OFFSET("copy_on_update", FR_TYPE_BOOLEAN, rlm_redis_ippool_t, copy_on_update), .dflt = "yes", .quote = T_BARE_WORD }, + { FR_CONF_OFFSET("ipv4_integer", FR_TYPE_BOOL, rlm_redis_ippool_t, ipv4_integer) }, + { FR_CONF_OFFSET("copy_on_update", FR_TYPE_BOOL, rlm_redis_ippool_t, copy_on_update), .dflt = "yes", .quote = T_BARE_WORD }, /* * Split out to allow conversion to universal ippool module with @@ -642,7 +642,7 @@ static ippool_rcode_t redis_ippool_allocate(rlm_redis_ippool_t const *inst, REQU memset(&tmp, 0, sizeof(tmp)); tmp.datum.integer = ntohl((uint32_t)reply->element[1]->integer); - tmp.type = FR_TYPE_INTEGER; + tmp.type = FR_TYPE_UINT32; if (fr_value_box_cast(NULL, &ip_map.rhs->tmpl_value_box, FR_TYPE_IPV4_ADDR, NULL, &tmp)) { @@ -652,7 +652,7 @@ static ippool_rcode_t redis_ippool_allocate(rlm_redis_ippool_t const *inst, REQU } } else { ip_map.rhs->tmpl_fr_value_box_datum.integer = ntohl((uint32_t)reply->element[1]->integer); - ip_map.rhs->tmpl_fr_value_box_type = FR_TYPE_INTEGER; + ip_map.rhs->tmpl_fr_value_box_type = FR_TYPE_UINT32; } } goto do_ip_map; @@ -744,7 +744,7 @@ static ippool_rcode_t redis_ippool_allocate(rlm_redis_ippool_t const *inst, REQU } expiry_map.rhs->tmpl_fr_value_box_datum.integer = reply->element[3]->integer; - expiry_map.rhs->tmpl_fr_value_box_type = FR_TYPE_INTEGER; + expiry_map.rhs->tmpl_fr_value_box_type = FR_TYPE_UINT32; if (map_to_request(request, &expiry_map, map_to_vp, NULL) < 0) { ret = IPPOOL_RCODE_FAIL; goto finish; @@ -886,7 +886,7 @@ static ippool_rcode_t redis_ippool_update(rlm_redis_ippool_t const *inst, REQUES }; expiry_map.rhs->tmpl_fr_value_box_datum.integer = expires; - expiry_map.rhs->tmpl_fr_value_box_type = FR_TYPE_INTEGER; + expiry_map.rhs->tmpl_fr_value_box_type = FR_TYPE_UINT32; if (map_to_request(request, &expiry_map, map_to_vp, NULL) < 0) { ret = IPPOOL_RCODE_FAIL; goto finish; diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c index d736b4a8963..43fdd23ede8 100644 --- a/src/modules/rlm_rediswho/rlm_rediswho.c +++ b/src/modules/rlm_rediswho/rlm_rediswho.c @@ -63,7 +63,7 @@ static CONF_PARSER section_config[] = { static CONF_PARSER module_config[] = { REDIS_COMMON_CONFIG, - { FR_CONF_OFFSET("trim_count", FR_TYPE_SIGNED, rlm_rediswho_t, trim_count), .dflt = "-1" }, + { FR_CONF_OFFSET("trim_count", FR_TYPE_INT32, rlm_rediswho_t, trim_count), .dflt = "-1" }, /* * These all smash the same variables, because we don't care about them right now. diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c index ac8e92c2286..1393d1c5680 100644 --- a/src/modules/rlm_rest/rest.c +++ b/src/modules/rlm_rest/rest.c @@ -920,13 +920,13 @@ static VALUE_PAIR *json_pair_make_leaf(UNUSED rlm_rest_t const *instance, UNUSED case json_type_int: if (flags->do_xlat) RWDEBUG("Ignoring do_xlat on 'int', attribute \"%s\"", da->name); src.datum.sinteger = json_object_get_int(leaf); - src.type = FR_TYPE_SIGNED; + src.type = FR_TYPE_INT32; break; case json_type_double: if (flags->do_xlat) RWDEBUG("Ignoring do_xlat on 'double', attribute \"%s\"", da->name); src.datum.decimal = json_object_get_double(leaf); - src.type = FR_TYPE_DECIMAL; + src.type = FR_TYPE_FLOAT64; break; case json_type_string: diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c index 51e5f430384..7d7e3bbf4e6 100644 --- a/src/modules/rlm_rest/rlm_rest.c +++ b/src/modules/rlm_rest/rlm_rest.c @@ -41,9 +41,9 @@ static CONF_PARSER tls_config[] = { { FR_CONF_OFFSET("private_key_file", FR_TYPE_FILE_INPUT, rlm_rest_section_t, tls_private_key_file) }, { FR_CONF_OFFSET("private_key_password", FR_TYPE_STRING | FR_TYPE_SECRET, rlm_rest_section_t, tls_private_key_password) }, { FR_CONF_OFFSET("random_file", FR_TYPE_STRING, rlm_rest_section_t, tls_random_file) }, - { FR_CONF_OFFSET("check_cert", FR_TYPE_BOOLEAN, rlm_rest_section_t, tls_check_cert), .dflt = "yes" }, - { FR_CONF_OFFSET("check_cert_cn", FR_TYPE_BOOLEAN, rlm_rest_section_t, tls_check_cert_cn), .dflt = "yes" }, - { FR_CONF_OFFSET("extract_cert_attrs", FR_TYPE_BOOLEAN, rlm_rest_section_t, tls_extract_cert_attrs), .dflt = "no" }, + { FR_CONF_OFFSET("check_cert", FR_TYPE_BOOL, rlm_rest_section_t, tls_check_cert), .dflt = "yes" }, + { FR_CONF_OFFSET("check_cert_cn", FR_TYPE_BOOL, rlm_rest_section_t, tls_check_cert_cn), .dflt = "yes" }, + { FR_CONF_OFFSET("extract_cert_attrs", FR_TYPE_BOOL, rlm_rest_section_t, tls_extract_cert_attrs), .dflt = "no" }, CONF_PARSER_TERMINATOR }; @@ -59,11 +59,11 @@ static const CONF_PARSER section_config[] = { { FR_CONF_OFFSET("auth", FR_TYPE_STRING, rlm_rest_section_t, auth_str), .dflt = "none" }, { FR_CONF_OFFSET("username", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_rest_section_t, username) }, { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_rest_section_t, password) }, - { FR_CONF_OFFSET("require_auth", FR_TYPE_BOOLEAN, rlm_rest_section_t, require_auth), .dflt = "no" }, + { FR_CONF_OFFSET("require_auth", FR_TYPE_BOOL, rlm_rest_section_t, require_auth), .dflt = "no" }, /* Transfer configuration */ { FR_CONF_OFFSET("timeout", FR_TYPE_TIMEVAL, rlm_rest_section_t, timeout_tv), .dflt = "4.0" }, - { FR_CONF_OFFSET("chunk", FR_TYPE_INTEGER, rlm_rest_section_t, chunk), .dflt = "0" }, + { FR_CONF_OFFSET("chunk", FR_TYPE_UINT32, rlm_rest_section_t, chunk), .dflt = "0" }, /* TLS Parameters */ { FR_CONF_POINTER("tls", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) tls_config }, @@ -77,11 +77,11 @@ static const CONF_PARSER xlat_config[] = { { FR_CONF_OFFSET("auth", FR_TYPE_STRING, rlm_rest_section_t, auth_str), .dflt = "none" }, { FR_CONF_OFFSET("username", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_rest_section_t, username) }, { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_rest_section_t, password) }, - { FR_CONF_OFFSET("require_auth", FR_TYPE_BOOLEAN, rlm_rest_section_t, require_auth), .dflt = "no" }, + { FR_CONF_OFFSET("require_auth", FR_TYPE_BOOL, rlm_rest_section_t, require_auth), .dflt = "no" }, /* Transfer configuration */ { FR_CONF_OFFSET("timeout", FR_TYPE_TIMEVAL, rlm_rest_section_t, timeout_tv), .dflt = "4.0" }, - { FR_CONF_OFFSET("chunk", FR_TYPE_INTEGER, rlm_rest_section_t, chunk), .dflt = "0" }, + { FR_CONF_OFFSET("chunk", FR_TYPE_UINT32, rlm_rest_section_t, chunk), .dflt = "0" }, /* TLS Parameters */ { FR_CONF_POINTER("tls", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) tls_config }, diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c index e6d2078b0db..5f38632a3a6 100644 --- a/src/modules/rlm_securid/rlm_securid.c +++ b/src/modules/rlm_securid/rlm_securid.c @@ -42,10 +42,10 @@ typedef enum { static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("timer_expire", FR_TYPE_INTEGER, rlm_securid_t, timer_limit), .dflt = "600" }, - { FR_CONF_OFFSET("max_sessions", FR_TYPE_INTEGER, rlm_securid_t, max_sessions), .dflt = "2048" }, - { FR_CONF_OFFSET("max_trips_per_session", FR_TYPE_INTEGER, rlm_securid_t, max_trips_per_session) }, - { FR_CONF_OFFSET("max_round_trips", FR_TYPE_INTEGER, rlm_securid_t, max_trips_per_session), .dflt = "6" }, + { FR_CONF_OFFSET("timer_expire", FR_TYPE_UINT32, rlm_securid_t, timer_limit), .dflt = "600" }, + { FR_CONF_OFFSET("max_sessions", FR_TYPE_UINT32, rlm_securid_t, max_sessions), .dflt = "2048" }, + { FR_CONF_OFFSET("max_trips_per_session", FR_TYPE_UINT32, rlm_securid_t, max_trips_per_session) }, + { FR_CONF_OFFSET("max_round_trips", FR_TYPE_UINT32, rlm_securid_t, max_trips_per_session), .dflt = "6" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c index 7ced7125fa9..94a104a0a39 100644 --- a/src/modules/rlm_sigtran/rlm_sigtran.c +++ b/src/modules/rlm_sigtran/rlm_sigtran.c @@ -73,30 +73,30 @@ static const FR_NAME_NUMBER m3ua_traffic_mode_table[] = { static const CONF_PARSER sctp_config[] = { { FR_CONF_OFFSET("server", FR_TYPE_COMBO_IP_ADDR, rlm_sigtran_t, conn_conf.sctp_dst_ipaddr) }, - { FR_CONF_OFFSET("port", FR_TYPE_SHORT, rlm_sigtran_t, conn_conf.sctp_dst_port), .dflt = "2905" }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT16, rlm_sigtran_t, conn_conf.sctp_dst_port), .dflt = "2905" }, { FR_CONF_OFFSET("src_ipaddr", FR_TYPE_COMBO_IP_ADDR, rlm_sigtran_t, conn_conf.sctp_src_ipaddr ) }, - { FR_CONF_OFFSET("src_port", FR_TYPE_SHORT, rlm_sigtran_t, conn_conf.sctp_src_port), .dflt = "0" }, + { FR_CONF_OFFSET("src_port", FR_TYPE_UINT16, rlm_sigtran_t, conn_conf.sctp_src_port), .dflt = "0" }, - { FR_CONF_OFFSET("timeout", FR_TYPE_INTEGER, rlm_sigtran_t, conn_conf.sctp_timeout), .dflt = "5" }, + { FR_CONF_OFFSET("timeout", FR_TYPE_UINT32, rlm_sigtran_t, conn_conf.sctp_timeout), .dflt = "5" }, CONF_PARSER_TERMINATOR }; static const CONF_PARSER m3ua_route[] = { - { FR_CONF_IS_SET_OFFSET("dpc", FR_TYPE_INTEGER, sigtran_m3ua_route_t, dpc) }, - { FR_CONF_OFFSET("opc", FR_TYPE_INTEGER | FR_TYPE_MULTI, sigtran_m3ua_route_t, opc) }, - { FR_CONF_OFFSET("si", FR_TYPE_INTEGER | FR_TYPE_MULTI, sigtran_m3ua_route_t, si) }, + { FR_CONF_IS_SET_OFFSET("dpc", FR_TYPE_UINT32, sigtran_m3ua_route_t, dpc) }, + { FR_CONF_OFFSET("opc", FR_TYPE_UINT32 | FR_TYPE_MULTI, sigtran_m3ua_route_t, opc) }, + { FR_CONF_OFFSET("si", FR_TYPE_UINT32 | FR_TYPE_MULTI, sigtran_m3ua_route_t, si) }, CONF_PARSER_TERMINATOR }; static const CONF_PARSER m3ua_config[] = { - { FR_CONF_OFFSET("link_index", FR_TYPE_SHORT, rlm_sigtran_t, conn_conf.m3ua_link_index) }, - { FR_CONF_OFFSET("routing_ctx", FR_TYPE_SHORT, rlm_sigtran_t, conn_conf.m3ua_routing_context) }, + { FR_CONF_OFFSET("link_index", FR_TYPE_UINT16, rlm_sigtran_t, conn_conf.m3ua_link_index) }, + { FR_CONF_OFFSET("routing_ctx", FR_TYPE_UINT16, rlm_sigtran_t, conn_conf.m3ua_routing_context) }, { FR_CONF_OFFSET("traffic_mode", FR_TYPE_STRING, rlm_sigtran_t, conn_conf.m3ua_traffic_mode_str), .dflt = "loadshare" }, - { FR_CONF_OFFSET("ack_timeout", FR_TYPE_INTEGER, rlm_sigtran_t, conn_conf.m3ua_ack_timeout), .dflt = "2" }, - { FR_CONF_OFFSET("beat_interval", FR_TYPE_INTEGER, rlm_sigtran_t, conn_conf.m3ua_beat_interval), .dflt = "0" }, + { FR_CONF_OFFSET("ack_timeout", FR_TYPE_UINT32, rlm_sigtran_t, conn_conf.m3ua_ack_timeout), .dflt = "2" }, + { FR_CONF_OFFSET("beat_interval", FR_TYPE_UINT32, rlm_sigtran_t, conn_conf.m3ua_beat_interval), .dflt = "0" }, { FR_CONF_IS_SET_OFFSET("route", FR_TYPE_SUBSECTION, rlm_sigtran_t, conn_conf.m3ua_routes), .subcs = (void const *) m3ua_route }, @@ -104,33 +104,33 @@ static const CONF_PARSER m3ua_config[] = { }; static const CONF_PARSER mtp3_config[] = { - { FR_CONF_OFFSET("dpc", FR_TYPE_INTEGER | FR_TYPE_REQUIRED, rlm_sigtran_t, conn_conf.mtp3_dpc) }, - { FR_CONF_OFFSET("opc", FR_TYPE_INTEGER | FR_TYPE_REQUIRED, rlm_sigtran_t, conn_conf.mtp3_opc) }, + { FR_CONF_OFFSET("dpc", FR_TYPE_UINT32 | FR_TYPE_REQUIRED, rlm_sigtran_t, conn_conf.mtp3_dpc) }, + { FR_CONF_OFFSET("opc", FR_TYPE_UINT32 | FR_TYPE_REQUIRED, rlm_sigtran_t, conn_conf.mtp3_opc) }, CONF_PARSER_TERMINATOR }; static const CONF_PARSER sccp_global_title[] = { { FR_CONF_OFFSET("address", FR_TYPE_STRING, sigtran_sccp_global_title_t, address) }, - { FR_CONF_IS_SET_OFFSET("tt", FR_TYPE_BYTE, sigtran_sccp_global_title_t, tt) }, - { FR_CONF_IS_SET_OFFSET("nai", FR_TYPE_BYTE, sigtran_sccp_global_title_t, nai) }, - { FR_CONF_IS_SET_OFFSET("np", FR_TYPE_BYTE, sigtran_sccp_global_title_t, np) }, - { FR_CONF_IS_SET_OFFSET("es", FR_TYPE_BYTE, sigtran_sccp_global_title_t, es) }, + { FR_CONF_IS_SET_OFFSET("tt", FR_TYPE_UINT8, sigtran_sccp_global_title_t, tt) }, + { FR_CONF_IS_SET_OFFSET("nai", FR_TYPE_UINT8, sigtran_sccp_global_title_t, nai) }, + { FR_CONF_IS_SET_OFFSET("np", FR_TYPE_UINT8, sigtran_sccp_global_title_t, np) }, + { FR_CONF_IS_SET_OFFSET("es", FR_TYPE_UINT8, sigtran_sccp_global_title_t, es) }, CONF_PARSER_TERMINATOR }; static const CONF_PARSER sccp_address[] = { - { FR_CONF_IS_SET_OFFSET("pc", FR_TYPE_INTEGER, sigtran_sccp_address_t, pc) }, - { FR_CONF_IS_SET_OFFSET("ssn", FR_TYPE_BYTE, sigtran_sccp_address_t, ssn) }, + { FR_CONF_IS_SET_OFFSET("pc", FR_TYPE_UINT32, sigtran_sccp_address_t, pc) }, + { FR_CONF_IS_SET_OFFSET("ssn", FR_TYPE_UINT8, sigtran_sccp_address_t, ssn) }, { FR_CONF_IS_SET_OFFSET("gt", FR_TYPE_SUBSECTION, sigtran_sccp_address_t, gt), .subcs = (void const *) sccp_global_title }, CONF_PARSER_TERMINATOR }; static const CONF_PARSER sccp_config[] = { - { FR_CONF_OFFSET("ai8", FR_TYPE_BOOLEAN, rlm_sigtran_t, conn_conf.sccp_ai8) }, - { FR_CONF_OFFSET("route_on_ssn", FR_TYPE_BOOLEAN, rlm_sigtran_t, conn_conf.sccp_route_on_ssn) }, + { FR_CONF_OFFSET("ai8", FR_TYPE_BOOL, rlm_sigtran_t, conn_conf.sccp_ai8) }, + { FR_CONF_OFFSET("route_on_ssn", FR_TYPE_BOOL, rlm_sigtran_t, conn_conf.sccp_route_on_ssn) }, { FR_CONF_OFFSET("called", FR_TYPE_SUBSECTION, rlm_sigtran_t, conn_conf.sccp_called), .subcs = (void const *) sccp_address }, { FR_CONF_OFFSET("calling", FR_TYPE_SUBSECTION, rlm_sigtran_t, conn_conf.sccp_calling), .subcs = (void const *) sccp_address }, diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c index 1aff75669fe..9a965812e6a 100644 --- a/src/modules/rlm_soh/rlm_soh.c +++ b/src/modules/rlm_soh/rlm_soh.c @@ -101,7 +101,7 @@ static const CONF_PARSER module_config[] = { /* * Do SoH over DHCP? */ - { FR_CONF_OFFSET("dhcp", FR_TYPE_BOOLEAN, rlm_soh_t, dhcp), .dflt = "no" }, + { FR_CONF_OFFSET("dhcp", FR_TYPE_BOOL, rlm_soh_t, dhcp), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c index 70c94568c4f..152394879eb 100644 --- a/src/modules/rlm_sometimes/rlm_sometimes.c +++ b/src/modules/rlm_sometimes/rlm_sometimes.c @@ -42,8 +42,8 @@ typedef struct rlm_sometimes_t { static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("rcode", FR_TYPE_STRING, rlm_sometimes_t, rcode_str), .dflt = "fail" }, { FR_CONF_OFFSET("key", FR_TYPE_TMPL | FR_TYPE_ATTRIBUTE, rlm_sometimes_t, key), .dflt = "&User-Name", .quote = T_BARE_WORD }, - { FR_CONF_OFFSET("start", FR_TYPE_INTEGER, rlm_sometimes_t, start), .dflt = "0" }, - { FR_CONF_OFFSET("end", FR_TYPE_INTEGER, rlm_sometimes_t, end), .dflt = "127" }, + { FR_CONF_OFFSET("start", FR_TYPE_UINT32, rlm_sometimes_t, start), .dflt = "0" }, + { FR_CONF_OFFSET("end", FR_TYPE_UINT32, rlm_sometimes_t, end), .dflt = "127" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c index 874458a0296..afbc05da03b 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c @@ -186,8 +186,8 @@ static const FR_NAME_NUMBER verify_cert_table[] = { static CONF_PARSER load_balance_dc_aware_config[] = { { FR_CONF_OFFSET("local_dc", FR_TYPE_STRING, rlm_sql_cassandra_t, lbdc_local_dc) }, - { FR_CONF_OFFSET("hosts_per_remote_dc", FR_TYPE_INTEGER, rlm_sql_cassandra_t, lbdc_hosts_per_remote_dc), .dflt = "0" }, - { FR_CONF_OFFSET("allow_remote_dcs_for_local_cl", FR_TYPE_BOOLEAN, rlm_sql_cassandra_t, lbdc_allow_remote_dcs_for_local_cl), .dflt = "no" }, + { FR_CONF_OFFSET("hosts_per_remote_dc", FR_TYPE_UINT32, rlm_sql_cassandra_t, lbdc_hosts_per_remote_dc), .dflt = "0" }, + { FR_CONF_OFFSET("allow_remote_dcs_for_local_cl", FR_TYPE_BOOL, rlm_sql_cassandra_t, lbdc_allow_remote_dcs_for_local_cl), .dflt = "no" }, CONF_PARSER_TERMINATOR }; @@ -196,7 +196,7 @@ static CONF_PARSER latency_aware_routing_config[] = { { FR_CONF_OFFSET("scale", FR_TYPE_TIMEVAL, rlm_sql_cassandra_t, lar_scale), .dflt = "0.1" }, { FR_CONF_OFFSET("retry_period", FR_TYPE_TIMEVAL, rlm_sql_cassandra_t, lar_retry_period), .dflt = "10" }, { FR_CONF_OFFSET("update_rate", FR_TYPE_TIMEVAL, rlm_sql_cassandra_t, lar_update_rate), .dflt = "0.1" }, - { FR_CONF_OFFSET("min_measured", FR_TYPE_INTEGER64, rlm_sql_cassandra_t, lar_min_measured), .dflt = "50" }, + { FR_CONF_OFFSET("min_measured", FR_TYPE_UINT64, rlm_sql_cassandra_t, lar_min_measured), .dflt = "50" }, CONF_PARSER_TERMINATOR }; @@ -213,34 +213,34 @@ static CONF_PARSER tls_config[] = { static const CONF_PARSER driver_config[] = { { FR_CONF_OFFSET("consistency", FR_TYPE_STRING, rlm_sql_cassandra_t, consistency_str), .dflt = "quorum" }, - { FR_CONF_OFFSET("protocol_version", FR_TYPE_INTEGER, rlm_sql_cassandra_t, protocol_version) }, + { FR_CONF_OFFSET("protocol_version", FR_TYPE_UINT32, rlm_sql_cassandra_t, protocol_version) }, - { FR_CONF_OFFSET("connections_per_host", FR_TYPE_INTEGER, rlm_sql_cassandra_t, connections_per_host) }, - { FR_CONF_OFFSET("connections_per_host_max", FR_TYPE_INTEGER, rlm_sql_cassandra_t, connections_per_host_max) }, + { FR_CONF_OFFSET("connections_per_host", FR_TYPE_UINT32, rlm_sql_cassandra_t, connections_per_host) }, + { FR_CONF_OFFSET("connections_per_host_max", FR_TYPE_UINT32, rlm_sql_cassandra_t, connections_per_host_max) }, - { FR_CONF_OFFSET("io_threads", FR_TYPE_INTEGER, rlm_sql_cassandra_t, io_threads) }, - { FR_CONF_OFFSET("io_queue_size", FR_TYPE_INTEGER, rlm_sql_cassandra_t, io_queue_size) }, - { FR_CONF_OFFSET("io_flush_requests_max", FR_TYPE_INTEGER, rlm_sql_cassandra_t, io_flush_requests_max) }, + { FR_CONF_OFFSET("io_threads", FR_TYPE_UINT32, rlm_sql_cassandra_t, io_threads) }, + { FR_CONF_OFFSET("io_queue_size", FR_TYPE_UINT32, rlm_sql_cassandra_t, io_queue_size) }, + { FR_CONF_OFFSET("io_flush_requests_max", FR_TYPE_UINT32, rlm_sql_cassandra_t, io_flush_requests_max) }, - { FR_CONF_OFFSET("pending_requests_high", FR_TYPE_INTEGER, rlm_sql_cassandra_t, pending_requests_high) }, - { FR_CONF_OFFSET("pending_requests_low", FR_TYPE_INTEGER, rlm_sql_cassandra_t, pending_requests_low) }, - { FR_CONF_OFFSET("write_bytes_high", FR_TYPE_INTEGER, rlm_sql_cassandra_t, write_bytes_high) }, - { FR_CONF_OFFSET("write_bytes_low", FR_TYPE_INTEGER, rlm_sql_cassandra_t, write_bytes_low) }, + { FR_CONF_OFFSET("pending_requests_high", FR_TYPE_UINT32, rlm_sql_cassandra_t, pending_requests_high) }, + { FR_CONF_OFFSET("pending_requests_low", FR_TYPE_UINT32, rlm_sql_cassandra_t, pending_requests_low) }, + { FR_CONF_OFFSET("write_bytes_high", FR_TYPE_UINT32, rlm_sql_cassandra_t, write_bytes_high) }, + { FR_CONF_OFFSET("write_bytes_low", FR_TYPE_UINT32, rlm_sql_cassandra_t, write_bytes_low) }, - { FR_CONF_OFFSET("event_queue_size", FR_TYPE_INTEGER, rlm_sql_cassandra_t, event_queue_size) }, + { FR_CONF_OFFSET("event_queue_size", FR_TYPE_UINT32, rlm_sql_cassandra_t, event_queue_size) }, - { FR_CONF_OFFSET("spawn_threshold", FR_TYPE_INTEGER, rlm_sql_cassandra_t, spawn_threshold) }, - { FR_CONF_OFFSET("spawn_max", FR_TYPE_INTEGER, rlm_sql_cassandra_t, spawn_max) }, + { FR_CONF_OFFSET("spawn_threshold", FR_TYPE_UINT32, rlm_sql_cassandra_t, spawn_threshold) }, + { FR_CONF_OFFSET("spawn_max", FR_TYPE_UINT32, rlm_sql_cassandra_t, spawn_max) }, { FR_CONF_OFFSET("spawn_retry_delay", FR_TYPE_TIMEVAL, rlm_sql_cassandra_t, spawn_retry_delay) }, { FR_CONF_POINTER("load_balance_dc_aware", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) load_balance_dc_aware_config }, - { FR_CONF_OFFSET("load_balance_round_robin", FR_TYPE_BOOLEAN, rlm_sql_cassandra_t, load_balance_round_robin), .dflt = "no" }, + { FR_CONF_OFFSET("load_balance_round_robin", FR_TYPE_BOOL, rlm_sql_cassandra_t, load_balance_round_robin), .dflt = "no" }, - { FR_CONF_OFFSET("token_aware_routing", FR_TYPE_BOOLEAN, rlm_sql_cassandra_t, token_aware_routing), .dflt = "yes" }, + { FR_CONF_OFFSET("token_aware_routing", FR_TYPE_BOOL, rlm_sql_cassandra_t, token_aware_routing), .dflt = "yes" }, { FR_CONF_POINTER("latency_aware_routing", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) latency_aware_routing_config }, - { FR_CONF_OFFSET("tcp_keepalive", FR_TYPE_INTEGER, rlm_sql_cassandra_t, tcp_keepalive) }, - { FR_CONF_OFFSET("tcp_nodelay", FR_TYPE_BOOLEAN, rlm_sql_cassandra_t, tcp_nodelay), .dflt = "no" }, + { FR_CONF_OFFSET("tcp_keepalive", FR_TYPE_UINT32, rlm_sql_cassandra_t, tcp_keepalive) }, + { FR_CONF_OFFSET("tcp_nodelay", FR_TYPE_BOOL, rlm_sql_cassandra_t, tcp_nodelay), .dflt = "no" }, { FR_CONF_POINTER("tls", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) tls_config }, CONF_PARSER_TERMINATOR diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c index d5afe27fa22..df6261f9e75 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c @@ -72,7 +72,7 @@ typedef struct rlm_sql_postgres_conn { } rlm_sql_postgres_conn_t; static CONF_PARSER driver_config[] = { - { FR_CONF_OFFSET("send_application_name", FR_TYPE_BOOLEAN, rlm_sql_postgres_t, send_application_name), .dflt = "no" }, + { FR_CONF_OFFSET("send_application_name", FR_TYPE_BOOL, rlm_sql_postgres_t, send_application_name), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c index 47021f096de..b8f9de8c78f 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c @@ -62,7 +62,7 @@ typedef struct rlm_sql_sqlite { static const CONF_PARSER driver_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_REQUIRED, rlm_sql_sqlite_t, filename) }, - { FR_CONF_OFFSET("busy_timeout", FR_TYPE_INTEGER, rlm_sql_sqlite_t, busy_timeout), .dflt = "200" }, + { FR_CONF_OFFSET("busy_timeout", FR_TYPE_UINT32, rlm_sql_sqlite_t, busy_timeout), .dflt = "200" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 2b456986389..3732daa7748 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -84,14 +84,14 @@ static const CONF_PARSER postauth_config[] = { static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("driver", FR_TYPE_STRING, rlm_sql_config_t, sql_driver_name), .dflt = "rlm_sql_null" }, { FR_CONF_OFFSET("server", FR_TYPE_STRING, rlm_sql_config_t, sql_server), .dflt = "" }, /* Must be zero length so drivers can determine if it was set */ - { FR_CONF_OFFSET("port", FR_TYPE_INTEGER, rlm_sql_config_t, sql_port), .dflt = "0" }, + { FR_CONF_OFFSET("port", FR_TYPE_UINT32, rlm_sql_config_t, sql_port), .dflt = "0" }, { FR_CONF_OFFSET("login", FR_TYPE_STRING, rlm_sql_config_t, sql_login), .dflt = "" }, { FR_CONF_OFFSET("password", FR_TYPE_STRING | FR_TYPE_SECRET, rlm_sql_config_t, sql_password), .dflt = "" }, { FR_CONF_OFFSET("radius_db", FR_TYPE_STRING, rlm_sql_config_t, sql_db), .dflt = "radius" }, - { FR_CONF_OFFSET("read_groups", FR_TYPE_BOOLEAN, rlm_sql_config_t, read_groups), .dflt = "yes" }, - { FR_CONF_OFFSET("read_profiles", FR_TYPE_BOOLEAN, rlm_sql_config_t, read_profiles), .dflt = "yes" }, - { FR_CONF_OFFSET("read_clients", FR_TYPE_BOOLEAN, rlm_sql_config_t, do_clients), .dflt = "no" }, - { FR_CONF_OFFSET("delete_stale_sessions", FR_TYPE_BOOLEAN, rlm_sql_config_t, delete_stale_sessions), .dflt = "yes" }, + { FR_CONF_OFFSET("read_groups", FR_TYPE_BOOL, rlm_sql_config_t, read_groups), .dflt = "yes" }, + { FR_CONF_OFFSET("read_profiles", FR_TYPE_BOOL, rlm_sql_config_t, read_profiles), .dflt = "yes" }, + { FR_CONF_OFFSET("read_clients", FR_TYPE_BOOL, rlm_sql_config_t, do_clients), .dflt = "no" }, + { FR_CONF_OFFSET("delete_stale_sessions", FR_TYPE_BOOL, rlm_sql_config_t, delete_stale_sessions), .dflt = "yes" }, { FR_CONF_OFFSET("sql_user_name", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_sql_config_t, query_user), .dflt = "" }, { FR_CONF_OFFSET("group_attribute", FR_TYPE_STRING, rlm_sql_config_t, group_attribute) }, { FR_CONF_OFFSET("logfile", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_sql_config_t, logfile) }, @@ -114,7 +114,7 @@ static const CONF_PARSER module_config[] = { /* * This only works for a few drivers. */ - { FR_CONF_OFFSET("query_timeout", FR_TYPE_INTEGER, rlm_sql_config_t, query_timeout) }, + { FR_CONF_OFFSET("query_timeout", FR_TYPE_UINT32, rlm_sql_config_t, query_timeout) }, { FR_CONF_POINTER("accounting", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) acct_config }, diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index 595262c3b70..9614a612ebd 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -576,18 +576,18 @@ static int mod_bootstrap(CONF_SECTION *conf, void *instance) memset(&flags, 0, sizeof(flags)); flags.compare = 1; /* ugly hack */ - if (tmpl_define_undefined_attr(inst->paircmp_attr, FR_TYPE_INTEGER64, &flags) < 0) { + if (tmpl_define_undefined_attr(inst->paircmp_attr, FR_TYPE_UINT64, &flags) < 0) { cf_log_err_cs(conf, "Failed defining counter attribute: %s", fr_strerror()); return -1; } flags.compare = 0; - if (tmpl_define_undefined_attr(inst->limit_attr, FR_TYPE_INTEGER64, &flags) < 0) { + if (tmpl_define_undefined_attr(inst->limit_attr, FR_TYPE_UINT64, &flags) < 0) { cf_log_err_cs(conf, "Failed defining check attribute: %s", fr_strerror()); return -1; } - if (inst->paircmp_attr->tmpl_da->type != FR_TYPE_INTEGER64) { + if (inst->paircmp_attr->tmpl_da->type != FR_TYPE_UINT64) { cf_log_err_cs(conf, "Counter attribute %s MUST be integer64", inst->paircmp_attr->tmpl_da->name); return -1; @@ -599,7 +599,7 @@ static int mod_bootstrap(CONF_SECTION *conf, void *instance) return -1; } - if (inst->limit_attr->tmpl_da->type != FR_TYPE_INTEGER64) { + if (inst->limit_attr->tmpl_da->type != FR_TYPE_UINT64) { cf_log_err_cs(conf, "Check attribute %s MUST be integer64", inst->limit_attr->tmpl_da->name); return -1; diff --git a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c index 35f4792ef4a..49011ed9d4a 100644 --- a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c +++ b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c @@ -73,9 +73,9 @@ typedef struct rlm_sqlhpwippool_t { static CONF_PARSER module_config[] = { { FR_CONF_OFFSET("sql_module_instance", FR_TYPE_STRING, rlm_sqlhpwippool_t, sql_instance_name), .dflt = "sql" }, { FR_CONF_OFFSET("db_name", FR_TYPE_STRING, rlm_sqlhpwippool_t, db_name), .dflt = "netvim" }, - { FR_CONF_OFFSET("no_free_fail", FR_TYPE_BOOLEAN, rlm_sqlhpwippool_t, no_free_fail), .dflt = "yes" }, - { FR_CONF_OFFSET("free_after", FR_TYPE_INTEGER, rlm_sqlhpwippool_t, free_after), .dflt = "300" }, - { FR_CONF_OFFSET("sync_after", FR_TYPE_INTEGER, rlm_sqlhpwippool_t, sync_after), .dflt = "25" }, + { FR_CONF_OFFSET("no_free_fail", FR_TYPE_BOOL, rlm_sqlhpwippool_t, no_free_fail), .dflt = "yes" }, + { FR_CONF_OFFSET("free_after", FR_TYPE_UINT32, rlm_sqlhpwippool_t, free_after), .dflt = "300" }, + { FR_CONF_OFFSET("sync_after", FR_TYPE_UINT32, rlm_sqlhpwippool_t, sync_after), .dflt = "25" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index 0efd8be2f44..2a38f519fd5 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -108,14 +108,14 @@ static CONF_PARSER message_config[] = { static CONF_PARSER module_config[] = { { FR_CONF_OFFSET("sql_module_instance", FR_TYPE_STRING | FR_TYPE_REQUIRED, rlm_sqlippool_t, sql_instance_name), .dflt = "sql" }, - { FR_CONF_OFFSET("lease_duration", FR_TYPE_INTEGER, rlm_sqlippool_t, lease_duration), .dflt = "86400" }, + { FR_CONF_OFFSET("lease_duration", FR_TYPE_UINT32, rlm_sqlippool_t, lease_duration), .dflt = "86400" }, { FR_CONF_OFFSET("pool_name", FR_TYPE_STRING, rlm_sqlippool_t, pool_name), .dflt = "" }, { FR_CONF_OFFSET("default_pool", FR_TYPE_STRING, rlm_sqlippool_t, defaultpool), .dflt = "main_pool" }, - { FR_CONF_OFFSET("ipv6", FR_TYPE_BOOLEAN, rlm_sqlippool_t, ipv6) }, + { FR_CONF_OFFSET("ipv6", FR_TYPE_BOOL, rlm_sqlippool_t, ipv6) }, { FR_CONF_OFFSET("allocate_begin", FR_TYPE_STRING | FR_TYPE_XLAT, rlm_sqlippool_t, allocate_begin), .dflt = "START TRANSACTION" }, diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c index d3948b8151f..e6178d5b21e 100644 --- a/src/modules/rlm_test/rlm_test.c +++ b/src/modules/rlm_test/rlm_test.c @@ -112,11 +112,11 @@ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("string", FR_TYPE_STRING, rlm_test_t, string) }, { FR_CONF_OFFSET("string_m", FR_TYPE_STRING | FR_TYPE_MULTI, rlm_test_t, string_m) }, - { FR_CONF_OFFSET("boolean", FR_TYPE_BOOLEAN, rlm_test_t, boolean), .dflt = "no" }, - { FR_CONF_OFFSET("boolean_m", FR_TYPE_BOOLEAN | FR_TYPE_MULTI, rlm_test_t, boolean_m), .dflt = "no" }, + { FR_CONF_OFFSET("boolean", FR_TYPE_BOOL, rlm_test_t, boolean), .dflt = "no" }, + { FR_CONF_OFFSET("boolean_m", FR_TYPE_BOOL | FR_TYPE_MULTI, rlm_test_t, boolean_m), .dflt = "no" }, - { FR_CONF_OFFSET("integer", FR_TYPE_INTEGER, rlm_test_t, integer), .dflt = "1" }, - { FR_CONF_OFFSET("integer_m", FR_TYPE_INTEGER | FR_TYPE_MULTI, rlm_test_t, integer_m), .dflt = "2" }, + { FR_CONF_OFFSET("integer", FR_TYPE_UINT32, rlm_test_t, integer), .dflt = "1" }, + { FR_CONF_OFFSET("integer_m", FR_TYPE_UINT32 | FR_TYPE_MULTI, rlm_test_t, integer_m), .dflt = "2" }, { FR_CONF_OFFSET("ipv4_addr", FR_TYPE_IPV4_ADDR, rlm_test_t, ipv4_addr), .dflt = "*" }, { FR_CONF_OFFSET("ipv4_addr_m", FR_TYPE_IPV4_ADDR | FR_TYPE_MULTI, rlm_test_t, ipv4_addr_m), .dflt = "*" }, @@ -142,23 +142,23 @@ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("octets", FR_TYPE_OCTETS, rlm_test_t, octets) }, { FR_CONF_OFFSET("octets_m", FR_TYPE_OCTETS | FR_TYPE_MULTI, rlm_test_t, octets_m) }, - { FR_CONF_OFFSET("bytes", FR_TYPE_BYTE, rlm_test_t, byte) }, - { FR_CONF_OFFSET("bytes_m", FR_TYPE_BYTE | FR_TYPE_MULTI, rlm_test_t, byte_m) }, + { FR_CONF_OFFSET("bytes", FR_TYPE_UINT8, rlm_test_t, byte) }, + { FR_CONF_OFFSET("bytes_m", FR_TYPE_UINT8 | FR_TYPE_MULTI, rlm_test_t, byte_m) }, { FR_CONF_OFFSET("ifid", FR_TYPE_IFID, rlm_test_t, ifid) }, { FR_CONF_OFFSET("ifid_m", FR_TYPE_IFID | FR_TYPE_MULTI, rlm_test_t, ifid_m) }, - { FR_CONF_OFFSET("short", FR_TYPE_SHORT, rlm_test_t, shortint) }, - { FR_CONF_OFFSET("short_m", FR_TYPE_SHORT | FR_TYPE_MULTI, rlm_test_t, shortint_m) }, + { FR_CONF_OFFSET("short", FR_TYPE_UINT16, rlm_test_t, shortint) }, + { FR_CONF_OFFSET("short_m", FR_TYPE_UINT16 | FR_TYPE_MULTI, rlm_test_t, shortint_m) }, { FR_CONF_OFFSET("ethernet", FR_TYPE_ETHERNET, rlm_test_t, ethernet) }, { FR_CONF_OFFSET("ethernet_m", FR_TYPE_ETHERNET | FR_TYPE_MULTI, rlm_test_t, ethernet_m) }, - { FR_CONF_OFFSET("signed", FR_TYPE_SIGNED, rlm_test_t, sinteger) }, - { FR_CONF_OFFSET("signed_m", FR_TYPE_SIGNED | FR_TYPE_MULTI, rlm_test_t, sinteger_m) }, + { FR_CONF_OFFSET("signed", FR_TYPE_INT32, rlm_test_t, sinteger) }, + { FR_CONF_OFFSET("signed_m", FR_TYPE_INT32 | FR_TYPE_MULTI, rlm_test_t, sinteger_m) }, - { FR_CONF_OFFSET("uint64", FR_TYPE_INTEGER64, rlm_test_t, integer64) }, - { FR_CONF_OFFSET("uint64_m", FR_TYPE_INTEGER64 | FR_TYPE_MULTI, rlm_test_t, integer64_m) }, + { FR_CONF_OFFSET("uint64", FR_TYPE_UINT64, rlm_test_t, integer64) }, + { FR_CONF_OFFSET("uint64_m", FR_TYPE_UINT64 | FR_TYPE_MULTI, rlm_test_t, integer64_m) }, { FR_CONF_OFFSET("timeval", FR_TYPE_TIMEVAL, rlm_test_t, timeval) }, { FR_CONF_OFFSET("timeval_m", FR_TYPE_TIMEVAL | FR_TYPE_MULTI, rlm_test_t, timeval_m) }, diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c index eb5e0ba6bb5..6bcba14bb43 100644 --- a/src/modules/rlm_unbound/rlm_unbound.c +++ b/src/modules/rlm_unbound/rlm_unbound.c @@ -58,7 +58,7 @@ typedef struct rlm_unbound_t { */ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("filename", FR_TYPE_FILE_INPUT | FR_TYPE_REQUIRED, rlm_unbound_t, filename), .dflt = "${modconfdir}/unbound/default.conf" }, - { FR_CONF_OFFSET("timeout", FR_TYPE_INTEGER, rlm_unbound_t, timeout), .dflt = "3000" }, + { FR_CONF_OFFSET("timeout", FR_TYPE_UINT32, rlm_unbound_t, timeout), .dflt = "3000" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_unpack/rlm_unpack.c b/src/modules/rlm_unpack/rlm_unpack.c index 0419532100f..c3460e2065a 100644 --- a/src/modules/rlm_unpack/rlm_unpack.c +++ b/src/modules/rlm_unpack/rlm_unpack.c @@ -157,17 +157,17 @@ static ssize_t unpack_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen, * Hacks */ switch (type) { - case FR_TYPE_SIGNED: - case FR_TYPE_INTEGER: + case FR_TYPE_INT32: + case FR_TYPE_UINT32: case FR_TYPE_DATE: cast->vp_integer = ntohl(cast->vp_integer); break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: cast->vp_short = ((input[offset] << 8) | input[offset + 1]); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: cast->vp_integer64 = ntohll(cast->vp_integer64); break; diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c index 2cfd4e23aaa..c8894768746 100644 --- a/src/modules/rlm_wimax/rlm_wimax.c +++ b/src/modules/rlm_wimax/rlm_wimax.c @@ -42,7 +42,7 @@ typedef struct rlm_wimax_t { } rlm_wimax_t; static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("delete_mppe_keys", FR_TYPE_BOOLEAN, rlm_wimax_t, delete_mppe_keys), .dflt = "no" }, + { FR_CONF_OFFSET("delete_mppe_keys", FR_TYPE_BOOL, rlm_wimax_t, delete_mppe_keys), .dflt = "no" }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c index 4bd13fb8e10..20c39f8c942 100644 --- a/src/modules/rlm_winbind/rlm_winbind.c +++ b/src/modules/rlm_winbind/rlm_winbind.c @@ -38,7 +38,7 @@ RCSID("$Id$") static const CONF_PARSER group_config[] = { { FR_CONF_OFFSET("group_search_username", FR_TYPE_TMPL, rlm_winbind_t, group_username) }, - { FR_CONF_OFFSET("group_add_domain", FR_TYPE_BOOLEAN, rlm_winbind_t, group_add_domain), .dflt = "yes" }, + { FR_CONF_OFFSET("group_add_domain", FR_TYPE_BOOL, rlm_winbind_t, group_add_domain), .dflt = "yes" }, { FR_CONF_OFFSET("group_attribute", FR_TYPE_STRING, rlm_winbind_t, group_attribute) }, CONF_PARSER_TERMINATOR }; diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c index 98960988dd2..cf13f15c76a 100644 --- a/src/modules/rlm_yubikey/rlm_yubikey.c +++ b/src/modules/rlm_yubikey/rlm_yubikey.c @@ -29,17 +29,17 @@ RCSID("$Id$") #ifdef HAVE_YKCLIENT static const CONF_PARSER validation_config[] = { - { FR_CONF_OFFSET("client_id", FR_TYPE_INTEGER, rlm_yubikey_t, client_id), .dflt = 0 }, + { FR_CONF_OFFSET("client_id", FR_TYPE_UINT32, rlm_yubikey_t, client_id), .dflt = 0 }, { FR_CONF_OFFSET("api_key", FR_TYPE_STRING | FR_TYPE_SECRET, rlm_yubikey_t, api_key) }, CONF_PARSER_TERMINATOR }; #endif static const CONF_PARSER module_config[] = { - { FR_CONF_OFFSET("id_length", FR_TYPE_INTEGER, rlm_yubikey_t, id_len), .dflt = "12" }, - { FR_CONF_OFFSET("split", FR_TYPE_BOOLEAN, rlm_yubikey_t, split), .dflt = "yes" }, - { FR_CONF_OFFSET("decrypt", FR_TYPE_BOOLEAN, rlm_yubikey_t, decrypt), .dflt = "no" }, - { FR_CONF_OFFSET("validate", FR_TYPE_BOOLEAN, rlm_yubikey_t, validate), .dflt = "no" }, + { FR_CONF_OFFSET("id_length", FR_TYPE_UINT32, rlm_yubikey_t, id_len), .dflt = "12" }, + { FR_CONF_OFFSET("split", FR_TYPE_BOOL, rlm_yubikey_t, split), .dflt = "yes" }, + { FR_CONF_OFFSET("decrypt", FR_TYPE_BOOL, rlm_yubikey_t, decrypt), .dflt = "no" }, + { FR_CONF_OFFSET("validate", FR_TYPE_BOOL, rlm_yubikey_t, validate), .dflt = "no" }, #ifdef HAVE_YKCLIENT { FR_CONF_POINTER("validation", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) validation_config }, #endif diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c index dbeeb85c389..1f965d7af78 100644 --- a/src/protocols/radius/base.c +++ b/src/protocols/radius/base.c @@ -55,11 +55,11 @@ size_t const fr_radius_attr_sizes[FR_TYPE_MAX + 1][2] = { [FR_TYPE_IFID] = {8, 8}, [FR_TYPE_ETHERNET] = {6, 6}, - [FR_TYPE_BOOLEAN] = {1, 1}, - [FR_TYPE_BYTE] = {1, 1}, - [FR_TYPE_SHORT] = {2, 2}, - [FR_TYPE_INTEGER] = {4, 4}, - [FR_TYPE_INTEGER64] = {8, 8}, + [FR_TYPE_BOOL] = {1, 1}, + [FR_TYPE_UINT8] = {1, 1}, + [FR_TYPE_UINT16] = {2, 2}, + [FR_TYPE_UINT32] = {4, 4}, + [FR_TYPE_UINT64] = {8, 8}, [FR_TYPE_DATE] = {4, 4}, [FR_TYPE_ABINARY] = {32, ~0}, diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c index 52262f17857..d81835f95e6 100644 --- a/src/protocols/radius/decode.c +++ b/src/protocols/radius/decode.c @@ -950,7 +950,7 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dic tag = p[0]; data_len -= 1; - } else if (parent->type == FR_TYPE_INTEGER) { + } else if (parent->type == FR_TYPE_UINT32) { memcpy(buffer, p, attr_len); tag = buffer[0]; buffer[0] = 0; @@ -1057,14 +1057,14 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dic if (data_len > sizeof(vp->vp_filter)) goto raw; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: case FR_TYPE_IPV4_ADDR: case FR_TYPE_DATE: - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: if (data_len != 4) goto raw; break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: case FR_TYPE_IFID: if (data_len != 8) goto raw; break; @@ -1117,11 +1117,11 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dic } break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: if (data_len != 1) goto raw; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: if (data_len != 2) goto raw; break; @@ -1340,20 +1340,20 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dic vp->vp_length = data_len; break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: vp->vp_byte = p[0]; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: vp->vp_short = (p[0] << 8) | p[1]; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: memcpy(&vp->vp_integer, p, 4); vp->vp_integer = ntohl(vp->vp_integer); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: memcpy(&vp->vp_integer64, p, 8); vp->vp_integer64 = ntohll(vp->vp_integer64); break; @@ -1390,7 +1390,7 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dic memcpy(&vp->vp_ip, &tmp_prefix, sizeof(vp->vp_ip)); break; - case FR_TYPE_SIGNED: /* overloaded with vp_integer */ + case FR_TYPE_INT32: /* overloaded with vp_integer */ memcpy(&vp->vp_integer, p, 4); vp->vp_integer = ntohl(vp->vp_integer); break; diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c index 5db5cc7a81d..7e2b3c8af5f 100644 --- a/src/protocols/radius/encode.c +++ b/src/protocols/radius/encode.c @@ -456,25 +456,25 @@ ssize_t fr_radius_encode_value_hton(uint8_t *out, size_t outlen, VALUE_PAIR cons memcpy(out, &vp->data.datum, outlen); break; - case FR_TYPE_BOOLEAN: + case FR_TYPE_BOOL: out[0] = vp->vp_byte & 0x01; break; - case FR_TYPE_BYTE: + case FR_TYPE_UINT8: out[0] = vp->vp_byte & 0xff; break; - case FR_TYPE_SHORT: + case FR_TYPE_UINT16: out[0] = (vp->vp_short >> 8) & 0xff; out[1] = vp->vp_short & 0xff; break; - case FR_TYPE_INTEGER: + case FR_TYPE_UINT32: lvalue = htonl(vp->vp_integer); memcpy(out, &lvalue, sizeof(lvalue)); break; - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT64: lvalue64 = htonll(vp->vp_integer64); memcpy(out, &lvalue64, sizeof(lvalue64)); break; @@ -484,7 +484,7 @@ ssize_t fr_radius_encode_value_hton(uint8_t *out, size_t outlen, VALUE_PAIR cons memcpy(out, &lvalue, sizeof(lvalue)); break; - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: { int32_t slvalue = htonl(vp->vp_signed); memcpy(out, &slvalue, sizeof(slvalue)); @@ -502,7 +502,7 @@ ssize_t fr_radius_encode_value_hton(uint8_t *out, size_t outlen, VALUE_PAIR cons case FR_TYPE_STRUCT: case FR_TYPE_SIZE: case FR_TYPE_TIMEVAL: - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: case FR_TYPE_MAX: fr_strerror_printf("Cannot get data for VALUE_PAIR type %i", vp->vp_type); return -1; @@ -786,13 +786,13 @@ static ssize_t encode_value(uint8_t *out, size_t outlen, case FR_TYPE_IPV4_PREFIX: case FR_TYPE_ABINARY: case FR_TYPE_ETHERNET: /* just in case */ - case FR_TYPE_BYTE: - case FR_TYPE_BOOLEAN: - case FR_TYPE_SHORT: - case FR_TYPE_INTEGER: - case FR_TYPE_INTEGER64: + case FR_TYPE_UINT8: + case FR_TYPE_BOOL: + case FR_TYPE_UINT16: + case FR_TYPE_UINT32: + case FR_TYPE_UINT64: case FR_TYPE_DATE: - case FR_TYPE_SIGNED: + case FR_TYPE_INT32: len = fr_radius_encode_value_hton(buffer, sizeof(buffer), vp); if (len < 0) return -1; data = buffer; @@ -869,7 +869,7 @@ static ssize_t encode_value(uint8_t *out, size_t outlen, if (len > ((ssize_t) (outlen - 1))) len = outlen - 1; ptr[0] = vp->tag; ptr++; - } else if (vp->vp_type == FR_TYPE_INTEGER) { + } else if (vp->vp_type == FR_TYPE_UINT32) { buffer[0] = vp->tag; } /* else it can't be any other type */ } @@ -1674,7 +1674,7 @@ ssize_t fr_radius_encode_pair(uint8_t *out, size_t outlen, vp_cursor_t *cursor, case FR_TYPE_INVALID: case FR_TYPE_VENDOR: case FR_TYPE_TIMEVAL: - case FR_TYPE_DECIMAL: + case FR_TYPE_FLOAT64: case FR_TYPE_EVS: case FR_TYPE_MAX: fr_strerror_printf("%s: Cannot encode attribute %s", __FUNCTION__, vp->da->name);