Merge remote-tracking branch 'sektioneins/master'

1 files changed, 37 insertions, 4 deletions

diff --git a/src/sp_network_utils.c b/src/sp_network_utils.c
index 31e8426..943c418 100644
--- a/src/sp_network_utils.c
+++ b/src/sp_network_utils.c
@@ -85,16 +85,17 @@ int get_ip_and_cidr(char *ip, sp_cidr *cidr) {
   char *mask = strchr(ip, '/');
 
   if (NULL == mask) {
-    sp_log_err(
-        "config",
-        "'%s' isn't a valid network mask, it seems that you forgot a '/'.", ip);
+    sp_log_err("config", "'%s' isn't a valid network mask, it seems that you forgot a '/'.", ip);
     return -1;
   }
 
-  if (sscanf(mask + 1, "%hhu", &(cidr->mask)) != 1) {
+  int masklen = strlen(mask+1);
+  int imask = atoi(mask+1);
+  if (masklen < 1 || masklen > 3 || !isdigit(*(mask+1)) || (masklen >= 2 && !isdigit(*(mask+2)))  || (masklen == 3 && !isdigit(*(mask+3))) || imask < 0 || imask > 128) {
     sp_log_err("config", "'%s' isn't a valid network mask.", mask + 1);
     return -1;
   }
+  cidr->mask = (uint8_t)imask;
 
   ip[mask - ip] = '\0';  // NULL the '/' char
 
@@ -113,5 +114,37 @@ int get_ip_and_cidr(char *ip, sp_cidr *cidr) {
   }
 
   ip[mask - ip] = '/';
+  if (cidr->ip_version < 0) {
+    sp_log_err("config", "Weird ip (%s) family", ip);
+    return -1;
+  }
+
   return 0;
 }
+
+bool /* success */ get_ip_str(char *dst, size_t dst_len, sp_cidr *cidr) {
+  size_t ipstr_len = 0;
+  void *ip = NULL;
+  switch (cidr->ip_version) {
+    case AF_INET:
+      ipstr_len = INET_ADDRSTRLEN;
+      ip = &cidr->ip.ipv4;
+      break;
+    case AF_INET6:
+      ipstr_len = INET6_ADDRSTRLEN;
+      ip = &cidr->ip.ipv6;
+      break;
+    default:
+      return false;
+  }
+
+  if (dst_len < ipstr_len + 1 + 3 + 1) {
+    return false;
+  }
+  if (!inet_ntop(cidr->ip_version, ip, dst, ipstr_len)) {
+    return false;
+  }
+  ipstr_len = strlen(dst);
+  snprintf(dst + ipstr_len, dst_len - ipstr_len, "/%d", cidr->mask);
+  return true;
+}
\ No newline at end of file