remove WITH_foo hacks

the base library should be able to do everything

diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index 6571b5cf6ad052a3cb74d840fbd711b0d982a416..f732e1f8472fb8b4582cb9469a0a5bbbc85bcbac 100644 (file)
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -850,15 +850,11 @@ ssize_t fr_radius_encode(uint8_t *packet, size_t packet_len, uint8_t const *orig
        case FR_CODE_ACCESS_ACCEPT:
        case FR_CODE_ACCESS_REJECT:
        case FR_CODE_ACCESS_CHALLENGE:
-#ifdef WITH_ACCOUNTING
        case FR_CODE_ACCOUNTING_RESPONSE:
-#endif
-#ifdef WITH_COA
        case FR_CODE_COA_ACK:
        case FR_CODE_COA_NAK:
        case FR_CODE_DISCONNECT_ACK:
        case FR_CODE_DISCONNECT_NAK:
-#endif
        case FR_CODE_PROTOCOL_ERROR:
                if (!original) {
                        fr_strerror_printf("Cannot encode response without request");
@@ -868,20 +864,16 @@ ssize_t fr_radius_encode(uint8_t *packet, size_t packet_len, uint8_t const *orig
                memcpy(packet + 4, packet_ctx.vector, AUTH_VECTOR_LEN);
                break;
 
-#ifdef WITH_ACCOUNTING
        case FR_CODE_ACCOUNTING_REQUEST:
                packet_ctx.vector = nullvector;
                memcpy(packet + 4, packet_ctx.vector, AUTH_VECTOR_LEN);
                break;
-#endif
 
-#ifdef WITH_COA
        case FR_CODE_COA_REQUEST:
        case FR_CODE_DISCONNECT_REQUEST:
                packet_ctx.vector = nullvector;
                memcpy(packet + 4, packet_ctx.vector, AUTH_VECTOR_LEN);
                break;
-#endif
 
        default:
                fr_strerror_printf("Cannot encode unknown packet code %d", code);

diff --git a/src/protocols/radius/packet.c b/src/protocols/radius/packet.c
index 90d8631809fdaf45612405123f49b676e894697c..7ac1faf88f3c0d1c118af4c87f78ba2c24e591bc 100644 (file)
--- a/src/protocols/radius/packet.c
+++ b/src/protocols/radius/packet.c
@@ -128,15 +128,11 @@ int fr_radius_packet_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original, char
        case FR_CODE_ACCESS_ACCEPT:
        case FR_CODE_ACCESS_REJECT:
        case FR_CODE_ACCESS_CHALLENGE:
-#ifdef WITH_ACCOUNTING
        case FR_CODE_ACCOUNTING_RESPONSE:
-#endif
-#ifdef WITH_COA
        case FR_CODE_COA_ACK:
        case FR_CODE_COA_NAK:
        case FR_CODE_DISCONNECT_ACK:
        case FR_CODE_DISCONNECT_NAK:
-#endif
                if (!original) {
                        fr_strerror_printf("Cannot decode response without request");
                        return -1;
@@ -144,18 +140,14 @@ int fr_radius_packet_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original, char
                packet_ctx.vector = original->vector;
                break;
 
-#ifdef WITH_ACCOUNTING
        case FR_CODE_ACCOUNTING_REQUEST:
                memset(packet->vector, 0, sizeof(packet->vector));
                break;
-#endif
 
-#ifdef WITH_COA
        case FR_CODE_COA_REQUEST:
        case FR_CODE_DISCONNECT_REQUEST:
                memset(packet->vector, 0, sizeof(packet->vector));
                break;
-#endif
 
        default:
                fr_strerror_printf("Cannot decode unknown packet code %d", packet->code);