From 4650bf717080e6b170d311148951d1810b7cbcb5 Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Sun, 20 Nov 2011 13:17:55 +0530 Subject: [PATCH] minor code cleanup. remove commented out code --- src/app-layer-dcerpc-udp.c | 1 - src/app-layer-dcerpc.c | 1 - src/app-layer-ftp.c | 1 - src/app-layer-htp.c | 1 - src/app-layer-smb.c | 2 -- src/app-layer-ssh.c | 1 - src/app-layer-ssl.c | 4 ---- src/stream-tcp-reassemble.c | 17 ----------------- src/stream-tcp.h | 22 ++++++++++++++++------ 9 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/app-layer-dcerpc-udp.c b/src/app-layer-dcerpc-udp.c index 8a99c90c53..919628779e 100644 --- a/src/app-layer-dcerpc-udp.c +++ b/src/app-layer-dcerpc-udp.c @@ -712,7 +712,6 @@ static void DCERPCUDPStateFree(void *s) { void RegisterDCERPCUDPParsers(void) { /** DCERPC */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_UDP, ALPROTO_DCERPC_UDP, "|04 00|", 2, 0, STREAM_TOCLIENT); AlpProtoAdd(&alp_proto_ctx, IPPROTO_UDP, ALPROTO_DCERPC_UDP, "|04 00|", 2, 0, STREAM_TOSERVER); AppLayerRegisterProto("dcerpcudp", ALPROTO_DCERPC_UDP, STREAM_TOSERVER, diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c index 917804ae2f..dae2d9bbe9 100644 --- a/src/app-layer-dcerpc.c +++ b/src/app-layer-dcerpc.c @@ -1825,7 +1825,6 @@ void DCERPCUpdateTransactionId(void *state, uint16_t *id) { void RegisterDCERPCParsers(void) { /** DCERPC */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_DCERPC, "|05 00|", 2, 0, STREAM_TOCLIENT); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_DCERPC, "|05 00|", 2, 0, STREAM_TOSERVER); AppLayerRegisterProto("dcerpc", ALPROTO_DCERPC, STREAM_TOSERVER, diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c index a564fc490a..e2f97f3cba 100644 --- a/src/app-layer-ftp.c +++ b/src/app-layer-ftp.c @@ -265,7 +265,6 @@ void RegisterFTPParsers(void) { AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_FTP, "USER ", 5, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_FTP, "PASS ", 5, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_FTP, "PORT ", 5, 0, STREAM_TOSERVER); - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_FTP, "AUTH SSL", 8, 0, STREAM_TOCLIENT); AppLayerRegisterProto("ftp", ALPROTO_FTP, STREAM_TOSERVER, FTPParseRequest); diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c index 489c06a715..c81ce0ec41 100644 --- a/src/app-layer-htp.c +++ b/src/app-layer-htp.c @@ -1193,7 +1193,6 @@ void RegisterHTPParsers(void) AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_HTTP, "OPTIONS|09|", 8, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_HTTP, "CONNECT|20|", 8, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_HTTP, "CONNECT|09|", 8, 0, STREAM_TOSERVER); - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_HTTP, "HTTP/", 5, 0, STREAM_TOCLIENT); AppLayerRegisterStateFuncs(ALPROTO_HTTP, HTPStateAlloc, HTPStateFree); AppLayerRegisterTransactionIdFuncs(ALPROTO_HTTP, HTPStateUpdateTransactionId, HTPStateTransactionFree); diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c index 276672d8e7..8c20e37af6 100644 --- a/src/app-layer-smb.c +++ b/src/app-layer-smb.c @@ -1371,11 +1371,9 @@ static uint16_t SMBProbingParser(uint8_t *input, uint32_t ilen) void RegisterSMBParsers(void) { /** SMB */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_SMB, "|ff|SMB", 8, 4, STREAM_TOCLIENT); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_SMB, "|ff|SMB", 8, 4, STREAM_TOSERVER); /** SMB2 */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_SMB2, "|fe|SMB", 8, 4, STREAM_TOCLIENT); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_SMB2, "|fe|SMB", 8, 4, STREAM_TOSERVER); AppLayerRegisterProto("smb", ALPROTO_SMB, STREAM_TOSERVER, SMBParse); diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c index acfe0ac2b4..2cfdb467f0 100644 --- a/src/app-layer-ssh.c +++ b/src/app-layer-ssh.c @@ -747,7 +747,6 @@ static void SSHStateFree(void *state) void RegisterSSHParsers(void) { /** SSH */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_SSH, "SSH-", 4, 0, STREAM_TOCLIENT); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_SSH, "SSH-", 4, 0, STREAM_TOSERVER); AppLayerRegisterProto("ssh", ALPROTO_SSH, STREAM_TOCLIENT, diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c index bf5b609161..3a1cbf5d1b 100644 --- a/src/app-layer-ssl.c +++ b/src/app-layer-ssl.c @@ -873,19 +873,15 @@ void RegisterSSLParsers(void) /** SSLv3 */ AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|01 03 00|", 3, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 00|", 3, 0, STREAM_TOSERVER); /* client hello */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 00|", 3, 0, STREAM_TOCLIENT); /* server hello */ /** TLSv1 */ AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|01 03 01|", 3, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 01|", 3, 0, STREAM_TOSERVER); /* client hello */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 01|", 3, 0, STREAM_TOCLIENT); /* server hello */ /** TLSv1.1 */ AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|01 03 02|", 3, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 02|", 3, 0, STREAM_TOSERVER); /* client hello */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 02|", 3, 0, STREAM_TOCLIENT); /* server hello */ /** TLSv1.2 */ AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|01 03 03|", 3, 0, STREAM_TOSERVER); AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 03|", 3, 0, STREAM_TOSERVER); /* client hello */ - //AlpProtoAdd(&alp_proto_ctx, IPPROTO_TCP, ALPROTO_TLS, "|16 03 03|", 3, 0, STREAM_TOCLIENT); /* server hello */ AppLayerRegisterProto("tls", ALPROTO_TLS, STREAM_TOSERVER, SSLParseClientRecord); diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c index 67f9cf653e..5ecc07f8fd 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -2600,15 +2600,6 @@ static int StreamTcpReassembleAppLayer (TcpReassemblyThreadCtx *ra_ctx, uint8_t flags = 0; - /* check if toserver reassembly has started before reassembling toclient. */ - //if (PKT_IS_TOSERVER(p) && - // !(ssn->flags & STREAMTCP_FLAG_TOSERVER_REASSEMBLY_STARTED)) - //{ - // SCLogDebug("toserver reassembling is not done yet, so " - // "skipping reassembling at the moment for to_client"); - // SCReturnInt(0); - //} - SCLogDebug("stream->seg_list %p", stream->seg_list); #ifdef DEBUG PrintList(stream->seg_list); @@ -2663,14 +2654,6 @@ static int StreamTcpReassembleAppLayer (TcpReassemblyThreadCtx *ra_ctx, toserver side already to the app layer */ if (ssn->state <= TCP_ESTABLISHED) { if (!(ssn->flags & STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED)) { - /* Do not perform reassembling of data from server, until the app layer - proto has been detected and we have sent atleast one smsg from client - data to app layer */ - //if (PKT_IS_TOSERVER(p)) { - // SCLogDebug("we didn't detected the app layer protocol till " - // "yet, so not doing toclient reassembling"); - // SCReturnInt(0); - //} /* initialize the tmp_ra_base_seq for each new run */ stream->tmp_ra_app_base_seq = stream->ra_app_base_seq; ra_base_seq = stream->tmp_ra_app_base_seq; diff --git a/src/stream-tcp.h b/src/stream-tcp.h index 9e77a504f9..acda90acc5 100644 --- a/src/stream-tcp.h +++ b/src/stream-tcp.h @@ -157,6 +157,16 @@ static inline void StreamTcpPacketSwitchDir(TcpSession *ssn, Packet *p) } } +enum { + /* stream has no segments for forced reassembly, nor for detection */ + STREAM_HAS_UNPROCESSED_SEGMENTS_NONE = 0, + /* stream seems to have segments that need to be forced reassembled */ + STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_REASSEMBLY = 1, + /* stream has no segments for forced reassembly, but only segments that + * have been sent for detection, but are stuck in the detection queues */ + STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_ONLY_DETECTION = 2, +}; + static inline int StreamHasUnprocessedSegments(TcpSession *ssn, int direction) { /* server tcp state */ @@ -164,21 +174,21 @@ static inline int StreamHasUnprocessedSegments(TcpSession *ssn, int direction) if (ssn->server.seg_list != NULL && (!(ssn->server.seg_list_tail->flags & SEGMENTTCP_FLAG_RAW_PROCESSED) || !(ssn->server.seg_list_tail->flags & SEGMENTTCP_FLAG_APPLAYER_PROCESSED)) ) { - return 1; + return STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_REASSEMBLY; } else if (ssn->toclient_smsg_head != NULL) { - return 2; + return STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_ONLY_DETECTION; } else { - return 0; + return STREAM_HAS_UNPROCESSED_SEGMENTS_NONE; } } else { if (ssn->client.seg_list != NULL && (!(ssn->client.seg_list_tail->flags & SEGMENTTCP_FLAG_RAW_PROCESSED) || !(ssn->client.seg_list_tail->flags & SEGMENTTCP_FLAG_APPLAYER_PROCESSED)) ) { - return 1; + return STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_REASSEMBLY; } else if (ssn->toserver_smsg_head != NULL) { - return 2; + return STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_ONLY_DETECTION; } else { - return 0; + return STREAM_HAS_UNPROCESSED_SEGMENTS_NONE; } } }