Move formatting functions to formats.c

diff --git a/trusts/Makefile.in b/trusts/Makefile.in
index a9a4369904f1045431f6d8c9a0c4afb4c2ef84f7..ee9c59bfcc9c23da9faef0db3ea7ca3cc2a31074 100644 (file)
--- a/trusts/Makefile.in
+++ b/trusts/Makefile.in
@@ -3,6 +3,6 @@
 .PHONY: all
 all: trusts.so trusts_commands.so
 
-trusts.so: trusts.o migration.o db.o db-migration.o data.o
+trusts.so: trusts.o migration.o db.o db-migration.o data.o formats.o
 
 trusts_commands.so: trusts_commands.o

diff --git a/trusts/formats.c b/trusts/formats.c
new file mode 100644 (file)
index 0000000..a3397df
--- /dev/null
+++ b/trusts/formats.c
@@ -0,0 +1,71 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <time.h>
+
+int trusts_parsecidr(const char *host, uint32_t *ip, short *mask) {
+  unsigned int octet1 = 0, octet2 = 0, octet3 = 0, octet4 = 0, umask = 32;
+
+  if(sscanf(host, "%u.%u.%u.%u/%u", &octet1, &octet2, &octet3, &octet4, &umask) != 5)
+    if(sscanf(host, "%u.%u.%u/%u", &octet1, &octet2, &octet3, &umask) != 4)
+      if(sscanf(host, "%u.%u/%u", &octet1, &octet2, &umask) != 3)
+        if(sscanf(host, "%u/%u", &octet1, &umask) != 2)
+          if(sscanf(host, "%u.%u.%u.%u", &octet1, &octet2, &octet3, &octet4) != 4)
+            return 0;
+
+  if(octet1 > 255 || octet2 > 255 || octet3 > 255 || octet4 > 255 || umask > 32)
+    return 0;
+
+  *ip = (octet1 << 24) | (octet2 << 16) | (octet3 << 8) | octet4;
+  *mask = umask;
+
+  return 1;
+}
+
+/* returns mask pre-anded */
+int trusts_str2cidr(const char *host, uint32_t *ip, uint32_t *mask) {
+  uint32_t result;
+  short smask;
+
+  if(!trusts_parsecidr(host, &result, &smask))
+    return 0;
+
+  if(smask == 0) {
+    *mask = 0;
+  } else {
+    *mask = 0xffffffff << (32 - smask);
+  }
+  *ip = result & *mask;
+
+  return 1;
+}
+
+char *trusts_cidr2str(uint32_t ip, uint32_t mask) {
+  static char buf[100];
+  char maskbuf[10];
+
+  if(mask != 0) {
+    /* count number of trailing zeros */
+    float f = (float)(mask & -mask);
+
+    mask = 32 - ((*(unsigned int *)&f >> 23) - 0x7f);
+  }
+
+  if(mask < 32) {
+    snprintf(maskbuf, sizeof(maskbuf), "/%u", mask);
+  } else {
+    maskbuf[0] = '\0';
+  }
+
+  snprintf(buf, sizeof(buf), "%u.%u.%u.%u%s", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff, maskbuf);
+
+  return buf;
+}
+
+char *trusts_timetostr(time_t t) {
+  static char buf[100];
+
+  strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", localtime(&t));
+
+  return buf;
+}
+

diff --git a/trusts/trusts.c b/trusts/trusts.c
index b6e0d0b0492e1e7ee870d1c4ea7e9f0f0cfdc164..6115668567fdf31ceda83a2d5827fa78c9be7be5 100644 (file)
--- a/trusts/trusts.c
+++ b/trusts/trusts.c
@@ -1,7 +1,6 @@
 #include "trusts.h"
 #include "../core/hooks.h"
 #include <stdio.h>
-#include <time.h>
 
 int trusts_loaddb(void);
 void trusts_closedb(void);
@@ -20,14 +19,6 @@ void _fini(void) {
   deregisterhook(HOOK_CORE_STATSREQUEST, statusfn);
 }
 
-char *trusts_timetostr(time_t t) {
-  static char buf[100];
-
-  strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", localtime(&t));
-
-  return buf;
-}
-
 static void statusfn(int hooknum, void *arg) {
   if((long)arg > 10) {
     char message[100];
@@ -45,62 +36,3 @@ static void statusfn(int hooknum, void *arg) {
     triggerhook(HOOK_CORE_STATSREPLY, message);
   }  
 }
-
-int trusts_parsecidr(const char *host, uint32_t *ip, short *mask) {
-  unsigned int octet1 = 0, octet2 = 0, octet3 = 0, octet4 = 0, umask = 32;
-
-  if(sscanf(host, "%u.%u.%u.%u/%u", &octet1, &octet2, &octet3, &octet4, &umask) != 5)
-    if(sscanf(host, "%u.%u.%u/%u", &octet1, &octet2, &octet3, &umask) != 4)
-      if(sscanf(host, "%u.%u/%u", &octet1, &octet2, &umask) != 3)
-        if(sscanf(host, "%u/%u", &octet1, &umask) != 2)
-          if(sscanf(host, "%u.%u.%u.%u", &octet1, &octet2, &octet3, &octet4) != 4)
-            return 0;
-
-  if(octet1 > 255 || octet2 > 255 || octet3 > 255 || octet4 > 255 || umask > 32)
-    return 0;
-
-  *ip = (octet1 << 24) | (octet2 << 16) | (octet3 << 8) | octet4;
-  *mask = umask;
-
-  return 1;
-}
-
-/* returns mask pre-anded */
-int trusts_str2cidr(const char *host, uint32_t *ip, uint32_t *mask) {
-  uint32_t result;
-  short smask;
-
-  if(!trusts_parsecidr(host, &result, &smask))
-    return 0;
-
-  if(smask == 0) {
-    *mask = 0;
-  } else {
-    *mask = 0xffffffff << (32 - smask);
-  }
-  *ip = result & *mask;
-
-  return 1;
-}
-
-char *trusts_cidr2str(uint32_t ip, uint32_t mask) {
-  static char buf[100];
-  char maskbuf[10];
-
-  if(mask != 0) {
-    /* count number of trailing zeros */
-    float f = (float)(mask & -mask);
-
-    mask = 32 - ((*(unsigned int *)&f >> 23) - 0x7f);
-  }
-
-  if(mask < 32) {
-    snprintf(maskbuf, sizeof(maskbuf), "/%u", mask);
-  } else {
-    maskbuf[0] = '\0';
-  }
-
-  snprintf(buf, sizeof(buf), "%u.%u.%u.%u%s", (ip >> 24) & 0xff, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff, maskbuf);
-
-  return buf;
-}

diff --git a/trusts/trusts.h b/trusts/trusts.h
index cc85b0180b4695eb982700f8eb62b37bfaaff360..861313a685bfc82981d161001e45526572ec3b8d 100644 (file)
--- a/trusts/trusts.h
+++ b/trusts/trusts.h
@@ -40,12 +40,12 @@ typedef struct trustgroup {
   struct trustgroup *next;
 } trustgroup;
 
-/* trusts.c */
-char *trusts_timetostr(time_t);
-
 /* db.c */
 extern int trustsdbloaded;
 void trusts_reloaddb(void);
+
+/* formats.c */
+char *trusts_timetostr(time_t);
 int trusts_parsecidr(const char *, uint32_t *, short *);
 int trusts_str2cidr(const char *, uint32_t *, uint32_t *);
 char *trusts_cidr2str(uint32_t, uint32_t);