#include <arpa/inet.h>
#include <assert.h>
-#include <endian.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_ENDIAN_H
+# include <endian.h>
+#endif
+
#include <loc/libloc.h>
+#include <loc/compat.h>
+#include <loc/country.h>
#include <loc/network.h>
#include <loc/private.h>
char country_code[3];
uint32_t asn;
- uint32_t flags;
+ enum loc_network_flags flags;
};
static int valid_prefix(struct in6_addr* address, unsigned int prefix) {
return 0;
}
- // Country codes must be two characters
- if (strlen(country_code) != 2)
+ // Check country code
+ if (!loc_country_code_is_valid(country_code))
return -EINVAL;
- for (unsigned int i = 0; i < 3; i++) {
- network->country_code[i] = country_code[i];
- }
+ loc_country_code_copy(network->country_code, country_code);
return 0;
}
LOC_EXPORT int loc_network_match_country_code(struct loc_network* network, const char* country_code) {
- // Country codes must be two characters
- if (strlen(country_code) != 2)
+ // Check country code
+ if (!loc_country_code_is_valid(country_code))
return -EINVAL;
return (network->country_code[0] == country_code[0])
LOC_EXPORT int loc_network_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj) {
// Add country code
- for (unsigned int i = 0; i < 2; i++) {
- dbobj->country_code[i] = network->country_code[i] ? network->country_code[i] : '\0';
- }
+ loc_country_code_copy(dbobj->country_code, network->country_code);
// Add ASN
dbobj->asn = htobe32(network->asn);
// Flags
- dbobj->flags = htobe32(network->flags);
+ dbobj->flags = htobe16(network->flags);
return 0;
}
LOC_EXPORT int loc_network_new_from_database_v0(struct loc_ctx* ctx, struct loc_network** network,
struct in6_addr* address, unsigned int prefix, const struct loc_database_network_v0* dbobj) {
+ char country_code[3];
+
int r = loc_network_new(ctx, network, address, prefix);
if (r)
return r;
// Import country code
- char country_code[3];
- for (unsigned int i = 0; i < 2; i++) {
- country_code[i] = dbobj->country_code[i];
- }
- country_code[2] = '\0';
+ loc_country_code_copy(country_code, dbobj->country_code);
r = loc_network_set_country_code(*network, country_code);
if (r)
return r;
// Import flags
- r = loc_network_set_flag(*network, be32toh(dbobj->flags));
+ r = loc_network_set_flag(*network, be16toh(dbobj->flags));
if (r)
return r;