Small uri cleanups.

src/Makefile.am

@@ -56,7 +56,7 @@ detect-engine-siggroup.c detect-engine-siggroup.h \
 detect-engine-mpm.c detect-engine-mpm.h \
 detect-engine-iponly.c detect-engine-iponly.h \
 detect-engine-payload.c detect-engine-payload.h \
-detect-engine-uricontent.c detect-engine-uricontent.h \
+detect-engine-uri.c detect-engine-uri.h \
 detect-parse.c detect-parse.h \
 detect-ack.c detect-ack.h \
 detect-seq.c detect-seq.h \

src/detect-distance.c

@@ -65,7 +65,7 @@ static int DetectDistanceSetup (DetectEngineCtx *de_ctx, Signature *s, char *dis
                 }
             }
 
-            pm = DetectUriGetLastPattern(s->umatch_tail->prev);
+            pm = DetectUricontentGetLastPattern(s->umatch_tail->prev);
             if (pm == NULL) {
                 SCLogError(SC_ERR_DISTANCE_MISSING_CONTENT, "distance needs two preceeding content options");
                 goto error;

src/detect-engine-uri.c

@@ -1,7 +1,11 @@
-/**
+/* Copyright (c) 2010 Open Information Security Foundation */
- * Copyright (c) 2009 Open Information Security Foundation
+
+/** \file
+ *
+ *  \author Victor Julien <victor@inliniac.net>
+ *  \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  *
- * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
+ *  Based on detect-engine-payload.c
  */
 
 #include "suricata-common.h"

src/detect-uricontent.c

@@ -118,7 +118,7 @@ void DetectUricontentPrint(DetectUricontentData *cd)
  * \retval pointer to the SigMatch that has the previous SigMatch
  *                 of type DetectUricontent
  */
-SigMatch *DetectUriGetLastPattern(SigMatch *sm)
+SigMatch *DetectUricontentGetLastPattern(SigMatch *sm)
 {
     if (sm == NULL)
         return NULL;

src/detect-uricontent.h

@@ -34,7 +34,7 @@ typedef struct DetectUricontentData_ {
 void DetectUricontentRegister (void);
 uint32_t DetectUricontentMaxId(DetectEngineCtx *);
 uint32_t DetectUricontentInspectMpm(ThreadVars *th_v, DetectEngineThreadCtx *det_ctx, void *alstate);
-SigMatch *DetectUriGetLastPattern(SigMatch *);
+SigMatch *DetectUricontentGetLastPattern(SigMatch *);
 void DetectUricontentPrint(DetectUricontentData *);
 
 #endif /* __DETECT_URICONTENT_H__ */

src/detect-within.c

@@ -85,7 +85,7 @@ static int DetectWithinSetup (DetectEngineCtx *de_ctx, Signature *s, char *withi
                 }
             }
 
-            pm = DetectUriGetLastPattern(s->umatch_tail->prev);
+            pm = DetectUricontentGetLastPattern(s->umatch_tail->prev);
             if (pm == NULL) {
                 SCLogError(SC_ERR_WITHIN_MISSING_CONTENT, "within needs two preceeding content options");
                 goto error;

src/detect.c

@@ -17,8 +17,9 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-iponly.h"
 #include "detect-engine-threshold.h"
+
 #include "detect-engine-payload.h"
-#include "detect-engine-uricontent.h"
+#include "detect-engine-uri.h"
 
 #include "detect-http-cookie.h"
 #include "detect-http-method.h"