doc: create http support group

This patch create an httplayer group and adds related files to
it. It also fixes some typo in documentation string and format.
remotes/origin/master-1.1.x
Eric Leblond 14 years ago committed by Victor Julien
parent b5a3e737c9
commit 60a99915c1

@ -15,6 +15,12 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -2369,3 +2375,6 @@ void HTPParserRegisterTests(void) {
#endif /* UNITTESTS */
}
/**
* @}
*/

@ -15,6 +15,12 @@
* 02110-1301, USA.
*/
/**
* \defgroup httplayer HTTP layer support
*
* @{
*/
/**
* \file
*
@ -123,3 +129,6 @@ void AppLayerHtpPrintStats(void);
#endif /* __APP_LAYER_HTP_H__ */
/**
* @}
*/

@ -223,7 +223,7 @@ typedef struct PacketAlert_ {
uint8_t action; /* Internal num, used for sorting */
uint8_t flags;
/** Pointer to smsg this signature matched on, or
/** Pointer to stream message this signature matched on, or
* NULL if the sig didn't match on a smsg */
void *alert_msg;

@ -167,7 +167,7 @@ int PacketAlertAppend(DetectEngineThreadCtx *det_ctx, Signature *s, Packet *p, u
p->alerts.alerts[p->alerts.cnt].s = s;
} else {
/* We need to make room for this s->num
(a bit ugly with mamcpy but we are planning changes here)*/
(a bit ugly with memcpy but we are planning changes here)*/
for (i = p->alerts.cnt - 1; i >= 0 && p->alerts.alerts[i].order_id > s->order_id; i--) {
memcpy(&p->alerts.alerts[i + 1], &p->alerts.alerts[i], sizeof(PacketAlert));
}

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/** \file
*
* \author Anoop Saldanha <poonaatsoc@gmail.com>
@ -3759,3 +3766,6 @@ void DetectEngineHttpClientBodyRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/** \file
*
* \author Anoop Saldanha <poonaatsoc@gmail.com>
@ -2067,3 +2074,6 @@ void DetectEngineHttpCookieRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/** \file
*
* \author Anoop Saldanha <poonaatsoc@gmail.com>
@ -3218,3 +3225,6 @@ void DetectEngineHttpHeaderRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/** \file
*
* \author Anoop Saldanha <poonaatsoc@gmail.com>
@ -2037,3 +2044,6 @@ void DetectEngineHttpMethodRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/** \file
*
* \author Anoop Saldanha <poonaatsoc@gmail.com>
@ -3129,3 +3136,6 @@ void DetectEngineHttpRawHeaderRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/** \file
*
* \author Anoop Saldanha <poonaatsoc@gmail.com>
@ -3875,3 +3882,6 @@ void DetectEngineHttpRawUriRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -2632,3 +2639,6 @@ void DetectHttpClientBodyRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -1287,3 +1294,6 @@ void DetectHttpCookieRegisterTests (void)
#endif /* UNITTESTS */
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -1835,3 +1842,6 @@ void DetectHttpHeaderRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -1041,3 +1048,6 @@ void DetectHttpMethodRegisterTests(void) {
#endif /* UNITTESTS */
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -1831,3 +1838,6 @@ void DetectHttpRawHeaderRegisterTests(void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -903,3 +910,6 @@ static void DetectHttpRawUriRegisterTests (void)
return;
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -835,3 +842,6 @@ void DetectHttpStatCodeRegisterTests (void)
#endif /* UNITTESTS */
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -712,3 +719,6 @@ void DetectHttpStatMsgRegisterTests (void)
#endif /* UNITTESTS */
}
/**
* @}
*/

@ -15,6 +15,13 @@
* 02110-1301, USA.
*/
/**
* \ingroup httplayer
*
* @{
*/
/**
* \file
*
@ -848,3 +855,6 @@ void DetectHttpUriRegisterTests (void)
#endif /* UNITTESTS */
}
/**
* @}
*/

@ -1404,7 +1404,7 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
det_ctx->sgh = SigMatchSignaturesGetSgh(de_ctx, det_ctx, p);
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_GETSGH);
}
} else {
} else { /* p->flags & PKT_HAS_FLOW */
/* no flow */
/* Even without flow we should match the packet src/dst */
@ -1558,7 +1558,7 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
if (DetectEngineInspectStreamPayload(de_ctx, det_ctx, s, p->flow, smsg_inspect->data.data, smsg_inspect->data.data_len) == 1) {
SCLogDebug("match in smsg %p", smsg);
pmatch = 1;
/* Tell the enigne that this reassembled stream can drop the
/* Tell the engine that this reassembled stream can drop the
* rest of the pkts with no further inspection */
if (s->action == ACTION_DROP)
alert_flags |= PACKET_ALERT_FLAG_DROP_FLOW;

Loading…
Cancel
Save