From 19d701ddf07d855128ded0cf2b573ce468e3bdd6 Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Wed, 20 Jan 2016 01:10:01 +0000 Subject: Removing Suricata and Audit from source repo, and updated build.sh to avoid building suricata. Will re-address this in C release via tar balls. Change-Id: I3710076f8b7f3313cb3cb5260c4eb0a6834d4f6e Signed-off-by: Ashlee Young --- framework/src/suricata/src/util-ip.c | 112 ----------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 framework/src/suricata/src/util-ip.c (limited to 'framework/src/suricata/src/util-ip.c') diff --git a/framework/src/suricata/src/util-ip.c b/framework/src/suricata/src/util-ip.c deleted file mode 100644 index 1f22d864..00000000 --- a/framework/src/suricata/src/util-ip.c +++ /dev/null @@ -1,112 +0,0 @@ -/* 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 - * \author Duarte Silva - * - * 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; -} -- cgit 1.2.3-korg