added support for Protocol-Error encoding

diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index 3f3ec6431892aefa587a2f7850a6c0e717343035..720876b84d1a1ceae3c2fa8d0f75390738312ae8 100644 (file)
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -406,6 +406,7 @@ int fr_radius_sign(uint8_t *packet, uint8_t const *original,
        case FR_CODE_DISCONNECT_NAK:
        case FR_CODE_COA_ACK:
        case FR_CODE_COA_NAK:
+       case FR_CODE_PROTOCOL_ERROR:
                if (!original) {
                need_original:
                        fr_strerror_printf("Cannot sign response packet without a request packet");
@@ -858,6 +859,7 @@ ssize_t fr_radius_encode(uint8_t *packet, size_t packet_len, uint8_t const *orig
        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");
                        return -1;
@@ -894,6 +896,32 @@ ssize_t fr_radius_encode(uint8_t *packet, size_t packet_len, uint8_t const *orig
         */
        ptr = packet + RADIUS_HDR_LEN;
 
+       /*
+        *      If we're sending Protocol-Error, add in
+        *      Original-Packet-Code manually.  If the user adds it
+        *      later themselves, well, too bad.
+        */
+       if (code == FR_CODE_PROTOCOL_ERROR) {
+               size_t room;
+
+               room = (packet + packet_len) - ptr;
+               if (room < 7) {
+                       fr_strerror_printf("Insufficient room to encode attributes");
+                       return -1;
+               }
+
+               ptr[0] = 241;
+               ptr[1] = 7;
+               ptr[2] = 4;     /* Original-Packet-Code */
+               ptr[3] = 0;
+               ptr[4] = 0;
+               ptr[5] = 0;
+               ptr[6] = original[0];
+
+               ptr += 7;
+               total_length += 7;
+       }
+
        /*
         *      Loop over the reply attributes for the packet.
         */