rename encode_tlv() to encode_cursor()

because it encodes everything in the cursor.  As part of renaming
the functions to be consistent and more clear.

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index 1687b704f9793c87e3a25047c770bd3b33069c3d..471ba18839fa894b0e014494b94f62e81f203d2c 100644 (file)
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -477,7 +477,7 @@ static void *struct_next_encodable(fr_dlist_head_t *list, void *current, void *u
 ssize_t fr_struct_to_network(fr_dbuff_t *dbuff,
                             fr_da_stack_t *da_stack, unsigned int depth,
                             fr_dcursor_t *parent_cursor, void *encode_ctx,
-                            fr_encode_dbuff_t encode_value, fr_encode_dbuff_t encode_tlv)
+                            fr_encode_dbuff_t encode_value, fr_encode_dbuff_t encode_cursor)
 {
        fr_dbuff_t              work_dbuff;
        fr_dbuff_marker_t       hdr;
@@ -757,7 +757,7 @@ ssize_t fr_struct_to_network(fr_dbuff_t *dbuff,
                        fr_proto_da_stack_build(da_stack, vp->da);
 
                        len = fr_struct_to_network(&work_dbuff, da_stack, depth + 2, /* note + 2 !!! */
-                                                  cursor, encode_ctx, encode_value, encode_tlv);
+                                                  cursor, encode_ctx, encode_value, encode_cursor);
                        if (len < 0) return len;
                        goto done;
                }
@@ -775,7 +775,7 @@ ssize_t fr_struct_to_network(fr_dbuff_t *dbuff,
                        fr_proto_da_stack_build(da_stack, vp->da->parent);
 
                        len = fr_struct_to_network(&work_dbuff, da_stack, depth + 2, /* note + 2 !!! */
-                                                  cursor, encode_ctx, encode_value, encode_tlv);
+                                                  cursor, encode_ctx, encode_value, encode_cursor);
                        if (len < 0) return len;
                        goto done;
                }
