/*
subnet_parse.c -- handle subnet parsing
- Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-2021 Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
}
}
+bool subnetcheck(const subnet_t subnet) {
+ if(((subnet.type == SUBNET_IPV4)
+ && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(subnet.net.ipv4.address)))
+ || ((subnet.type == SUBNET_IPV6)
+ && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(subnet.net.ipv6.address)))) {
+ return false;
+ }
+
+ return true;
+}
+
bool maskcheck(const void *va, int masklen, int len) {
int i;
const char *a = va;
}
int subnet_compare(const subnet_t *a, const subnet_t *b) {
- int result;
-
- result = a->type - b->type;
+ int result = (int)a->type - (int)b->type;
if(result) {
return result;
/* Ascii representation of subnets */
bool str2net(subnet_t *subnet, const char *subnetstr) {
- char str[1024];
+ char str[64];
strncpy(str, subnetstr, sizeof(str));
str[sizeof(str) - 1] = 0;
int consumed;
if(sscanf(str, "%hx:%hx:%hx:%hx:%hx:%hx%n", &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &consumed) >= 6 && !str[consumed]) {
/*
Normally we should check that each part has two digits to prevent ambiguities.
- However, in old tinc versions net2str() will agressively return MAC addresses with one-digit parts,
+ However, in old tinc versions net2str() will aggressively return MAC addresses with one-digit parts,
so we have to accept them otherwise we would be unable to parse ADD_SUBNET messages.
*/
if(prefixlength >= 0) {
return true;
}
- if(sscanf(str, "%hu.%hu.%hu.%hu%n", &x[0], &x[1], &x[2], &x[3], &consumed) >= 4 && !str[consumed]) {
+ if(inet_pton(AF_INET, str, &subnet->net.ipv4.address)) {
if(prefixlength == -1) {
prefixlength = 32;
}
subnet->net.ipv4.prefixlength = prefixlength;
subnet->weight = weight;
- for(int i = 0; i < 4; i++) {
- if(x[i] > 255) {
- return false;
- }
-
- subnet->net.ipv4.address.x[i] = x[i];
- }
-
return true;
}
- /* IPv6 */
-
- char *last_colon = strrchr(str, ':');
-
- if(last_colon && sscanf(last_colon, ":%hu.%hu.%hu.%hu%n", &x[0], &x[1], &x[2], &x[3], &consumed) >= 4 && !last_colon[consumed]) {
- /* Dotted quad suffix notation, convert to standard IPv6 notation */
- for(int i = 0; i < 4; i++)
- if(x[i] > 255) {
- return false;
- }
-
- snprintf(last_colon, sizeof(str) - (last_colon - str), ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
- }
-
- char *double_colon = strstr(str, "::");
-
- if(double_colon) {
- /* Figure out how many zero groups we need to expand */
- int zero_group_count = 8;
-
- for(const char *cur = str; *cur; cur++)
- if(*cur != ':') {
- zero_group_count--;
-
- while(cur[1] && cur[1] != ':') {
- cur++;
- }
- }
-
- if(zero_group_count < 1) {
- return false;
- }
-
- /* Split the double colon in the middle to make room for zero groups */
- double_colon++;
- memmove(double_colon + (zero_group_count * 2 - 1), double_colon, strlen(double_colon) + 1);
-
- /* Write zero groups in the resulting gap, overwriting the second colon */
- for(int i = 0; i < zero_group_count; i++) {
- memcpy(&double_colon[i * 2], "0:", 2);
- }
-
- /* Remove any leading or trailing colons */
- if(str[0] == ':') {
- memmove(&str[0], &str[1], strlen(&str[1]) + 1);
- }
-
- if(str[strlen(str) - 1] == ':') {
- str[strlen(str) - 1] = 0;
- }
- }
-
- if(sscanf(str, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx%n",
- &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7], &consumed) >= 8 && !str[consumed]) {
+ if(inet_pton(AF_INET6, str, &subnet->net.ipv6.address)) {
if(prefixlength == -1) {
prefixlength = 128;
}
subnet->net.ipv6.prefixlength = prefixlength;
subnet->weight = weight;
- for(int i = 0; i < 8; i++) {
- subnet->net.ipv6.address.x[i] = htons(x[i]);
- }
-
return true;
}
bool net2str(char *netstr, int len, const subnet_t *subnet) {
if(!netstr || !subnet) {
- logger(DEBUG_ALWAYS, LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
+ logger(DEBUG_ALWAYS, LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", (void *)netstr, (void *)subnet);
return false;
}
switch(subnet->type) {
case SUBNET_MAC:
- result = snprintf(netstr, len, "%02x:%02x:%02x:%02x:%02x:%02x",
- subnet->net.mac.address.x[0],
- subnet->net.mac.address.x[1],
- subnet->net.mac.address.x[2],
- subnet->net.mac.address.x[3],
- subnet->net.mac.address.x[4],
- subnet->net.mac.address.x[5]);
- netstr += result;
- len -= result;
+ snprintf(netstr, len, "%02x:%02x:%02x:%02x:%02x:%02x",
+ subnet->net.mac.address.x[0],
+ subnet->net.mac.address.x[1],
+ subnet->net.mac.address.x[2],
+ subnet->net.mac.address.x[3],
+ subnet->net.mac.address.x[4],
+ subnet->net.mac.address.x[5]);
break;
case SUBNET_IPV4:
- result = snprintf(netstr, len, "%u.%u.%u.%u",
- subnet->net.ipv4.address.x[0],
- subnet->net.ipv4.address.x[1],
- subnet->net.ipv4.address.x[2],
- subnet->net.ipv4.address.x[3]);
- netstr += result;
- len -= result;
+ inet_ntop(AF_INET, &subnet->net.ipv4.address, netstr, len);
prefixlength = subnet->net.ipv4.prefixlength;
if(prefixlength == 32) {
break;
case SUBNET_IPV6: {
- /* Find the longest sequence of consecutive zeroes */
- int max_zero_length = 0;
- int max_zero_length_index = 0;
- int current_zero_length = 0;
- int current_zero_length_index = 0;
-
- for(int i = 0; i < 8; i++) {
- if(subnet->net.ipv6.address.x[i] != 0) {
- current_zero_length = 0;
- } else {
- if(current_zero_length == 0) {
- current_zero_length_index = i;
- }
-
- current_zero_length++;
-
- if(current_zero_length > max_zero_length) {
- max_zero_length = current_zero_length;
- max_zero_length_index = current_zero_length_index;
- }
- }
- }
-
- /* Print the address */
- for(int i = 0; i < 8;) {
- if(max_zero_length > 1 && max_zero_length_index == i) {
- /* Shorten the representation as per RFC 5952 */
- const char *const FORMATS[] = { "%.1s", "%.2s", "%.3s" };
- const char *const *format = &FORMATS[0];
-
- if(i == 0) {
- format++;
- }
-
- if(i + max_zero_length == 8) {
- format++;
- }
-
- result = snprintf(netstr, len, *format, ":::");
- i += max_zero_length;
- } else {
- result = snprintf(netstr, len, "%x:", ntohs(subnet->net.ipv6.address.x[i]));
- i++;
- }
-
- netstr += result;
- len -= result;
- }
-
- /* Remove the trailing colon */
- netstr--;
- len++;
- *netstr = 0;
-
+ inet_ntop(AF_INET6, &subnet->net.ipv6.address, netstr, len);
prefixlength = subnet->net.ipv6.prefixlength;
if(prefixlength == 128) {
exit(1);
}
+ size_t used = strlen(netstr);
+ netstr += used;
+ len -= used;
+
if(prefixlength >= 0) {
result = snprintf(netstr, len, "/%d", prefixlength);
netstr += result;
projects / tinc / blobdiff