Added the new files containing the repeated functions

- Renamed the functions to something more generic
- Added the source and include files to the Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 22e8f94c35d5d647430ec7e84c6051470801fb5c..29e16d9356a83b7b96af55b2ca8a35fd42b8b8bb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -288,6 +288,7 @@ util-hashlist.c util-hashlist.h \
 util-hash-lookup3.c util-hash-lookup3.h \
 util-host-os-info.c util-host-os-info.h \
 util-ioctl.h util-ioctl.c \
+util-ip.h util-ip.c \
 util-logopenfile.h util-logopenfile.c \
 util-magic.c util-magic.h \
 util-memcmp.c util-memcmp.h \

diff --git a/src/util-ip.c b/src/util-ip.c
new file mode 100644 (file)
index 0000000..1f22d86
--- /dev/null
+++ b/src/util-ip.c
@@ -0,0 +1,112 @@
+/* Copyright (C) 2007-2013 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Anoop Saldanha <anoopsaldanha@gmail.com>
+ * \author Duarte Silva <duarte.silva@serializing.me>
+ *
+ * IP addresses related utility functions
+ */
+
+#include "suricata-common.h"
+
+/**
+ * \brief Validates an IPV4 address and returns the network endian arranged
+ *        version of the IPV4 address
+ *
+ * \param addr Pointer to a character string containing an IPV4 address.  A
+ *             valid IPV4 address is a character string containing a dotted
+ *             format of "ddd.ddd.ddd.ddd"
+ *
+ * \retval Pointer to an in_addr instance containing the network endian format
+ *         of the IPV4 address
+ * \retval NULL if the IPV4 address is invalid
+ */
+struct in_addr *ValidateIPV4Address(const char *addr_str)
+{
+    struct in_addr *addr = NULL;
+
+    if ( (addr = SCMalloc(sizeof(struct in_addr))) == NULL) {
+        SCLogError(SC_ERR_FATAL, "Fatal error encountered in ValidateIPV4Address. Exiting...");
+        exit(EXIT_FAILURE);
+    }
+
+    if (inet_pton(AF_INET, addr_str, addr) <= 0) {
+        SCFree(addr);
+        return NULL;
+    }
+
+    return addr;
+}
+
+/**
+ * \brief Validates an IPV6 address and returns the network endian arranged
+ *        version of the IPV6 addresss
+ *
+ * \param addr Pointer to a character string containing an IPV6 address
+ *
+ * \retval Pointer to a in6_addr instance containing the network endian format
+ *         of the IPV6 address
+ * \retval NULL if the IPV6 address is invalid
+ */
+struct in6_addr *ValidateIPV6Address(const char *addr_str)
+{
+    struct in6_addr *addr = NULL;
+
+    if ( (addr = SCMalloc(sizeof(struct in6_addr))) == NULL) {
+        SCLogError(SC_ERR_FATAL, "Fatal error encountered in ValidateIPV6Address. Exiting...");
+        exit(EXIT_FAILURE);
+    }
+
+    if (inet_pton(AF_INET6, addr_str, addr) <= 0) {
+        SCFree(addr);
+        return NULL;
+    }
+
+    return addr;
+}
+
+/**
+ * \brief Culls the non-netmask portion of the IP address. For example an IP
+ *        address 192.168.240.1 would be chopped to 192.168.224.0 against a
+ *        netmask value of 19.
+ *
+ * \param stream  Pointer the IP address that has to be masked
+ * \param netmask The netmask value (cidr) to which the IP address has to be culled
+ * \param key_bitlen  The bitlen of the stream
+ */
+void MaskIPNetblock(uint8_t *stream, uint8_t netmask, uint16_t key_bitlen)
+{
+    int mask = 0;
+    int i = 0;
+    int bytes = key_bitlen / 8;
+
+    for (i = 0; i < bytes; i++) {
+        mask = -1;
+        if ( ((i + 1) * 8) > netmask) {
+            if ( ((i + 1) * 8 - netmask) < 8)
+                mask = -1 << ((i + 1) * 8 - netmask);
+            else
+                mask = 0;
+        }
+        stream[i] &= mask;
+    }
+
+    return;
+}

diff --git a/src/util-ip.h b/src/util-ip.h
new file mode 100644 (file)
index 0000000..25ffe9e
--- /dev/null
+++ b/src/util-ip.h
@@ -0,0 +1,32 @@
+/* Copyright (C) 2007-2013 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Anoop Saldanha <anoopsaldanha@gmail.com>
+ * \author Duarte Silva <duarte.silva@serializing.me>
+ */
+
+#ifndef __UTIL_IP_H__
+#define __UTIL_IP_H__
+
+struct in_addr *ValidateIPV4Address(const char *);
+struct in6_addr *ValidateIPV6Address(const char *);
+void MaskIPNetblock(uint8_t *, int, int);
+
+#endif /* __UTIL_IP_H__ */