aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use u8 for ipproto

Browse Source 
In a few places in app layer and unittests u16 was used.
pull/753/head
Victor Julien 13 years ago
parent 8527b8e08e
commit 5cdeadb33d
10 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File

14
src/app-layer-detect-proto.c
Unescape Escape View File

@ -164,7 +164,7 @@ AppLayerProtoDetectCtx alpd_ctx;
static uint16_t AppLayerProtoDetectPMMatchSignature(AppLayerProtoDetectPMSignature *s, static uint16_t AppLayerProtoDetectPMMatchSignature(AppLayerProtoDetectPMSignature *s,
uint8_t *buf, uint16_t buflen, uint8_t *buf, uint16_t buflen,
uint16_t ipproto) uint8_t ipproto)
{ {
SCEnter(); SCEnter();
uint16_t proto = ALPROTO_UNKNOWN; uint16_t proto = ALPROTO_UNKNOWN;
@ -937,7 +937,7 @@ static void AppLayerProtoDetectPMGetIpprotos(AppProto alproto,
int pat_id, max_pat_id; int pat_id, max_pat_id;
int i, j; int i, j;
uint16_t ipproto; uint8_t ipproto;
for (i = 0; i < FLOW_PROTO_DEFAULT; i++) { for (i = 0; i < FLOW_PROTO_DEFAULT; i++) {
ipproto = FlowGetReverseProtoMapping(i); ipproto = FlowGetReverseProtoMapping(i);
@ -1153,7 +1153,7 @@ static int AppLayerProtoDetectPMAddSignature(AppLayerProtoDetectPMCtx *ctx, Dete
SCReturnInt(ret); SCReturnInt(ret);
} }
static int AppLayerProtoDetectPMRegisterPattern(uint16_t ipproto, uint16_t alproto, static int AppLayerProtoDetectPMRegisterPattern(uint8_t ipproto, uint16_t alproto,
char *pattern, char *pattern,
uint16_t depth, uint16_t offset, uint16_t depth, uint16_t offset,
uint8_t direction, uint8_t direction,
@ -1284,7 +1284,7 @@ int AppLayerProtoDetectPrepareState(void)
/***** PP registration *****/ /***** PP registration *****/
void AppLayerProtoDetectPPRegister(uint16_t ipproto, void AppLayerProtoDetectPPRegister(uint8_t ipproto,
char *portstr, char *portstr,
uint16_t alproto, uint16_t alproto,
uint16_t min_depth, uint16_t max_depth, uint16_t min_depth, uint16_t max_depth,
@ -1317,7 +1317,7 @@ void AppLayerProtoDetectPPRegister(uint16_t ipproto,
} }
void AppLayerProtoDetectPPParseConfPorts(const char *ipproto_name, void AppLayerProtoDetectPPParseConfPorts(const char *ipproto_name,
uint16_t ipproto, uint8_t ipproto,
const char *alproto_name, const char *alproto_name,
AppProto alproto, AppProto alproto,
uint16_t min_depth, uint16_t max_depth, uint16_t min_depth, uint16_t max_depth,
@ -1383,7 +1383,7 @@ void AppLayerProtoDetectPPParseConfPorts(const char *ipproto_name,
/***** PM registration *****/ /***** PM registration *****/
int AppLayerProtoDetectPMRegisterPatternCS(uint16_t ipproto, AppProto alproto, int AppLayerProtoDetectPMRegisterPatternCS(uint8_t ipproto, AppProto alproto,
char *pattern, char *pattern,
uint16_t depth, uint16_t offset, uint16_t depth, uint16_t offset,
uint8_t direction) uint8_t direction)
@ -1396,7 +1396,7 @@ int AppLayerProtoDetectPMRegisterPatternCS(uint16_t ipproto, AppProto alproto,
1 /* case-sensitive */)); 1 /* case-sensitive */));
} }
int AppLayerProtoDetectPMRegisterPatternCI(uint16_t ipproto, AppProto alproto, int AppLayerProtoDetectPMRegisterPatternCI(uint8_t ipproto, AppProto alproto,
char *pattern, char *pattern,
uint16_t depth, uint16_t offset, uint16_t depth, uint16_t offset,
uint8_t direction) uint8_t direction)

8
src/app-layer-detect-proto.h
Unescape Escape View File

@ -58,14 +58,14 @@ int AppLayerProtoDetectPrepareState(void);
/***** PP registration *****/ /***** PP registration *****/
void AppLayerProtoDetectPPRegister(uint16_t ipproto, void AppLayerProtoDetectPPRegister(uint8_t ipproto,
char *portstr, char *portstr,
AppProto alproto, AppProto alproto,
uint16_t min_depth, uint16_t max_depth, uint16_t min_depth, uint16_t max_depth,
uint8_t direction, uint8_t direction,
ProbingParserFPtr ProbingParser); ProbingParserFPtr ProbingParser);
void AppLayerProtoDetectPPParseConfPorts(const char *ipproto_name, void AppLayerProtoDetectPPParseConfPorts(const char *ipproto_name,
uint16_t ipproto, uint8_t ipproto,
const char *alproto_name, const char *alproto_name,
AppProto alproto, AppProto alproto,
uint16_t min_depth, uint16_t max_depth, uint16_t min_depth, uint16_t max_depth,
@ -76,14 +76,14 @@ void AppLayerProtoDetectPPParseConfPorts(const char *ipproto_name,
/** /**
* \brief Registers a case-sensitive pattern for protocol detection. * \brief Registers a case-sensitive pattern for protocol detection.
*/ */
int AppLayerProtoDetectPMRegisterPatternCS(uint16_t ipproto, AppProto alproto, int AppLayerProtoDetectPMRegisterPatternCS(uint8_t ipproto, AppProto alproto,
char *pattern, char *pattern,
uint16_t depth, uint16_t offset, uint16_t depth, uint16_t offset,
uint8_t direction); uint8_t direction);
/** /**
* \brief Registers a case-insensitive pattern for protocol detection. * \brief Registers a case-insensitive pattern for protocol detection.
*/ */
int AppLayerProtoDetectPMRegisterPatternCI(uint16_t ipproto, AppProto alproto, int AppLayerProtoDetectPMRegisterPatternCI(uint8_t ipproto, AppProto alproto,
char *pattern, char *pattern,
uint16_t depth, uint16_t offset, uint16_t depth, uint16_t offset,
uint8_t direction); uint8_t direction);

2
src/app-layer-dns-common.c
Unescape Escape View File

@ -69,7 +69,7 @@ int DNSStateGetEventInfo(const char *event_name,
return 0; return 0;
} }
void DNSAppLayerRegisterGetEventInfo(uint16_t ipproto, uint16_t alproto) void DNSAppLayerRegisterGetEventInfo(uint8_t ipproto, uint16_t alproto)
{ {
AppLayerParserRegisterGetEventInfo(ipproto, alproto, DNSStateGetEventInfo); AppLayerParserRegisterGetEventInfo(ipproto, alproto, DNSStateGetEventInfo);

2
src/app-layer-dns-common.h
Unescape Escape View File

@ -165,7 +165,7 @@ void DNSParserRegisterTests(void);
void DNSAppLayerDecoderEventsRegister(int alproto); void DNSAppLayerDecoderEventsRegister(int alproto);
int DNSStateGetEventInfo(const char *event_name, int DNSStateGetEventInfo(const char *event_name,
int *event_id, AppLayerEventType *event_type); int *event_id, AppLayerEventType *event_type);
void DNSAppLayerRegisterGetEventInfo(uint16_t ipproto, uint16_t alproto); void DNSAppLayerRegisterGetEventInfo(uint8_t ipproto, uint16_t alproto);
void *DNSGetTx(void *alstate, uint64_t tx_id); void *DNSGetTx(void *alstate, uint64_t tx_id);
uint64_t DNSGetTxCnt(void *alstate); uint64_t DNSGetTxCnt(void *alstate);

68
src/app-layer-parser.c
Unescape Escape View File

@ -138,7 +138,7 @@ typedef struct AppLayerParserState_ {
* Post 2.0 let's look at changing this to move it out to app-layer.c. */ * Post 2.0 let's look at changing this to move it out to app-layer.c. */
static AppLayerParserCtx alp_ctx; static AppLayerParserCtx alp_ctx;
static void AppLayerParserTransactionsCleanup(uint16_t ipproto, AppProto alproto, static void AppLayerParserTransactionsCleanup(uint8_t ipproto, AppProto alproto,
void *alstate, void *pstate) void *alstate, void *pstate)
{ {
SCEnter(); SCEnter();
@ -315,7 +315,7 @@ int AppLayerParserConfParserEnabled(const char *ipproto,
/***** Parser related registration *****/ /***** Parser related registration *****/
int AppLayerParserRegisterParser(uint16_t ipproto, AppProto alproto, int AppLayerParserRegisterParser(uint8_t ipproto, AppProto alproto,
uint8_t direction, uint8_t direction,
int (*Parser)(Flow *f, void *protocol_state, int (*Parser)(Flow *f, void *protocol_state,
void *pstate, void *pstate,
@ -330,7 +330,7 @@ int AppLayerParserRegisterParser(uint16_t ipproto, AppProto alproto,
SCReturnInt(0); SCReturnInt(0);
} }
void AppLayerParserRegisterParserAcceptableDataDirection(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterParserAcceptableDataDirection(uint8_t ipproto, AppProto alproto,
uint8_t direction) uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -341,7 +341,7 @@ void AppLayerParserRegisterParserAcceptableDataDirection(uint16_t ipproto, AppPr
SCReturn; SCReturn;
} }
void AppLayerParserRegisterStateFuncs(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterStateFuncs(uint8_t ipproto, AppProto alproto,
void *(*StateAlloc)(void), void *(*StateAlloc)(void),
void (*StateFree)(void *)) void (*StateFree)(void *))
{ {
@ -355,7 +355,7 @@ void AppLayerParserRegisterStateFuncs(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterLocalStorageFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterLocalStorageFunc(uint8_t ipproto, AppProto alproto,
void *(*LocalStorageAlloc)(void), void *(*LocalStorageAlloc)(void),
void (*LocalStorageFree)(void *)) void (*LocalStorageFree)(void *))
{ {
@ -369,7 +369,7 @@ void AppLayerParserRegisterLocalStorageFunc(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetFilesFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetFilesFunc(uint8_t ipproto, AppProto alproto,
FileContainer *(*StateGetFiles)(void *, uint8_t)) FileContainer *(*StateGetFiles)(void *, uint8_t))
{ {
SCEnter(); SCEnter();
@ -380,7 +380,7 @@ void AppLayerParserRegisterGetFilesFunc(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetEventsFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetEventsFunc(uint8_t ipproto, AppProto alproto,
AppLayerDecoderEvents *(*StateGetEvents)(void *, uint64_t)) AppLayerDecoderEvents *(*StateGetEvents)(void *, uint64_t))
{ {
SCEnter(); SCEnter();
@ -391,7 +391,7 @@ void AppLayerParserRegisterGetEventsFunc(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterHasEventsFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterHasEventsFunc(uint8_t ipproto, AppProto alproto,
int (*StateHasEvents)(void *)) int (*StateHasEvents)(void *))
{ {
SCEnter(); SCEnter();
@ -402,7 +402,7 @@ void AppLayerParserRegisterHasEventsFunc(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterLogger(uint16_t ipproto, AppProto alproto) void AppLayerParserRegisterLogger(uint8_t ipproto, AppProto alproto)
{ {
SCEnter(); SCEnter();
@ -411,7 +411,7 @@ void AppLayerParserRegisterLogger(uint16_t ipproto, AppProto alproto)
SCReturn; SCReturn;
} }
void AppLayerParserRegisterTruncateFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterTruncateFunc(uint8_t ipproto, AppProto alproto,
void (*Truncate)(void *, uint8_t)) void (*Truncate)(void *, uint8_t))
{ {
SCEnter(); SCEnter();
@ -421,7 +421,7 @@ void AppLayerParserRegisterTruncateFunc(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetStateProgressFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetStateProgressFunc(uint8_t ipproto, AppProto alproto,
int (*StateGetProgress)(void *alstate, uint8_t direction)) int (*StateGetProgress)(void *alstate, uint8_t direction))
{ {
SCEnter(); SCEnter();
@ -432,7 +432,7 @@ void AppLayerParserRegisterGetStateProgressFunc(uint16_t ipproto, AppProto alpro
SCReturn; SCReturn;
} }
void AppLayerParserRegisterTxFreeFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterTxFreeFunc(uint8_t ipproto, AppProto alproto,
void (*StateTransactionFree)(void *, uint64_t)) void (*StateTransactionFree)(void *, uint64_t))
{ {
SCEnter(); SCEnter();
@ -443,7 +443,7 @@ void AppLayerParserRegisterTxFreeFunc(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetTxCnt(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetTxCnt(uint8_t ipproto, AppProto alproto,
uint64_t (*StateGetTxCnt)(void *alstate)) uint64_t (*StateGetTxCnt)(void *alstate))
{ {
SCEnter(); SCEnter();
@ -454,7 +454,7 @@ void AppLayerParserRegisterGetTxCnt(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetTx(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetTx(uint8_t ipproto, AppProto alproto,
void *(StateGetTx)(void *alstate, uint64_t tx_id)) void *(StateGetTx)(void *alstate, uint64_t tx_id))
{ {
SCEnter(); SCEnter();
@ -465,7 +465,7 @@ void AppLayerParserRegisterGetTx(uint16_t ipproto, AppProto alproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetStateProgressCompletionStatus(uint16_t ipproto, void AppLayerParserRegisterGetStateProgressCompletionStatus(uint8_t ipproto,
uint16_t alproto, uint16_t alproto,
int (*StateGetProgressCompletionStatus)(uint8_t direction)) int (*StateGetProgressCompletionStatus)(uint8_t direction))
{ {
@ -477,7 +477,7 @@ void AppLayerParserRegisterGetStateProgressCompletionStatus(uint16_t ipproto,
SCReturn; SCReturn;
} }
void AppLayerParserRegisterGetEventInfo(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetEventInfo(uint8_t ipproto, AppProto alproto,
int (*StateGetEventInfo)(const char *event_name, int *event_id, int (*StateGetEventInfo)(const char *event_name, int *event_id,
AppLayerEventType *event_type)) AppLayerEventType *event_type))
{ {
@ -491,7 +491,7 @@ void AppLayerParserRegisterGetEventInfo(uint16_t ipproto, AppProto alproto,
/***** Get and transaction functions *****/ /***** Get and transaction functions *****/
void *AppLayerParserGetProtocolParserLocalStorage(uint16_t ipproto, AppProto alproto) void *AppLayerParserGetProtocolParserLocalStorage(uint8_t ipproto, AppProto alproto)
{ {
SCEnter(); SCEnter();
@ -505,7 +505,7 @@ void *AppLayerParserGetProtocolParserLocalStorage(uint16_t ipproto, AppProto alp
SCReturnPtr(NULL, "void *"); SCReturnPtr(NULL, "void *");
} }
void AppLayerParserDestroyProtocolParserLocalStorage(uint16_t ipproto, AppProto alproto, void AppLayerParserDestroyProtocolParserLocalStorage(uint8_t ipproto, AppProto alproto,
void *local_data) void *local_data)
{ {
SCEnter(); SCEnter();
@ -545,7 +545,7 @@ uint64_t AppLayerParserGetTransactionInspectId(void *pstate, uint8_t direction)
} }
void AppLayerParserSetTransactionInspectId(void *pstate, void AppLayerParserSetTransactionInspectId(void *pstate,
uint16_t ipproto, AppProto alproto, void *alstate, uint8_t ipproto, AppProto alproto, void *alstate,
uint8_t direction) uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -585,7 +585,7 @@ void AppLayerParserSetDecoderEvents(void *pstate, AppLayerDecoderEvents *devents
(((AppLayerParserState *)pstate)->decoder_events) = devents; (((AppLayerParserState *)pstate)->decoder_events) = devents;
} }
AppLayerDecoderEvents *AppLayerParserGetEventsByTx(uint16_t ipproto, AppProto alproto, AppLayerDecoderEvents *AppLayerParserGetEventsByTx(uint8_t ipproto, AppProto alproto,
void *alstate, uint64_t tx_id) void *alstate, uint64_t tx_id)
{ {
SCEnter(); SCEnter();
@ -609,7 +609,7 @@ uint16_t AppLayerParserGetStateVersion(void *pstate)
"uint16_t"); "uint16_t");
} }
FileContainer *AppLayerParserGetFiles(uint16_t ipproto, AppProto alproto, FileContainer *AppLayerParserGetFiles(uint8_t ipproto, AppProto alproto,
void *alstate, uint8_t direction) void *alstate, uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -626,7 +626,7 @@ FileContainer *AppLayerParserGetFiles(uint16_t ipproto, AppProto alproto,
SCReturnPtr(ptr, "FileContainer *"); SCReturnPtr(ptr, "FileContainer *");
} }
int AppLayerParserGetStateProgress(uint16_t ipproto, AppProto alproto, int AppLayerParserGetStateProgress(uint8_t ipproto, AppProto alproto,
void *alstate, uint8_t direction) void *alstate, uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -634,21 +634,21 @@ int AppLayerParserGetStateProgress(uint16_t ipproto, AppProto alproto,
StateGetProgress(alstate, direction)); StateGetProgress(alstate, direction));
} }
uint64_t AppLayerParserGetTxCnt(uint16_t ipproto, AppProto alproto, void *alstate) uint64_t AppLayerParserGetTxCnt(uint8_t ipproto, AppProto alproto, void *alstate)
{ {
SCEnter(); SCEnter();
SCReturnCT(alp_ctx.ctxs[FlowGetProtoMapping(ipproto)][alproto]. SCReturnCT(alp_ctx.ctxs[FlowGetProtoMapping(ipproto)][alproto].
StateGetTxCnt(alstate), "uint64_t"); StateGetTxCnt(alstate), "uint64_t");
} }
void *AppLayerParserGetTx(uint16_t ipproto, AppProto alproto, void *alstate, uint64_t tx_id) void *AppLayerParserGetTx(uint8_t ipproto, AppProto alproto, void *alstate, uint64_t tx_id)
{ {
SCEnter(); SCEnter();
SCReturnPtr(alp_ctx.ctxs[FlowGetProtoMapping(ipproto)][alproto]. SCReturnPtr(alp_ctx.ctxs[FlowGetProtoMapping(ipproto)][alproto].
StateGetTx(alstate, tx_id), "void *"); StateGetTx(alstate, tx_id), "void *");
} }
int AppLayerParserGetStateProgressCompletionStatus(uint16_t ipproto, AppProto alproto, int AppLayerParserGetStateProgressCompletionStatus(uint8_t ipproto, AppProto alproto,
uint8_t direction) uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -657,7 +657,7 @@ int AppLayerParserGetStateProgressCompletionStatus(uint16_t ipproto, AppProto al
} }
int AppLayerParserGetEventInfo(uint16_t ipproto, AppProto alproto, const char *event_name, int AppLayerParserGetEventInfo(uint8_t ipproto, AppProto alproto, const char *event_name,
int *event_id, AppLayerEventType *event_type) int *event_id, AppLayerEventType *event_type)
{ {
SCEnter(); SCEnter();
@ -667,14 +667,14 @@ int AppLayerParserGetEventInfo(uint16_t ipproto, AppProto alproto, const char *e
SCReturnInt(r); SCReturnInt(r);
} }
uint8_t AppLayerParserGetFirstDataDir(uint16_t ipproto, uint16_t alproto) uint8_t AppLayerParserGetFirstDataDir(uint8_t ipproto, uint16_t alproto)
{ {
SCEnter(); SCEnter();
SCReturnCT(alp_ctx.ctxs[FlowGetProtoMapping(ipproto)][alproto]. SCReturnCT(alp_ctx.ctxs[FlowGetProtoMapping(ipproto)][alproto].
first_data_dir, "uint8_t"); first_data_dir, "uint8_t");
} }
uint64_t AppLayerParserGetTransactionActive(uint16_t ipproto, AppProto alproto, void *pstate, uint8_t direction) uint64_t AppLayerParserGetTransactionActive(uint8_t ipproto, AppProto alproto, void *pstate, uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -811,7 +811,7 @@ void AppLayerParserSetEOF(void *pstate)
SCReturn; SCReturn;
} }
int AppLayerParserHasDecoderEvents(uint16_t ipproto, AppProto alproto, int AppLayerParserHasDecoderEvents(uint8_t ipproto, AppProto alproto,
void *alstate, void *pstate, void *alstate, void *pstate,
uint8_t flags) uint8_t flags)
{ {
@ -855,7 +855,7 @@ int AppLayerParserHasDecoderEvents(uint16_t ipproto, AppProto alproto,
SCReturnInt(1); SCReturnInt(1);
} }
int AppLayerParserProtocolIsTxEventAware(uint16_t ipproto, AppProto alproto) int AppLayerParserProtocolIsTxEventAware(uint8_t ipproto, AppProto alproto)
{ {
SCEnter(); SCEnter();
int ipproto_map = FlowGetProtoMapping(ipproto); int ipproto_map = FlowGetProtoMapping(ipproto);
@ -863,7 +863,7 @@ int AppLayerParserProtocolIsTxEventAware(uint16_t ipproto, AppProto alproto)
SCReturnInt(r); SCReturnInt(r);
} }
int AppLayerParserProtocolSupportsTxs(uint16_t ipproto, AppProto alproto) int AppLayerParserProtocolSupportsTxs(uint8_t ipproto, AppProto alproto)
{ {
SCEnter(); SCEnter();
int ipproto_map = FlowGetProtoMapping(ipproto); int ipproto_map = FlowGetProtoMapping(ipproto);
@ -883,7 +883,7 @@ void AppLayerParserTriggerRawStreamReassembly(Flow *f)
/***** Cleanup *****/ /***** Cleanup *****/
void AppLayerParserStateCleanup(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate) void AppLayerParserStateCleanup(uint8_t ipproto, AppProto alproto, void *alstate, void *pstate)
{ {
SCEnter(); SCEnter();
@ -969,7 +969,7 @@ int AppLayerParserStateIssetFlag(void *pstate, uint8_t flag)
} }
void AppLayerParserStreamTruncated(uint16_t ipproto, AppProto alproto, void *alstate, void AppLayerParserStreamTruncated(uint8_t ipproto, AppProto alproto, void *alstate,
uint8_t direction) uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -1046,7 +1046,7 @@ static void TestProtocolStateFree(void *s)
SCFree(s); SCFree(s);
} }
void AppLayerParserRegisterProtocolUnittests(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterProtocolUnittests(uint8_t ipproto, AppProto alproto,
void (*RegisterUnittests)(void)) void (*RegisterUnittests)(void))
{ {
SCEnter(); SCEnter();

66
src/app-layer-parser.h
Unescape Escape View File

@ -72,49 +72,49 @@ int AppLayerParserConfParserEnabled(const char *ipproto,
* \retval 0 On success. * \retval 0 On success.
* \retval -1 On failure. * \retval -1 On failure.
*/ */
int AppLayerParserRegisterParser(uint16_t ip_proto, AppProto alproto, int AppLayerParserRegisterParser(uint8_t ipproto, AppProto alproto,
uint8_t direction, uint8_t direction,
int (*Parser)(Flow *f, void *protocol_state, int (*Parser)(Flow *f, void *protocol_state,
void *pstate, void *pstate,
uint8_t *buf, uint32_t buf_len, uint8_t *buf, uint32_t buf_len,
void *local_storage)); void *local_storage));
void AppLayerParserRegisterParserAcceptableDataDirection(uint16_t ipproto, void AppLayerParserRegisterParserAcceptableDataDirection(uint8_t ipproto,
AppProto alproto, AppProto alproto,
uint8_t direction); uint8_t direction);
void AppLayerParserRegisterStateFuncs(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterStateFuncs(uint8_t ipproto, AppProto alproto,
void *(*StateAlloc)(void), void *(*StateAlloc)(void),
void (*StateFree)(void *)); void (*StateFree)(void *));
void AppLayerParserRegisterLocalStorageFunc(uint16_t ipproto, AppProto proto, void AppLayerParserRegisterLocalStorageFunc(uint8_t ipproto, AppProto proto,
void *(*LocalStorageAlloc)(void), void *(*LocalStorageAlloc)(void),
void (*LocalStorageFree)(void *)); void (*LocalStorageFree)(void *));
void AppLayerParserRegisterGetFilesFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetFilesFunc(uint8_t ipproto, AppProto alproto,
FileContainer *(*StateGetFiles)(void *, uint8_t)); FileContainer *(*StateGetFiles)(void *, uint8_t));
void AppLayerParserRegisterGetEventsFunc(uint16_t ipproto, AppProto proto, void AppLayerParserRegisterGetEventsFunc(uint8_t ipproto, AppProto proto,
AppLayerDecoderEvents *(*StateGetEvents)(void *, uint64_t)); AppLayerDecoderEvents *(*StateGetEvents)(void *, uint64_t));
void AppLayerParserRegisterHasEventsFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterHasEventsFunc(uint8_t ipproto, AppProto alproto,
int (*StateHasEvents)(void *)); int (*StateHasEvents)(void *));
void AppLayerParserRegisterLogger(uint16_t ipproto, AppProto alproto); void AppLayerParserRegisterLogger(uint8_t ipproto, AppProto alproto);
void AppLayerParserRegisterTruncateFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterTruncateFunc(uint8_t ipproto, AppProto alproto,
void (*Truncate)(void *, uint8_t)); void (*Truncate)(void *, uint8_t));
void AppLayerParserRegisterGetStateProgressFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetStateProgressFunc(uint8_t ipproto, AppProto alproto,
int (*StateGetStateProgress)(void *alstate, uint8_t direction)); int (*StateGetStateProgress)(void *alstate, uint8_t direction));
void AppLayerParserRegisterTxFreeFunc(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterTxFreeFunc(uint8_t ipproto, AppProto alproto,
void (*StateTransactionFree)(void *, uint64_t)); void (*StateTransactionFree)(void *, uint64_t));
void AppLayerParserRegisterGetTxCnt(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetTxCnt(uint8_t ipproto, AppProto alproto,
uint64_t (*StateGetTxCnt)(void *alstate)); uint64_t (*StateGetTxCnt)(void *alstate));
void AppLayerParserRegisterGetTx(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetTx(uint8_t ipproto, AppProto alproto,
void *(StateGetTx)(void *alstate, uint64_t tx_id)); void *(StateGetTx)(void *alstate, uint64_t tx_id));
void AppLayerParserRegisterGetStateProgressCompletionStatus(uint16_t ipproto, void AppLayerParserRegisterGetStateProgressCompletionStatus(uint8_t ipproto,
uint16_t alproto, uint16_t alproto,
int (*StateGetStateProgressCompletionStatus)(uint8_t direction)); int (*StateGetStateProgressCompletionStatus)(uint8_t direction));
void AppLayerParserRegisterGetEventInfo(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterGetEventInfo(uint8_t ipproto, AppProto alproto,
int (*StateGetEventInfo)(const char *event_name, int *event_id, int (*StateGetEventInfo)(const char *event_name, int *event_id,
AppLayerEventType *event_type)); AppLayerEventType *event_type));
/***** Get and transaction functions *****/ /***** Get and transaction functions *****/
void *AppLayerParserGetProtocolParserLocalStorage(uint16_t ipproto, AppProto alproto); void *AppLayerParserGetProtocolParserLocalStorage(uint8_t ipproto, AppProto alproto);
void AppLayerParserDestroyProtocolParserLocalStorage(uint16_t ipproto, AppProto alproto, void AppLayerParserDestroyProtocolParserLocalStorage(uint8_t ipproto, AppProto alproto,
void *local_data); void *local_data);
@ -122,42 +122,42 @@ uint64_t AppLayerParserGetTransactionLogId(void *pstate);
void AppLayerParserSetTransactionLogId(void *pstate); void AppLayerParserSetTransactionLogId(void *pstate);
uint64_t AppLayerParserGetTransactionInspectId(void *pstate, uint8_t direction); uint64_t AppLayerParserGetTransactionInspectId(void *pstate, uint8_t direction);
void AppLayerParserSetTransactionInspectId(void *pstate, void AppLayerParserSetTransactionInspectId(void *pstate,
uint16_t ipproto, AppProto alproto, void *alstate, uint8_t ipproto, AppProto alproto, void *alstate,
uint8_t direction); uint8_t direction);
AppLayerDecoderEvents *AppLayerParserGetDecoderEvents(void *pstate); AppLayerDecoderEvents *AppLayerParserGetDecoderEvents(void *pstate);
void AppLayerParserSetDecoderEvents(void *pstate, AppLayerDecoderEvents *devents); void AppLayerParserSetDecoderEvents(void *pstate, AppLayerDecoderEvents *devents);
AppLayerDecoderEvents *AppLayerParserGetEventsByTx(uint16_t ipproto, AppProto alproto, void *alstate, AppLayerDecoderEvents *AppLayerParserGetEventsByTx(uint8_t ipproto, AppProto alproto, void *alstate,
uint64_t tx_id); uint64_t tx_id);
uint16_t AppLayerParserGetStateVersion(void *pstate); uint16_t AppLayerParserGetStateVersion(void *pstate);
FileContainer *AppLayerParserGetFiles(uint16_t ipproto, AppProto alproto, FileContainer *AppLayerParserGetFiles(uint8_t ipproto, AppProto alproto,
void *alstate, uint8_t direction); void *alstate, uint8_t direction);
int AppLayerParserGetStateProgress(uint16_t ipproto, AppProto alproto, int AppLayerParserGetStateProgress(uint8_t ipproto, AppProto alproto,
void *alstate, uint8_t direction); void *alstate, uint8_t direction);
uint64_t AppLayerParserGetTxCnt(uint16_t ipproto, AppProto alproto, void *alstate); uint64_t AppLayerParserGetTxCnt(uint8_t ipproto, AppProto alproto, void *alstate);
void *AppLayerParserGetTx(uint16_t ipproto, AppProto alproto, void *alstate, uint64_t tx_id); void *AppLayerParserGetTx(uint8_t ipproto, AppProto alproto, void *alstate, uint64_t tx_id);
int AppLayerParserGetStateProgressCompletionStatus(uint16_t ipproto, AppProto alproto, int AppLayerParserGetStateProgressCompletionStatus(uint8_t ipproto, AppProto alproto,
uint8_t direction); uint8_t direction);
int AppLayerParserGetEventInfo(uint16_t ipproto, AppProto alproto, const char *event_name, int AppLayerParserGetEventInfo(uint8_t ipproto, AppProto alproto, const char *event_name,
int *event_id, AppLayerEventType *event_type); int *event_id, AppLayerEventType *event_type);
uint64_t AppLayerParserGetTransactionActive(uint16_t ipproto, AppProto alproto, void *pstate, uint8_t direction); uint64_t AppLayerParserGetTransactionActive(uint8_t ipproto, AppProto alproto, void *pstate, uint8_t direction);
uint8_t AppLayerParserGetFirstDataDir(uint16_t ipproto, uint16_t alproto); uint8_t AppLayerParserGetFirstDataDir(uint8_t ipproto, uint16_t alproto);
/***** General *****/ /***** General *****/
int AppLayerParserParse(void *tctx, Flow *f, AppProto alproto, int AppLayerParserParse(void *tctx, Flow *f, AppProto alproto,
uint8_t flags, uint8_t *input, uint32_t input_len); uint8_t flags, uint8_t *input, uint32_t input_len);
void AppLayerParserSetEOF(void *pstate); void AppLayerParserSetEOF(void *pstate);
int AppLayerParserHasDecoderEvents(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate, int AppLayerParserHasDecoderEvents(uint8_t ipproto, AppProto alproto, void *alstate, void *pstate,
uint8_t flags); uint8_t flags);
int AppLayerParserProtocolIsTxEventAware(uint16_t ipproto, AppProto alproto); int AppLayerParserProtocolIsTxEventAware(uint8_t ipproto, AppProto alproto);
int AppLayerParserProtocolSupportsTxs(uint16_t ipproto, AppProto alproto); int AppLayerParserProtocolSupportsTxs(uint8_t ipproto, AppProto alproto);
void AppLayerParserTriggerRawStreamReassembly(Flow *f); void AppLayerParserTriggerRawStreamReassembly(Flow *f);
/***** Cleanup *****/ /***** Cleanup *****/
void AppLayerParserStateCleanup(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate); void AppLayerParserStateCleanup(uint8_t ipproto, AppProto alproto, void *alstate, void *pstate);
void AppLayerParserRegisterProtocolParsers(void); void AppLayerParserRegisterProtocolParsers(void);
@ -165,7 +165,7 @@ void AppLayerParserRegisterProtocolParsers(void);
void AppLayerParserStateSetFlag(void *pstate, uint8_t flag); void AppLayerParserStateSetFlag(void *pstate, uint8_t flag);
int AppLayerParserStateIssetFlag(void *pstate, uint8_t flag); int AppLayerParserStateIssetFlag(void *pstate, uint8_t flag);
void AppLayerParserStreamTruncated(uint16_t ipproto, AppProto alproto, void *alstate, void AppLayerParserStreamTruncated(uint8_t ipproto, AppProto alproto, void *alstate,
uint8_t direction); uint8_t direction);
@ -182,7 +182,7 @@ void AppLayerParserStatePrintDetails(void *pstate);
/***** Unittests *****/ /***** Unittests *****/
#ifdef UNITTESTS #ifdef UNITTESTS
void AppLayerParserRegisterProtocolUnittests(uint16_t ipproto, AppProto alproto, void AppLayerParserRegisterProtocolUnittests(uint8_t ipproto, AppProto alproto,
void (*RegisterUnittests)(void)); void (*RegisterUnittests)(void));
void AppLayerParserRegisterUnittests(void); void AppLayerParserRegisterUnittests(void);
void AppLayerParserBackupParserTable(void); void AppLayerParserBackupParserTable(void);

4
src/detect-engine.c
Unescape Escape View File

@ -136,7 +136,7 @@ static void DetectEnginePrintAppInspectionEngines(DetectEngineAppInspectionEngin
void DetectEngineRegisterAppInspectionEngines(void) void DetectEngineRegisterAppInspectionEngines(void)
{ {
struct tmp_t { struct tmp_t {
uint16_t ipproto; uint8_t ipproto;
uint16_t alproto; uint16_t alproto;
int32_t sm_list; int32_t sm_list;
uint32_t inspect_flags; uint32_t inspect_flags;
@ -361,7 +361,7 @@ static void AppendAppInspectionEngine(DetectEngineAppInspectionEngine *engine,
return; return;
} }
void DetectEngineRegisterAppInspectionEngine(uint16_t ipproto, void DetectEngineRegisterAppInspectionEngine(uint8_t ipproto,
uint16_t alproto, uint16_t alproto,
uint16_t dir, uint16_t dir,
int32_t sm_list, int32_t sm_list,

4
src/detect-engine.h
Unescape Escape View File

@ -29,7 +29,7 @@
#include "flow-private.h" #include "flow-private.h"
typedef struct DetectEngineAppInspectionEngine_ { typedef struct DetectEngineAppInspectionEngine_ {
uint16_t ipproto; uint8_t ipproto;
uint16_t alproto; uint16_t alproto;
uint16_t dir; uint16_t dir;
@ -81,7 +81,7 @@ const char *DetectSigmatchListEnumToString(enum DetectSigmatchListEnum type);
* the inpsect_flags. * the inpsect_flags.
* \param Callback The engine callback. * \param Callback The engine callback.
*/ */
void DetectEngineRegisterAppInspectionEngine(uint16_t ipproto, void DetectEngineRegisterAppInspectionEngine(uint8_t ipproto,
uint16_t alproto, uint16_t alproto,
uint16_t direction, uint16_t direction,
int32_t sm_list, int32_t sm_list,

14
src/util-unittest-helper.c
Unescape Escape View File

@ -75,7 +75,7 @@ uint32_t UTHSetIPv4Address(char *str) {
* \retval Packet pointer to the built in packet * \retval Packet pointer to the built in packet
*/ */
Packet *UTHBuildPacketIPV6Real(uint8_t *payload, uint16_t payload_len, Packet *UTHBuildPacketIPV6Real(uint8_t *payload, uint16_t payload_len,
uint16_t ipproto, char *src, char *dst, uint8_t ipproto, char *src, char *dst,
uint16_t sport, uint16_t dport) { uint16_t sport, uint16_t dport) {
uint32_t in[4]; uint32_t in[4];
@ -160,7 +160,7 @@ error:
* \retval Packet pointer to the built in packet * \retval Packet pointer to the built in packet
*/ */
Packet *UTHBuildPacketReal(uint8_t *payload, uint16_t payload_len, Packet *UTHBuildPacketReal(uint8_t *payload, uint16_t payload_len,
uint16_t ipproto, char *src, char *dst, uint8_t ipproto, char *src, char *dst,
uint16_t sport, uint16_t dport) { uint16_t sport, uint16_t dport) {
struct in_addr in; struct in_addr in;
@ -252,7 +252,7 @@ error:
* \retval Packet pointer to the built in packet * \retval Packet pointer to the built in packet
*/ */
Packet *UTHBuildPacket(uint8_t *payload, uint16_t payload_len, Packet *UTHBuildPacket(uint8_t *payload, uint16_t payload_len,
uint16_t ipproto) { uint8_t ipproto) {
return UTHBuildPacketReal(payload, payload_len, ipproto, return UTHBuildPacketReal(payload, payload_len, ipproto,
"192.168.1.5", "192.168.1.1", "192.168.1.5", "192.168.1.1",
41424, 80); 41424, 80);
@ -330,7 +330,7 @@ Packet *UTHBuildPacketFromEth(uint8_t *raw_eth, uint16_t pktsize) {
* \retval Packet pointer to the built in packet * \retval Packet pointer to the built in packet
*/ */
Packet *UTHBuildPacketSrcDst(uint8_t *payload, uint16_t payload_len, Packet *UTHBuildPacketSrcDst(uint8_t *payload, uint16_t payload_len,
uint16_t ipproto, char *src, char *dst) { uint8_t ipproto, char *src, char *dst) {
return UTHBuildPacketReal(payload, payload_len, ipproto, return UTHBuildPacketReal(payload, payload_len, ipproto,
src, dst, src, dst,
41424, 80); 41424, 80);
@ -347,7 +347,7 @@ Packet *UTHBuildPacketSrcDst(uint8_t *payload, uint16_t payload_len,
* \retval Packet pointer to the built in packet * \retval Packet pointer to the built in packet
*/ */
Packet *UTHBuildPacketIPV6SrcDst(uint8_t *payload, uint16_t payload_len, Packet *UTHBuildPacketIPV6SrcDst(uint8_t *payload, uint16_t payload_len,
uint16_t ipproto, char *src, char *dst) { uint8_t ipproto, char *src, char *dst) {
return UTHBuildPacketIPV6Real(payload, payload_len, ipproto, return UTHBuildPacketIPV6Real(payload, payload_len, ipproto,
src, dst, src, dst,
41424, 80); 41424, 80);
@ -364,7 +364,7 @@ Packet *UTHBuildPacketIPV6SrcDst(uint8_t *payload, uint16_t payload_len,
* \retval Packet pointer to the built in packet * \retval Packet pointer to the built in packet
*/ */
Packet *UTHBuildPacketSrcDstPorts(uint8_t *payload, uint16_t payload_len, Packet *UTHBuildPacketSrcDstPorts(uint8_t *payload, uint16_t payload_len,
uint16_t ipproto, uint16_t sport, uint16_t dport) { uint8_t ipproto, uint16_t sport, uint16_t dport) {
return UTHBuildPacketReal(payload, payload_len, ipproto, return UTHBuildPacketReal(payload, payload_len, ipproto,
"192.168.1.5", "192.168.1.1", "192.168.1.5", "192.168.1.1",
sport, dport); sport, dport);
@ -849,7 +849,7 @@ uint32_t UTHBuildPacketOfFlows(uint32_t start, uint32_t end, uint8_t dir) {
/** /**
* \brief CheckUTHTestPacket wrapper to check packets for unittests * \brief CheckUTHTestPacket wrapper to check packets for unittests
*/ */
int CheckUTHTestPacket(Packet *p, uint16_t ipproto) { int CheckUTHTestPacket(Packet *p, uint8_t ipproto) {
uint16_t sport = 41424; uint16_t sport = 41424;
uint16_t dport = 80; uint16_t dport = 80;
uint8_t payload[] = "Payload"; uint8_t payload[] = "Payload";

12
src/util-unittest-helper.h
Unescape Escape View File

@ -27,12 +27,12 @@
#ifdef UNITTESTS #ifdef UNITTESTS
uint32_t UTHSetIPv4Address(char *); uint32_t UTHSetIPv4Address(char *);
Packet *UTHBuildPacketReal(uint8_t *, uint16_t, uint16_t, char *, char *, uint16_t, uint16_t); Packet *UTHBuildPacketReal(uint8_t *, uint16_t, uint8_t ipproto, char *, char *, uint16_t, uint16_t);
Packet *UTHBuildPacket(uint8_t *, uint16_t, uint16_t); Packet *UTHBuildPacket(uint8_t *, uint16_t, uint8_t ipproto);
Packet *UTHBuildPacketSrcDst(uint8_t *, uint16_t, uint16_t, char *, char *); Packet *UTHBuildPacketSrcDst(uint8_t *, uint16_t, uint8_t ipproto, char *, char *);
Packet *UTHBuildPacketSrcDstPorts(uint8_t *, uint16_t, uint16_t, uint16_t, uint16_t); Packet *UTHBuildPacketSrcDstPorts(uint8_t *, uint16_t, uint8_t ipproto, uint16_t, uint16_t);
Packet *UTHBuildPacketIPV6SrcDst(uint8_t *, uint16_t, uint16_t, char *, char *); Packet *UTHBuildPacketIPV6SrcDst(uint8_t *, uint16_t, uint8_t ipproto, char *, char *);
int UTHPacketMatchSigMpm(Packet *, char *, uint16_t); int UTHPacketMatchSigMpm(Packet *, char *, uint16_t);
Packet **UTHBuildPacketArrayFromEth(uint8_t **, int *, int); Packet **UTHBuildPacketArrayFromEth(uint8_t **, int *, int);
@ -54,7 +54,7 @@ int UTHMatchPacketsWithResults(DetectEngineCtx *, Packet **, int, uint32_t *, ui
int UTHGenericTest(Packet **, int, char **, uint32_t *, uint32_t *, int); int UTHGenericTest(Packet **, int, char **, uint32_t *, uint32_t *, int);
uint32_t UTHBuildPacketOfFlows(uint32_t, uint32_t, uint8_t); uint32_t UTHBuildPacketOfFlows(uint32_t, uint32_t, uint8_t);
Packet *UTHBuildPacketIPV6Real(uint8_t *, uint16_t , uint16_t , char *, char *, Packet *UTHBuildPacketIPV6Real(uint8_t *, uint16_t , uint8_t ipproto, char *, char *,
uint16_t , uint16_t ); uint16_t , uint16_t );
#endif #endif

Write Preview
Loading…
Cancel
Save