Use NON_VALUES macro in RADIUS encoder

diff --git a/src/include/types.h b/src/include/types.h
index 8316c9908a3cfd05771175b7b69fc38165410e7c..7a1fcd5aeba902997a4e3ceb655920c91c6eec99 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -148,7 +148,7 @@ typedef enum {
 /** Types which do not represent concrete values
  *
  */
-#define FR_TYPE_NOT_VALUES \
+#define FR_TYPE_NON_VALUES \
        FR_TYPE_COMBO_IP_ADDR: \
        case FR_TYPE_COMBO_IP_PREFIX: \
        case FR_TYPE_STRUCTURAL: \

diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c
index 61117ee793b3be8a2d5ec390986b57073bcfaa7f..68c3d13f2639fcf139ddb1748b4ecce2ed3f1c47 100644 (file)
--- a/src/modules/rlm_lua/lua.c
+++ b/src/modules/rlm_lua/lua.c
@@ -138,7 +138,7 @@ static int rlm_lua_marshall(lua_State *L, VALUE_PAIR const *vp)
                lua_pushnumber(L, vp->vp_size);
                break;
 
-       case FR_TYPE_NOT_VALUES:
+       case FR_TYPE_NON_VALUES:
                ERROR("Cannot convert %s to Lua type", fr_int2str(dict_attr_types, vp->vp_type, "<INVALID>"));
                return -1;
        }

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index c2bb8febce4b2a30f58099f22622245c74336114..3cbef4939dc70f93d62bd9d5e2411d855f26d061 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -443,7 +443,7 @@ static int mod_populate_vptuple(PyObject *pp, VALUE_PAIR *vp)
        }
                break;
 
-       case FR_TYPE_NOT_VALUES:
+       case FR_TYPE_NON_VALUES:
                rad_assert(0);
                return -1;
        }

diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c
index 4a27bda45d7ec6d73470c7a2ce62ee35a74b9b92..157dc72615f55e2cb7c79020f82072e8b84d2047 100644 (file)
--- a/src/protocols/radius/encode.c
+++ b/src/protocols/radius/encode.c
@@ -450,7 +450,6 @@ ssize_t fr_radius_encode_value_hton(uint8_t *out, size_t outlen, VALUE_PAIR cons
        case FR_TYPE_IPV4_PREFIX:
        case FR_TYPE_ABINARY:
        case FR_TYPE_ETHERNET:
-       case FR_TYPE_COMBO_IP_ADDR:
                memcpy(out, &vp->data.datum, outlen);
                break;
 
@@ -481,23 +480,14 @@ ssize_t fr_radius_encode_value_hton(uint8_t *out, size_t outlen, VALUE_PAIR cons
        }
                break;
 
-       case FR_TYPE_INVALID:
-       case FR_TYPE_EXTENDED:
-       case FR_TYPE_LONG_EXTENDED:
-       case FR_TYPE_COMBO_IP_PREFIX:
-       case FR_TYPE_EVS:
-       case FR_TYPE_VSA:
-       case FR_TYPE_VENDOR:
-       case FR_TYPE_TLV:
-       case FR_TYPE_STRUCT:
-       case FR_TYPE_SIZE:
        case FR_TYPE_TIMEVAL:
        case FR_TYPE_FLOAT32:
        case FR_TYPE_FLOAT64:
        case FR_TYPE_DATE_MILLISECONDS:
        case FR_TYPE_DATE_MICROSECONDS:
        case FR_TYPE_DATE_NANOSECONDS:
-       case FR_TYPE_MAX:
+       case FR_TYPE_SIZE:
+       case FR_TYPE_NON_VALUES:
                fr_strerror_printf("Cannot encode data for VALUE_PAIR type %i", vp->vp_type);
                return -1;