diff --git a/src/tm-modules.c b/src/tm-modules.c index b798d1d4d8..0b835fa345 100644 --- a/src/tm-modules.c +++ b/src/tm-modules.c @@ -234,7 +234,6 @@ const char * TmModuleTmmIdToString(TmmId id) CASE_CODE (TMM_PCAPLOG); CASE_CODE (TMM_FILELOG); CASE_CODE (TMM_FILESTORE); - CASE_CODE (TMM_STREAMTCP); CASE_CODE (TMM_DECODEIPFW); CASE_CODE (TMM_VERDICTIPFW); CASE_CODE (TMM_RECEIVEIPFW); diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h index dc70af9bc4..ed442ba8e0 100644 --- a/src/tm-threads-common.h +++ b/src/tm-threads-common.h @@ -65,7 +65,6 @@ typedef enum { TMM_PCAPLOG, TMM_FILELOG, TMM_FILESTORE, - TMM_STREAMTCP, TMM_DECODEIPFW, TMM_VERDICTIPFW, TMM_RECEIVEIPFW, diff --git a/src/tm-threads.c b/src/tm-threads.c index 506430d3f8..8cfca0e7ac 100644 --- a/src/tm-threads.c +++ b/src/tm-threads.c @@ -192,8 +192,7 @@ static int TmThreadTimeoutLoop(ThreadVars *tv, TmSlot *s) int r = TM_ECODE_OK; for (slot = s; slot != NULL; slot = slot->slot_next) { - if (slot->tm_id == TMM_FLOWWORKER || - slot->tm_id == TMM_STREAMTCP) + if (slot->tm_id == TMM_FLOWWORKER) { stream_slot = slot; break; diff --git a/src/util-profiling.c b/src/util-profiling.c index f63ee92987..2da2b232fb 100644 --- a/src/util-profiling.c +++ b/src/util-profiling.c @@ -217,7 +217,7 @@ SCProfilingInit(void) for (i = 0; i < ALPROTO_MAX; i++) { fprintf(packet_profile_csv_fp, "%s,", AppProtoToString(i)); } - fprintf(packet_profile_csv_fp, "STREAM (no app),proto detect,"); + fprintf(packet_profile_csv_fp, "proto detect,"); for (i = 0; i < PROF_DETECT_SIZE; i++) { fprintf(packet_profile_csv_fp, "%s,", PacketProfileDetectIdToString(i)); } @@ -450,7 +450,6 @@ void SCProfilingDumpPacketStats(void) TmModuleTmmIdToString(m), p, pd->cnt, pd->min, pd->max, (uint64_t)(pd->tot / pd->cnt), totalstr, percent); } } - fprintf(fp, "Note: TMM_STREAMTCP includes TCP app layer parsers, see below.\n"); fprintf(fp, "\nPer App layer parser stats:\n"); @@ -694,7 +693,6 @@ void SCProfilingPrintPacketProfile(Packet *p) int i; uint64_t tmm_total = 0; - uint64_t tmm_streamtcp_tcp = 0; for (i = 0; i < TMM_SIZE; i++) { PktProfilingTmmData *pdt = &p->profile->tmm[i]; @@ -702,10 +700,6 @@ void SCProfilingPrintPacketProfile(Packet *p) uint64_t tmm_delta = pdt->ticks_end - pdt->ticks_start; fprintf(packet_profile_csv_fp, "%"PRIu64",", tmm_delta); tmm_total += tmm_delta; - - if (p->proto == IPPROTO_TCP && i == TMM_STREAMTCP) { - tmm_streamtcp_tcp = tmm_delta; - } } fprintf(packet_profile_csv_fp, "%"PRIu64",", delta - tmm_total); @@ -721,11 +715,6 @@ void SCProfilingPrintPacketProfile(Packet *p) } } - uint64_t real_tcp = 0; - if (tmm_streamtcp_tcp > app_total) - real_tcp = tmm_streamtcp_tcp - app_total; - fprintf(packet_profile_csv_fp, "%"PRIu64",", real_tcp); - fprintf(packet_profile_csv_fp, "%"PRIu64",", p->profile->proto_detect); for (i = 0; i < PROF_DETECT_SIZE; i++) {