From fafb073b7d98bd58a6253fd682c8d6a9a901b209 Mon Sep 17 00:00:00 2001
From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Thu, 14 Feb 2019 10:53:19 -0600
Subject: [PATCH] Update usage of the libcmscodec library

---
 src/address.c            | 8 ++++----
 src/address.h            | 6 +++---
 src/object/certificate.c | 1 -
 src/resource.c           | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/address.c b/src/address.c
index 7e6b953d..e7c5b6bc 100644
--- a/src/address.c
+++ b/src/address.c
@@ -57,10 +57,10 @@ ipv6_suffix_mask(unsigned int prefix_len, struct in6_addr *result)
 }
 
 /**
- * Translates an `IPAddress2_t` to its equivalent `struct ipv4_prefix`.
+ * Translates an `IPAddress_t` to its equivalent `struct ipv4_prefix`.
  */
 int
-prefix4_decode(IPAddress2_t *str, struct ipv4_prefix *result)
+prefix4_decode(IPAddress_t *str, struct ipv4_prefix *result)
 {
 	int len;
 
@@ -93,10 +93,10 @@ prefix4_decode(IPAddress2_t *str, struct ipv4_prefix *result)
 }
 
 /**
- * Translates an `IPAddress2_t` to its equivalent `struct ipv6_prefix`.
+ * Translates an `IPAddress_t` to its equivalent `struct ipv6_prefix`.
  */
 int
-prefix6_decode(IPAddress2_t *str, struct ipv6_prefix *result)
+prefix6_decode(IPAddress_t *str, struct ipv6_prefix *result)
 {
 	struct in6_addr suffix;
 	int len;
diff --git a/src/address.h b/src/address.h
index 5d8e24eb..43e8c79e 100644
--- a/src/address.h
+++ b/src/address.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <netinet/in.h>
-#include <libcmscodec/IPAddress2.h>
+#include <libcmscodec/IPAddress.h>
 #include <libcmscodec/IPAddressRange.h>
 
 struct ipv4_prefix {
@@ -30,8 +30,8 @@ uint32_t u32_suffix_mask(unsigned int);
 uint32_t be32_suffix_mask(unsigned int);
 void ipv6_suffix_mask(unsigned int, struct in6_addr *);
 
-int prefix4_decode(IPAddress2_t *, struct ipv4_prefix *);
-int prefix6_decode(IPAddress2_t *, struct ipv6_prefix *);
+int prefix4_decode(IPAddress_t *, struct ipv4_prefix *);
+int prefix6_decode(IPAddress_t *, struct ipv6_prefix *);
 int range4_decode(IPAddressRange_t *, struct ipv4_range *);
 int range6_decode(IPAddressRange_t *, struct ipv6_range *);
 
diff --git a/src/object/certificate.c b/src/object/certificate.c
index 4d4fe435..f7b6b6da 100644
--- a/src/object/certificate.c
+++ b/src/object/certificate.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdint.h> /* SIZE_MAX */
-#include <libcmscodec/SubjectInfoAccessSyntax.h>
 #include <libcmscodec/SubjectPublicKeyInfo.h>
 #include <libcmscodec/IPAddrBlocks.h>
 
diff --git a/src/resource.c b/src/resource.c
index f58a0eb9..b637e41b 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -114,7 +114,7 @@ inherit_aors(struct resources *resources, int family)
 }
 
 static int
-add_prefix4(struct resources *resources, IPAddress2_t *addr)
+add_prefix4(struct resources *resources, IPAddress_t *addr)
 {
 	struct resources *parent;
 	struct ipv4_prefix prefix;
@@ -159,7 +159,7 @@ add_prefix4(struct resources *resources, IPAddress2_t *addr)
 }
 
 static int
-add_prefix6(struct resources *resources, IPAddress2_t *addr)
+add_prefix6(struct resources *resources, IPAddress_t *addr)
 {
 	struct resources *parent;
 	struct ipv6_prefix prefix;
@@ -204,7 +204,7 @@ add_prefix6(struct resources *resources, IPAddress2_t *addr)
 }
 
 static int
-add_prefix(struct resources *resources, int family, IPAddress2_t *addr)
+add_prefix(struct resources *resources, int family, IPAddress_t *addr)
 {
 	switch (family) {
 	case AF_INET:
-- 
2.47.3