Same for prefix

diff --git a/src/include/conffile.h b/src/include/conffile.h
index e784a800b55a486772e69ea2edfe90d3c92f70ca..2eba2c08d9bf87378115b569511020d008d06143 100644 (file)
--- a/src/include/conffile.h
+++ b/src/include/conffile.h
@@ -80,7 +80,7 @@ typedef struct timeval _timeval_t;
                __builtin_choose_expr(__builtin_types_compatible_p(fr_ipaddr_t *, _ct), _p, (conf_type_mismatch) 0),\
        __builtin_choose_expr((_t == PW_TYPE_TIMEVAL),\
                __builtin_choose_expr(__builtin_types_compatible_p(_timeval_t *, _ct), _p, (conf_type_mismatch) 0),\
-       __builtin_choose_expr((_t == PW_TYPE_IP_PREFIX),\
+       __builtin_choose_expr((_t == PW_TYPE_COMBO_IP_PREFIX),\
                __builtin_choose_expr(__builtin_types_compatible_p(fr_ipaddr_t *, _ct), _p, (conf_type_mismatch) 0),\
                (conf_type_invalid) 0\
        ))))))))))))))))))))

diff --git a/src/include/radius.h b/src/include/radius.h
index 40b73d3060862f11a7de35cafee638ad525ba595..c69388bdc596f3b192c081de69f7b3519d84dd9b 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -30,7 +30,7 @@ typedef enum {
        PW_TYPE_VSA,                            //!< Vendor-Specific, for RADIUS attribute 26.
        PW_TYPE_TIMEVAL,                        //!< Time value (struct timeval), only for config items.
        PW_TYPE_BOOLEAN,                        //!< A truth value.
-       PW_TYPE_IP_PREFIX,                      //!< WiMAX IPv4 or IPv6 address prefix depending on length.
+       PW_TYPE_COMBO_IP_PREFIX,                        //!< WiMAX IPv4 or IPv6 address prefix depending on length.
        PW_TYPE_MAX                             //!< Number of defined data types.
 } PW_TYPE;
 

diff --git a/src/lib/print.c b/src/lib/print.c
index 2933f89e7c123e40eb0ddf78cb1b4b46d63d7420..23ef8404b9b0d86d41cd7b615258d3b358a6e491 100644 (file)
--- a/src/lib/print.c
+++ b/src/lib/print.c
@@ -519,7 +519,7 @@ print_int:
         */
        case PW_TYPE_INVALID:
        case PW_TYPE_COMBO_IP_ADDR:
-       case PW_TYPE_IP_PREFIX:
+       case PW_TYPE_COMBO_IP_PREFIX:
        case PW_TYPE_EXTENDED:
        case PW_TYPE_LONG_EXTENDED:
        case PW_TYPE_EVS:
@@ -700,7 +700,7 @@ char *vp_data_aprints_value(TALLOC_CTX *ctx,
         */
        case PW_TYPE_INVALID:
        case PW_TYPE_COMBO_IP_ADDR:
-       case PW_TYPE_IP_PREFIX:
+       case PW_TYPE_COMBO_IP_PREFIX:
        case PW_TYPE_TLV:
        case PW_TYPE_EXTENDED:
        case PW_TYPE_LONG_EXTENDED:

diff --git a/src/lib/radius.c b/src/lib/radius.c
index 894872a3f976cffbd69c454890c8b5cbd168dfdc..2f228e61e51ffc5d62753d300a94fd4c12f18d9c 100644 (file)
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -3916,7 +3916,7 @@ ssize_t rad_vp2data(uint8_t const **out, VALUE_PAIR const *vp)
        case PW_TYPE_ABINARY:
        case PW_TYPE_ETHERNET:
        case PW_TYPE_COMBO_IP_ADDR:
-       case PW_TYPE_IP_PREFIX:
+       case PW_TYPE_COMBO_IP_PREFIX:
        {
                void const *p = &vp->data;
                memcpy(out, &p, sizeof(*out));

diff --git a/src/lib/value.c b/src/lib/value.c
index 551ac520058af0f242470cbb4f060e42dc6dedc2..1848dbc1712d51af6f227813bc1b930fe57c8d56 100644 (file)
--- a/src/lib/value.c
+++ b/src/lib/value.c
@@ -147,7 +147,7 @@ int value_data_cmp(PW_TYPE a_type, size_t a_len, value_data_t const *a,
         */
        case PW_TYPE_INVALID:           /* We should never see these */
        case PW_TYPE_COMBO_IP_ADDR:             /* This should have been converted into IPADDR/IPV6ADDR */
-       case PW_TYPE_IP_PREFIX:         /* This should have been converted into IPADDR/IPV6ADDR */
+       case PW_TYPE_COMBO_IP_PREFIX:           /* This should have been converted into IPADDR/IPV6ADDR */
        case PW_TYPE_TLV:
        case PW_TYPE_EXTENDED:
        case PW_TYPE_LONG_EXTENDED:

diff --git a/src/main/client.c b/src/main/client.c
index 83c8b99ebb74e1f3609ae7ce93664b1f67658078..3e238c477c0407edf5f0e7e6698dc388f14819f3 100644 (file)
--- a/src/main/client.c
+++ b/src/main/client.c
@@ -478,7 +478,7 @@ static CONF_PARSER limit_config[] = {
 #endif
 
 static const CONF_PARSER client_config[] = {
-       { "ipaddr", FR_CONF_POINTER(PW_TYPE_IP_PREFIX, &cl_ipaddr), NULL },
+       { "ipaddr", FR_CONF_POINTER(PW_TYPE_COMBO_IP_PREFIX, &cl_ipaddr), NULL },
        { "ipv4addr", FR_CONF_POINTER(PW_TYPE_IPV4_PREFIX, &cl_ipaddr), NULL },
        { "ipv6addr", FR_CONF_POINTER(PW_TYPE_IPV6_PREFIX, &cl_ipaddr), NULL },
 

diff --git a/src/main/conffile.c b/src/main/conffile.c
index 2b44c3151019f8f414a79b620b41db410e011f05..95cd169b211ae7f8a658a5d5a106f444525d0714 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -1196,7 +1196,7 @@ int cf_item_parse(CONF_SECTION *cs, char const *name, int type, void *data, char
                break;
 
        case PW_TYPE_COMBO_IP_ADDR:
-       case PW_TYPE_IP_PREFIX:
+       case PW_TYPE_COMBO_IP_PREFIX:
                ipaddr = data;
 
                if (fr_pton(ipaddr, value, -1, true) < 0) {