refactoring, tests for address engine ipv4

src/detect-engine-address-ipv4.h

@@ -1,19 +1,20 @@
-/* Address part of the detection engine.
+/** Copyright (c) 2009 Open Information Security Foundation.
- *
+ *  \author Victor Julien <victor@inliniac.net>
- * Copyright (c) 2008 Victor Julien
  */
 
 #ifndef __DETECT_ENGINE_ADDRESS_IPV4_H__
 #define __DETECT_ENGINE_ADDRESS_IPV4_H__
 
-//int DetectAddressCmpIPv4(DetectAddressData *, DetectAddressData *);
-//int DetectAddressCutIPv4(DetectAddressData *, DetectAddressData *, DetectAddressData **);
 int DetectAddressCutNotIPv4(DetectAddress *, DetectAddress **);
 int DetectAddressCmpIPv4(DetectAddress *a, DetectAddress *b);
 
-int DetectAddressCutIPv4(DetectEngineCtx *, DetectAddress *, DetectAddress *, DetectAddress **);
+int DetectAddressCutIPv4(DetectEngineCtx *, DetectAddress *,
-int DetectAddressJoinIPv4(DetectEngineCtx *, DetectAddress *target, DetectAddress *source);
+                         DetectAddress *, DetectAddress **);
+int DetectAddressJoinIPv4(DetectEngineCtx *, DetectAddress *target,
+                          DetectAddress *source);
 int DetectAddressIsCompleteIPSpaceIPv4(DetectAddress *);
 
+void DetectAddressIPv4Tests(void);
+
 #endif /* __DETECT_ENGINE_ADDRESS_IPV4_H__ */
 

src/detect-engine-address.c

@@ -3974,6 +3974,7 @@ int AddressTestParseInvalidMask03(void)
 void DetectAddressTests(void)
 {
 #ifdef UNITTESTS
+    DetectAddressIPv4Tests();
     DetectAddressIPv6Tests();
 
     UtRegisterTest("AddressTestParse01", AddressTestParse01, 1);

src/util-error.h

@@ -1,5 +1,8 @@
 /** Copyright (c) 2009 Open Information Security Foundation.
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
+ *
+ * \todo Needs refining of the error codes.  Renaming with a prefix of SC_ERR,
+ *       removal of duplicates and entries have to be made in util-error.c
  */
 
 #ifndef __ERROR_H__