Formatting

diff --git a/src/lib/radius.c b/src/lib/radius.c
index 63265cb..dbb44ca 100644 (file)
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -1474,8 +1474,7 @@ int rad_vp2vsa(RADIUS_PACKET const *packet, RADIUS_PACKET const *original,
         *      Double-check for WiMAX format.
         */
        if (vp->da->flags.wimax) {
-               return rad_vp2wimax(packet, original, secret, pvp,
-                                   ptr, room);
+               return rad_vp2wimax(packet, original, secret, pvp, ptr, room);
        }
 
        if (vp->da->vendor > FR_MAX_VENDOR) {
@@ -1674,8 +1673,7 @@ int rad_vp2attr(RADIUS_PACKET const *packet, RADIUS_PACKET const *original,
                                    start, room);
        }
 
-       return rad_vp2vsa(packet, original, secret, pvp,
-                         start, room);
+       return rad_vp2vsa(packet, original, secret, pvp, start, room);
 }
 
 
@@ -2702,7 +2700,8 @@ int rad_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secre
                        case PW_CODE_COA_ACK:
                        case PW_CODE_COA_NAK:
                                if (!original) {
-                                       fr_strerror_printf("ERROR: Cannot validate Message-Authenticator in response packet without a request packet");
+                                       fr_strerror_printf("Cannot validate Message-Authenticator in response "
+                                                          "packet without a request packet");
                                        return -1;
                                }
                                memcpy(packet->data + 4, original->vector, AUTH_VECTOR_LEN);
@@ -2713,10 +2712,11 @@ int rad_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secre
                                    (uint8_t const *) secret, strlen(secret));
                        if (rad_digest_cmp(calc_auth_vector, msg_auth_vector,
                                   sizeof(calc_auth_vector)) != 0) {
-                               fr_strerror_printf("Received packet from %s with invalid Message-Authenticator!  (Shared secret is incorrect.)",
-                                          inet_ntop(packet->src_ipaddr.af,
-                                                    &packet->src_ipaddr.ipaddr,
-                                                    buffer, sizeof(buffer)));
+                               fr_strerror_printf("Received packet from %s with invalid Message-Authenticator!  "
+                                                  "(Shared secret is incorrect.)",
+                                                  inet_ntop(packet->src_ipaddr.af,
+                                                            &packet->src_ipaddr.ipaddr,
+                                                            buffer, sizeof(buffer)));
                                /* Silently drop packet, according to RFC 3579 */
                                return -1;
                        } /* else the message authenticator was good */
@@ -2739,12 +2739,12 @@ int rad_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secre
         */
        if ((packet->code == 0) || (packet->code >= FR_MAX_PACKET_CODE)) {
                fr_strerror_printf("Received Unknown packet code %d "
-                          "from client %s port %d: Cannot validate Request/Response Authenticator.",
-                          packet->code,
-                          inet_ntop(packet->src_ipaddr.af,
-                                    &packet->src_ipaddr.ipaddr,
-                                    buffer, sizeof(buffer)),
-                          packet->src_port);
+                                  "from client %s port %d: Cannot validate Request/Response Authenticator.",
+                                  packet->code,
+                                  inet_ntop(packet->src_ipaddr.af,
+                                            &packet->src_ipaddr.ipaddr,
+                                            buffer, sizeof(buffer)),
+                                  packet->src_port);
                return -1;
        }
 
@@ -2765,11 +2765,12 @@ int rad_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secre
        case PW_CODE_ACCOUNTING_REQUEST:
                if (calc_acctdigest(packet, secret) > 1) {
                        fr_strerror_printf("Received %s packet "
-                                  "from client %s with invalid Request Authenticator!  (Shared secret is incorrect.)",
-                                  fr_packet_codes[packet->code],
-                                  inet_ntop(packet->src_ipaddr.af,
-                                            &packet->src_ipaddr.ipaddr,
-                                            buffer, sizeof(buffer)));
+                                          "from client %s with invalid Request Authenticator!  "
+                                          "(Shared secret is incorrect.)",
+                                          fr_packet_codes[packet->code],
+                                          inet_ntop(packet->src_ipaddr.af,
+                                                    &packet->src_ipaddr.ipaddr,
+                                                    buffer, sizeof(buffer)));
                        return -1;
                }
                break;
@@ -2786,24 +2787,25 @@ int rad_verify(RADIUS_PACKET *packet, RADIUS_PACKET *original, char const *secre
                rcode = calc_replydigest(packet, original, secret);
                if (rcode > 1) {
                        fr_strerror_printf("Received %s packet "
-                                  "from home server %s port %d with invalid Response Authenticator!  (Shared secret is incorrect.)",
-                                  fr_packet_codes[packet->code],
-                                  inet_ntop(packet->src_ipaddr.af,
-                                            &packet->src_ipaddr.ipaddr,
-                                            buffer, sizeof(buffer)),
-                                  packet->src_port);
+                                          "from home server %s port %d with invalid Response Authenticator!  "
+                                          "(Shared secret is incorrect.)",
+                                          fr_packet_codes[packet->code],
+                                          inet_ntop(packet->src_ipaddr.af,
+                                                    &packet->src_ipaddr.ipaddr,
+                                                    buffer, sizeof(buffer)),
+                                          packet->src_port);
                        return -1;
                }
                break;
 
        default:
                fr_strerror_printf("Received Unknown packet code %d "
-                          "from client %s port %d: Cannot validate Request/Response Authenticator",
-                          packet->code,
-                          inet_ntop(packet->src_ipaddr.af,
-                                    &packet->src_ipaddr.ipaddr,
-                                            buffer, sizeof(buffer)),
-                          packet->src_port);
+                                  "from client %s port %d: Cannot validate Request/Response Authenticator",
+                                  packet->code,
+                                  inet_ntop(packet->src_ipaddr.af,
+                                            &packet->src_ipaddr.ipaddr,
+                                            buffer, sizeof(buffer)),
+                                  packet->src_port);
                return -1;
        }
 

diff --git a/src/main/listen.c b/src/main/listen.c
index 2da23ea..21680db 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -1966,17 +1966,15 @@ static int client_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request)
 {
        if (!request->reply->code) return 0;
 
-       if (rad_encode(request->reply, request->packet,
-                      request->client->secret) < 0) {
-               RERROR("Failed encoding packet: %s",
-                              fr_strerror());
+       if (rad_encode(request->reply, request->packet, request->client->secret) < 0) {
+               RERROR("Failed encoding packet: %s", fr_strerror());
+
                return -1;
        }
 
-       if (rad_sign(request->reply, request->packet,
-                    request->client->secret) < 0) {
-               RERROR("Failed signing packet: %s",
-                              fr_strerror());
+       if (rad_sign(request->reply, request->packet, request->client->secret) < 0) {
+               RERROR("Failed signing packet: %s", fr_strerror());
+
                return -1;
        }
 
@@ -2023,14 +2021,14 @@ static int client_socket_decode(UNUSED rad_listen_t *listener, REQUEST *request)
 static int proxy_socket_encode(UNUSED rad_listen_t *listener, REQUEST *request)
 {
        if (rad_encode(request->proxy, NULL, request->home_server->secret) < 0) {
-               RERROR("Failed encoding proxied packet: %s",
-                              fr_strerror());
+               RERROR("Failed encoding proxied packet: %s", fr_strerror());
+
                return -1;
        }
 
        if (rad_sign(request->proxy, NULL, request->home_server->secret) < 0) {
-               RERROR("Failed signing proxied packet: %s",
-                              fr_strerror());
+               RERROR("Failed signing proxied packet: %s", fr_strerror());
+
                return -1;
        }