@@ -800,8 +800,8 @@ done:
        if (tlv) {
                ssize_t slen;
 
-               if (!encode_tlv) {
-                       fr_strerror_printf("Asked to encode TLV %s, but not passed an encoding function",
+               if (!encode_cursor) {
+                       fr_strerror_printf("Asked to encode child attribute %s, but we were not passed an encoding function",
                                           tlv->name);
                        return -1;
                }
@@ -812,7 +812,7 @@ done:
                 *      Encode any TLV attributes which are part of this structure.
                 */
                while (vp && (da_stack->da[depth] == parent) && (da_stack->depth >= parent->depth)) {
-                       slen = encode_tlv(&work_dbuff, da_stack, depth + 1, cursor, encode_ctx);
+                       slen = encode_cursor(&work_dbuff, da_stack, depth + 1, cursor, encode_ctx);
                        if (slen < 0) return slen;
 
                        vp = fr_dcursor_current(cursor);

diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h
index 3de6769741c74d182e99fb512e539ab0c50e36a5..b7fba2a32f987c92b3047e4748fcfb2142d89646 100644 (file)
--- a/src/lib/util/struct.h
+++ b/src/lib/util/struct.h
@@ -43,7 +43,7 @@ typedef ssize_t (*fr_encode_dbuff_t)(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack,
 
 ssize_t fr_struct_to_network(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
                             fr_dcursor_t *cursor, void *encode_ctx,
-                            fr_encode_dbuff_t encode_value, fr_encode_dbuff_t encode_tlv) CC_HINT(nonnull(1,2,4));
+                            fr_encode_dbuff_t encode_value, fr_encode_dbuff_t encode_cursor) CC_HINT(nonnull(1,2,4));
 
 #ifdef __cplusplus
 }

diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c
index 964ec0673c05f239f43217012b193523e6b9c956..3b5916e06e398a1cb5595588fade82b0b15b12c1 100644 (file)
--- a/src/protocols/dhcpv4/encode.c
+++ b/src/protocols/dhcpv4/encode.c
@@ -42,9 +42,9 @@ static ssize_t encode_child(fr_dbuff_t *dbuff,
                                  fr_da_stack_t *da_stack, unsigned int depth,
                                  fr_dcursor_t *cursor, void *encode_ctx);
 
-static ssize_t encode_tlv(fr_dbuff_t *dbuff,
-                         fr_da_stack_t *da_stack, unsigned int depth,
-                         fr_dcursor_t *cursor, void *encode_ctx);
+static ssize_t encode_cursor(fr_dbuff_t *dbuff,
+                            fr_da_stack_t *da_stack, unsigned int depth,
+                            fr_dcursor_t *cursor, void *encode_ctx);
 
 /** Write DHCP option value into buffer
  *
@@ -76,7 +76,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
         *      Structures are special.
         */
        if ((vp->da->type == FR_TYPE_STRUCT) || (da->type == FR_TYPE_STRUCT)) {
-               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, cursor, encode_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, cursor, encode_ctx, encode_value, encode_cursor);
                if (slen <= 0) return slen;
 
                /*
@@ -281,9 +281,9 @@ static bool extend_option(fr_dbuff_t *dbuff, fr_dbuff_marker_t *hdr, int len)
 
 #define DHCPV4_OPT_HDR_LEN (2)
 
-static ssize_t encode_tlv(fr_dbuff_t *dbuff,
-                         fr_da_stack_t *da_stack, unsigned int depth,
-                         fr_dcursor_t *cursor, void *encode_ctx)
+static ssize_t encode_cursor(fr_dbuff_t *dbuff,
+                            fr_da_stack_t *da_stack, unsigned int depth,
+                            fr_dcursor_t *cursor, void *encode_ctx)
 {
        fr_dbuff_t              work_dbuff = FR_DBUFF(dbuff);
        fr_pair_t const *vp = fr_dcursor_current(cursor);

diff --git a/src/protocols/dhcpv6/encode.c b/src/protocols/dhcpv6/encode.c
index 5d687d61d5e29ba89cd94e1a4d65be546e54dda8..41fba4266e70a9ea42d5d409bf8c3cb2890ccd3b 100644 (file)
--- a/src/protocols/dhcpv6/encode.c
+++ b/src/protocols/dhcpv6/encode.c
@@ -49,9 +49,9 @@ static ssize_t encode_tlv_hdr(fr_dbuff_t *dbuff,
                              fr_da_stack_t *da_stack, unsigned int depth,
                              fr_dcursor_t *cursor, void *encode_ctx);
 
-static ssize_t encode_tlv(fr_dbuff_t *dbuff,
-                         fr_da_stack_t *da_stack, unsigned int depth,
-                         fr_dcursor_t *cursor, void *encode_ctx);
+static ssize_t encode_cursor(fr_dbuff_t *dbuff,
+                            fr_da_stack_t *da_stack, unsigned int depth,
+                            fr_dcursor_t *cursor, void *encode_ctx);
 
 /** Macro-like function for encoding an option header
  *
@@ -93,7 +93,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
         *      Pack multiple attributes into into a single option
         */
        if ((vp->da->type == FR_TYPE_STRUCT) || (da->type == FR_TYPE_STRUCT)) {
-               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, cursor, encode_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, cursor, encode_ctx, encode_value, encode_cursor);
                if (slen <= 0) return slen;
 
                /*
@@ -453,7 +453,7 @@ do_child:
        return fr_dbuff_set(dbuff, &work_dbuff);
 }
 
-static ssize_t encode_tlv(fr_dbuff_t *dbuff,
+static ssize_t encode_cursor(fr_dbuff_t *dbuff,
                          fr_da_stack_t *da_stack, unsigned int depth,
                          fr_dcursor_t *cursor, void *encode_ctx)
 {
@@ -559,7 +559,7 @@ static ssize_t encode_tlv_hdr(fr_dbuff_t *dbuff,
 
        FR_DBUFF_ADVANCE_RETURN(&work_dbuff, DHCPV6_OPT_HDR_LEN);       /* Make room for option header */
 
-       len = encode_tlv(&work_dbuff, da_stack, depth, cursor, encode_ctx);
+       len = encode_cursor(&work_dbuff, da_stack, depth, cursor, encode_ctx);
        if (len < 0) return len;
 
        /*

diff --git a/src/protocols/dns/encode.c b/src/protocols/dns/encode.c
index 1e99be7852737124e0e44e2c92327367525a9d71..7c1fbe39a89d1f8a2c06da7340c473f8ca998b4f 100644 (file)
--- a/src/protocols/dns/encode.c
+++ b/src/protocols/dns/encode.c
@@ -48,9 +48,9 @@ static ssize_t encode_tlv_hdr(fr_dbuff_t *dbuff,
                              fr_da_stack_t *da_stack, unsigned int depth,
                              fr_dcursor_t *cursor, void *encode_ctx);
 
-static ssize_t encode_tlv(fr_dbuff_t *dbuff,
-                         fr_da_stack_t *da_stack, unsigned int depth,
-                         fr_dcursor_t *cursor, void *encode_ctx);
+static ssize_t encode_cursor(fr_dbuff_t *dbuff,
+                            fr_da_stack_t *da_stack, unsigned int depth,
+                            fr_dcursor_t *cursor, void *encode_ctx);
 
 /** Macro-like function for encoding an option header
  *
@@ -97,7 +97,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
 
                fr_pair_dcursor_init(&child_cursor, &vp->vp_group);
 
-               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx, encode_value, encode_cursor);
                if (slen < 0) return slen;
 
                /*
@@ -112,7 +112,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
         *      Flat-list
         */
        if (da->type == FR_TYPE_STRUCT) {
-               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, cursor, encode_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, da_stack, depth, cursor, encode_ctx, encode_value, encode_cursor);
                if (slen <= 0) return slen;
 
                /*
@@ -298,9 +298,9 @@ do_child:
        return fr_dbuff_set(dbuff, &work_dbuff);
 }
 
-static ssize_t encode_tlv(fr_dbuff_t *dbuff,
-                         fr_da_stack_t *da_stack, unsigned int depth,
-                         fr_dcursor_t *cursor, void *encode_ctx)
+static ssize_t encode_cursor(fr_dbuff_t *dbuff,
+                            fr_da_stack_t *da_stack, unsigned int depth,
+                            fr_dcursor_t *cursor, void *encode_ctx)
 {
        fr_dbuff_t              work_dbuff = FR_DBUFF(dbuff);
        fr_pair_t const *vp = fr_dcursor_current(cursor);
@@ -404,7 +404,7 @@ static ssize_t encode_tlv_hdr(fr_dbuff_t *dbuff,
 
        FR_DBUFF_ADVANCE_RETURN(&work_dbuff, DNS_OPT_HDR_LEN);  /* Make room for option header */
 
-       len = encode_tlv(&work_dbuff, da_stack, depth, cursor, encode_ctx);
+       len = encode_cursor(&work_dbuff, da_stack, depth, cursor, encode_ctx);
        if (len < 0) return len;
 
        /*
@@ -450,12 +450,12 @@ static ssize_t fr_dns_encode_rr(fr_dbuff_t *dbuff, fr_dcursor_t *cursor, void *e
 
                fr_pair_dcursor_init(&child_cursor, &vp->vp_group);
 
-               slen = fr_struct_to_network(&work_dbuff, &da_stack, 0, &child_cursor, encode_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, &da_stack, 0, &child_cursor, encode_ctx, encode_value, encode_cursor);
                if (slen <= 0) return slen;
                (void) fr_dcursor_next(cursor);
 
        } else {
-               slen = fr_struct_to_network(&work_dbuff, &da_stack, 0, cursor, encode_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, &da_stack, 0, cursor, encode_ctx, encode_value, encode_cursor);
                if (slen <= 0) return slen;
        }
 
@@ -487,7 +487,7 @@ static ssize_t encode_record(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, fr_pair
                fr_dcursor_t child_cursor;
 
                fr_pair_dcursor_init(&child_cursor, &vp->vp_group);
-               slen = fr_struct_to_network(&work_dbuff, da_stack, 0, &child_cursor, packet_ctx, encode_value, encode_tlv);
+               slen = fr_struct_to_network(&work_dbuff, da_stack, 0, &child_cursor, packet_ctx, encode_value, encode_cursor);
                if (slen <= 0) return slen;
 
                count++;