Update usage of the libcmscodec library

diff --git a/src/address.c b/src/address.c
index 7e6b953d1bd9914f900cef64b87dd532df011892..e7c5b6bcb377a994c81ad78c1ec1608fa515f578 100644 (file)
--- 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 5d8e24eb359b62dc3ecca3abe738440e8f4f8c38..43e8c79e132504d4b6d9d5213eec7e5f56469570 100644 (file)
--- 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 4d4fe435c432b9d37e2f21c16b944cddc6b0687c..f7b6b6da397049927c0e03b0aa673ee34efeeaed 100644 (file)
--- 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 f58a0eb972c0becc60c54eb8bdc16787103f43f4..b637e41b554dbcb583cdefe765b14af508b49bb0 100644 (file)
--- 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: