lib: Add support and helpers for IPv6 host addresses

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 8e37348c07ccd9787ee7fe0531eb2ac45b3d9649..41707da09ab0d7345c8d0a0a2d2f9d1b48f43517 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -253,7 +253,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
                len +=  4 + if_info->hwaddr_size +
                        4 + optional_strlen(if_info->name) +
                        sizeof(if_info->link) +
-                       4 + optional_strlen(if_info->address);
+                       4 + optional_strlen(if_info->address) +
+                       4 + optional_strlen(if_info->address_v6);
        }
 
        for (i = 0; i < sysinfo->n_blockdevs; i++) {
@@ -509,6 +510,7 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
                pos += sizeof(bool);
 
                pos += pb_protocol_serialise_string(pos, if_info->address);
+               pos += pb_protocol_serialise_string(pos, if_info->address_v6);
        }
 
        *(uint32_t *)pos = __cpu_to_be32(sysinfo->n_blockdevs);
@@ -1046,6 +1048,8 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 
                if (read_string(if_info, &pos, &len, &if_info->address))
                        goto out;
+               if (read_string(if_info, &pos, &len, &if_info->address_v6))
+                       goto out;
 
                sysinfo->interfaces[i] = if_info;
        }