use better / new names

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index 04844826aecbd4bc1f362416909f443d00893327..e2af2f40e46092143282833e6383c0ff17818c2d 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -117,7 +117,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent,
        value = cf_pair_value(cp);
 
        dv = fr_dict_enum_by_name(attr_packet_type, value, -1);
-       if (!dv || (dv->value->vb_uint32 >= FR_VQP_MAX_CODE)) {
+       if (!dv || (dv->value->vb_uint32 >= FR_VMPS_CODE_MAX)) {
                cf_log_err(ci, "Unknown VMPS packet type '%s'", value);
                return -1;
        }
@@ -181,7 +181,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d
        fr_radius_packet_t *packet = request->packet;
        fr_dcursor_t cursor;
 
-       fr_assert(data[0] < FR_VQP_MAX_CODE);
+       fr_assert(data[0] < FR_VMPS_CODE_MAX);
 
        RHEXDUMP3(data, data_len, "proto_vmps decode packet");
 
@@ -247,8 +247,8 @@ static ssize_t mod_encode(void const *instance, request_t *request, uint8_t *buf
         *      Process layer NAK, never respond, or "Do not respond".
         */
        if ((buffer_len == 1) ||
-           (request->reply->code == FR_RADIUS_CODE_DO_NOT_RESPOND) ||
-           (request->reply->code >= FR_VQP_MAX_CODE)) {
+           (request->reply->code == FR_VMPS_DO_NOT_RESPOND) ||
+           (request->reply->code >= FR_VMPS_CODE_MAX)) {
                track->do_not_respond = true;
                return 1;
        }

diff --git a/src/listen/vmps/proto_vmps.h b/src/listen/vmps/proto_vmps.h
index a6027cbb3fbcab3f78879fc46a9d690d4fe1e2dd..0fbfaa5364795f5573a2ef8b3d52d1e9fd778330 100644 (file)
--- a/src/listen/vmps/proto_vmps.h
+++ b/src/listen/vmps/proto_vmps.h
@@ -33,12 +33,12 @@ typedef struct {
        fr_io_instance_t                io;                             //!< wrapper for IO abstraction
 
        char                            **allowed_types;                //!< names for for 'type = ...'
-       bool                            allowed[FR_VQP_MAX_CODE];       //!< indexed by value
+       bool                            allowed[FR_VMPS_CODE_MAX];      //!< indexed by value
 
        uint32_t                        max_packet_size;                //!< for message ring buffer.
        uint32_t                        num_messages;                   //!< for message ring buffer.
 
-       uint32_t                        priorities[FR_VQP_MAX_CODE];    //!< priorities for individual packets
+       uint32_t                        priorities[FR_VMPS_CODE_MAX];   //!< priorities for individual packets
 } proto_vmps_t;
 
 /*

diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c
index 80029e2e9cc0ddffe607263ec640165ef3696793..0fdb88c3fb746b5686bd709f593ed27fe38ca378 100644 (file)
--- a/src/protocols/vmps/vmps.c
+++ b/src/protocols/vmps/vmps.c
@@ -66,7 +66,7 @@ RCSID("$Id$")
  * VQP is layered over UDP.  The default destination port is 1589.
  *
  */
-char const *fr_vmps_codes[FR_VQP_MAX_CODE] = {
+char const *fr_vmps_codes[FR_VMPS_CODE_MAX] = {
        [FR_PACKET_TYPE_VALUE_JOIN_REQUEST] = "Join-Request",
        [FR_PACKET_TYPE_VALUE_JOIN_RESPONSE] = "Join-Response",
        [FR_PACKET_TYPE_VALUE_RECONFIRM_REQUEST] = "Reconfirm-Request",
@@ -497,13 +497,13 @@ void fr_vmps_print_hex(FILE *fp, uint8_t const *packet, size_t packet_len)
 
        fprintf(fp, "  Version:\t\t%u\n", packet[0]);
 
-       if ((packet[1] > 0) && (packet[1] < FR_VQP_MAX_CODE) && fr_vmps_codes[packet[1]]) {
+       if ((packet[1] > 0) && (packet[1] < FR_VMPS_CODE_MAX) && fr_vmps_codes[packet[1]]) {
                fprintf(fp, "  OpCode:\t\t%s\n", fr_vmps_codes[packet[1]]);
        } else {
                fprintf(fp, "  OpCode:\t\t%u\n", packet[1]);
        }
 
-       if ((packet[2] > 0) && (packet[2] < FR_VQP_MAX_CODE) && fr_vmps_codes[packet[2]]) {
+       if ((packet[2] > 0) && (packet[2] < FR_VMPS_CODE_MAX) && fr_vmps_codes[packet[2]]) {
                fprintf(fp, "  OpCode:\t\t%s\n", fr_vmps_codes[packet[2]]);
        } else {
                fprintf(fp, "  OpCode:\t\t%u\n", packet[2]);

diff --git a/src/protocols/vmps/vmps.h b/src/protocols/vmps/vmps.h
index a246051ba2e1d79f8bd7951985bd38822f2aa379..a4ff3c9c8e5929b16f07efc89bb86acf3bb087ed 100644 (file)
--- a/src/protocols/vmps/vmps.h
+++ b/src/protocols/vmps/vmps.h
@@ -31,8 +31,6 @@ RCSIDH(vmps_h, "$Id$")
 extern "C" {
 #endif
 
-#define FR_VQP_MAX_CODE (5)
-#define FR_RADIUS_CODE_DO_NOT_RESPOND (0)
 #define FR_VQP_HDR_LEN (8)
 #define FR_VQP_VERSION (1)
 
@@ -45,9 +43,20 @@ ssize_t fr_vmps_packet_size(uint8_t const *data, size_t data_len);
 void fr_vmps_print_hex(FILE *fp, uint8_t const *packet, size_t packet_len);
 
 ssize_t fr_vmps_encode(fr_dbuff_t *dbuff, uint8_t const *original,
-                                      int code, uint32_t id, fr_dcursor_t *cursor) CC_HINT(nonnull(1));
+                      int code, uint32_t id, fr_dcursor_t *cursor) CC_HINT(nonnull(1));
 
-extern char const      *fr_vmps_codes[FR_VQP_MAX_CODE];
+typedef enum {
+       FR_VMPS_JOIN_REQUEST = 1,
+       FR_VMPS_JOIN_RESPONSE = 2,
+       FR_VMPS_RECONFIRM_REQUEST = 3,
+       FR_VMPS_RECONFIRM_RESPONSE = 4,
+       FR_VMPS_CODE_MAX = 5,
+       FR_VMPS_DO_NOT_RESPOND = 256,
+} fr_vmps_packet_code_t;
+
+#define FR_VMPS_PACKET_CODE_VALID(_code) (((_code) > 0) && ((_code) < FR_VMPS_CODE_MAX))
+
+extern char const      *fr_vmps_codes[FR_VMPS_CODE_MAX];
 
 int fr_vmps_init(void);