rename encode_foo_hdr() to encode_foo()

because the functions encode the entire attribute, including
header and value.

We also have separate encode_option_hdr() functions which only
encode the actual header contents.

diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c
index 3b5916e06e398a1cb5595588fade82b0b15b12c1..424c9dcb19b0b25dcb8ac1d135bf0711559c35c3 100644 (file)
--- a/src/protocols/dhcpv4/encode.c
+++ b/src/protocols/dhcpv4/encode.c
@@ -331,7 +331,7 @@ static ssize_t encode_cursor(fr_dbuff_t *dbuff,
  *     - 0 if we ran out of space.
  *     - < 0 on error.
  */
-static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_rfc(fr_dbuff_t *dbuff,
                              fr_da_stack_t *da_stack, unsigned int depth,
                              fr_dcursor_t *cursor, void *encode_ctx)
 {
@@ -390,11 +390,11 @@ static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
        return fr_dbuff_set(dbuff, &work_dbuff);
 }
 
-static ssize_t encode_vsio_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_vsio(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_hdr(fr_dbuff_t *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);
 
@@ -415,18 +415,18 @@ static ssize_t encode_child(fr_dbuff_t *dbuff,
                case FR_TYPE_TLV:
                        if (!da_stack->da[depth + 1]) goto do_child;
 
-                       return encode_tlv_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+                       return encode_tlv(dbuff, da_stack, depth, cursor, encode_ctx);
 
                case FR_TYPE_VSA:
                        if (!da_stack->da[depth + 1]) goto do_child;
 
-                       return encode_vsio_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+                       return encode_vsio(dbuff, da_stack, depth, cursor, encode_ctx);
 
                default:
                        break;
                }
 
-               return encode_rfc_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+               return encode_rfc(dbuff, da_stack, depth, cursor, encode_ctx);
        }
 
        if (!da_stack->da[depth]) {
@@ -449,15 +449,15 @@ do_child:
 
                switch (da_stack->da[depth]->type) {
                case FR_TYPE_VSA:
-                       len = encode_vsio_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_vsio(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
 
                case FR_TYPE_TLV:
-                       len = encode_tlv_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_tlv(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
 
                default:
-                       len = encode_rfc_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_rfc(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
                }
 
@@ -487,7 +487,7 @@ do_child:
  *     - 0 if we ran out of space.
  *     - < 0 on error.
  */
-static ssize_t encode_tlv_hdr(fr_dbuff_t *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)
 {
@@ -588,7 +588,7 @@ static ssize_t encode_tlv_hdr(fr_dbuff_t *dbuff,
        return fr_dbuff_set(dbuff, &work_dbuff);
 }
 
-static ssize_t encode_vsio_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_vsio(fr_dbuff_t *dbuff,
                               fr_da_stack_t *da_stack, unsigned int depth,
                               fr_dcursor_t *cursor, void *encode_ctx)
 {
@@ -725,15 +725,15 @@ ssize_t fr_dhcpv4_encode_option(fr_dbuff_t *dbuff, fr_dcursor_t *cursor, void *e
         */
        switch (da_stack.da[depth]->type) {
        case FR_TYPE_VSA:
-               len = encode_vsio_hdr(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
+               len = encode_vsio(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
                break;
 
        case FR_TYPE_TLV:
-               len = encode_tlv_hdr(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
+               len = encode_tlv(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
                break;
 
        default:
-               len = encode_rfc_hdr(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
+               len = encode_rfc(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
                break;
        }
 

diff --git a/src/protocols/dhcpv6/encode.c b/src/protocols/dhcpv6/encode.c
index 41fba4266e70a9ea42d5d409bf8c3cb2890ccd3b..74af039fb914c8ef043355a8417762186d56ca0b 100644 (file)
--- a/src/protocols/dhcpv6/encode.c
+++ b/src/protocols/dhcpv6/encode.c
@@ -41,11 +41,11 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
                            fr_da_stack_t *da_stack, unsigned int depth,
                            fr_dcursor_t *cursor, void *encode_ctx);
 
-static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_rfc(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_hdr(fr_dbuff_t *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);
 
@@ -370,7 +370,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
 }
 
 
-static ssize_t encode_vsio_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_vsio(fr_dbuff_t *dbuff,
                               fr_da_stack_t *da_stack, unsigned int depth,
                               fr_dcursor_t *cursor, void *encode_ctx);
 
@@ -391,12 +391,12 @@ static ssize_t encode_child(fr_dbuff_t *dbuff,
                case FR_TYPE_TLV:
                        if (!da_stack->da[depth + 1]) goto do_child;
 
-                       return encode_tlv_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+                       return encode_tlv(dbuff, da_stack, depth, cursor, encode_ctx);
 
                case FR_TYPE_VSA:
                        if (!da_stack->da[depth + 1]) goto do_child;
 
-                       return encode_vsio_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+                       return encode_vsio(dbuff, da_stack, depth, cursor, encode_ctx);
 
                case FR_TYPE_GROUP:
                        if (!da_stack->da[depth + 1]) goto do_child;
@@ -406,7 +406,7 @@ static ssize_t encode_child(fr_dbuff_t *dbuff,
                        break;
                }
 
-               return encode_rfc_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+               return encode_rfc(dbuff, da_stack, depth, cursor, encode_ctx);
        }
 
        if (!da_stack->da[depth]) {
@@ -429,15 +429,15 @@ do_child:
 
                switch (da_stack->da[depth]->type) {
                case FR_TYPE_VSA:
-                       len = encode_vsio_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_vsio(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
 
                case FR_TYPE_TLV:
-                       len = encode_tlv_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_tlv(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
 
                default:
-                       len = encode_rfc_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_rfc(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
                }
 
@@ -494,7 +494,7 @@ static ssize_t encode_cursor(fr_dbuff_t *dbuff,
  * If it's a standard attribute, then vp->da->attr == attribute.
  * Otherwise, attribute may be something else.
  */
-static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_rfc(fr_dbuff_t *dbuff,
                              fr_da_stack_t *da_stack, unsigned int depth,
                              fr_dcursor_t *cursor, void *encode_ctx)
 {
@@ -532,7 +532,7 @@ static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
        return fr_dbuff_set(dbuff, &work_dbuff);
 }
 
-static ssize_t encode_tlv_hdr(fr_dbuff_t *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)
 {
@@ -589,7 +589,7 @@ static ssize_t encode_tlv_hdr(fr_dbuff_t *dbuff,
  *     .                                                               .
  *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
-static ssize_t encode_vsio_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_vsio(fr_dbuff_t *dbuff,
                               fr_da_stack_t *da_stack, unsigned int depth,
                               fr_dcursor_t *cursor, void *encode_ctx)
 {
@@ -755,7 +755,7 @@ ssize_t fr_dhcpv6_encode_option(fr_dbuff_t *dbuff, fr_dcursor_t *cursor, void *
                        break;
                }
 
-               len = encode_rfc_hdr(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
+               len = encode_rfc(&work_dbuff, &da_stack, depth, cursor, encode_ctx);
                break;
 
        default:

diff --git a/src/protocols/dns/encode.c b/src/protocols/dns/encode.c
index 7c1fbe39a89d1f8a2c06da7340c473f8ca998b4f..d1f063bad27e1d7403133670b6682ea144b447aa 100644 (file)
--- a/src/protocols/dns/encode.c
+++ b/src/protocols/dns/encode.c
@@ -40,11 +40,11 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
                            fr_da_stack_t *da_stack, unsigned int depth,
                            fr_dcursor_t *cursor, void *encode_ctx);
 
-static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_rfc(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_hdr(fr_dbuff_t *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);
 
@@ -245,7 +245,7 @@ static ssize_t encode_child(fr_dbuff_t *dbuff,
                case FR_TYPE_TLV:
                        if (!da_stack->da[depth + 1]) goto do_child;
 
-                       return encode_tlv_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+                       return encode_tlv(dbuff, da_stack, depth, cursor, encode_ctx);
 
                case FR_TYPE_GROUP:
                        if (!da_stack->da[depth + 1]) goto do_child;
@@ -255,7 +255,7 @@ static ssize_t encode_child(fr_dbuff_t *dbuff,
                        break;
                }
 
-               return encode_rfc_hdr(dbuff, da_stack, depth, cursor, encode_ctx);
+               return encode_rfc(dbuff, da_stack, depth, cursor, encode_ctx);
        }
 
        if (!da_stack->da[depth]) {
@@ -278,11 +278,11 @@ do_child:
 
                switch (da_stack->da[depth]->type) {
                case FR_TYPE_TLV:
-                       len = encode_tlv_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_tlv(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
 
                default:
-                       len = encode_rfc_hdr(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
+                       len = encode_rfc(&work_dbuff, da_stack, depth, &child_cursor, encode_ctx);
                        break;
                }
 
@@ -339,7 +339,7 @@ static ssize_t encode_cursor(fr_dbuff_t *dbuff,
  * If it's a standard attribute, then vp->da->attr == attribute.
  * Otherwise, attribute may be something else.
  */
-static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
+static ssize_t encode_rfc(fr_dbuff_t *dbuff,
                              fr_da_stack_t *da_stack, unsigned int depth,
                              fr_dcursor_t *cursor, void *encode_ctx)
 {
@@ -377,7 +377,7 @@ static ssize_t encode_rfc_hdr(fr_dbuff_t *dbuff,
        return fr_dbuff_set(dbuff, &work_dbuff);
 }
 
-static ssize_t encode_tlv_hdr(fr_dbuff_t *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)
 {