]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
s/fr_cursor/fr_dcursor/ in dhcpv4/base.c
authorNick Porter <nick@portercomputing.co.uk>
Sat, 9 Jan 2021 14:55:56 +0000 (14:55 +0000)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 21 Jan 2021 23:05:49 +0000 (23:05 +0000)
src/protocols/dhcpv4/base.c

index 43b9175ffca328b6c827cab45543fd9c28425b85..27eabebf8ebcd852196d826eedfb2e5b002196c0 100644 (file)
@@ -296,7 +296,7 @@ ssize_t fr_dhcpv4_encode(uint8_t *buffer, size_t buflen, dhcp_packet_t *original
 
 ssize_t fr_dhcpv4_encode_dbuff(fr_dbuff_t *dbuff, dhcp_packet_t *original, int code, uint32_t xid, fr_pair_list_t *vps)
 {
-       fr_cursor_t     cursor;
+       fr_dcursor_t    cursor;
        fr_pair_t       *vp;
        ssize_t len;
        fr_dbuff_t      work_dbuff = FR_DBUFF_NO_ADVANCE(dbuff);
@@ -482,13 +482,13 @@ ssize_t fr_dhcpv4_encode_dbuff(fr_dbuff_t *dbuff, dhcp_packet_t *original, int c
         *  operates correctly. This changes the order of the list, but never mind...
         */
        fr_pair_list_sort(vps, fr_dhcpv4_attr_cmp);
-       fr_cursor_talloc_iter_init(&cursor, vps, fr_proto_next_encodable, dict_dhcpv4, fr_pair_t);
+       fr_dcursor_talloc_iter_init(&cursor, vps, fr_proto_next_encodable, dict_dhcpv4, fr_pair_t);
 
        /*
         *  Each call to fr_dhcpv4_encode_option will encode one complete DHCP option,
         *  and sub options.
         */
-       while ((vp = fr_cursor_current(&cursor))) {
+       while ((vp = fr_dcursor_current(&cursor))) {
                /*
                 *      The encoder skips message type, and returns
                 *      "len==0" for it.  We want to allow that, BUT
@@ -497,7 +497,7 @@ ssize_t fr_dhcpv4_encode_dbuff(fr_dbuff_t *dbuff, dhcp_packet_t *original, int c
                 *      manually, too.
                 */
                if (vp->da == attr_dhcp_message_type) {
-                       (void) fr_cursor_next(&cursor);
+                       (void) fr_dcursor_next(&cursor);
                        continue;
                }