From 0eb0d48f35eba1b5c0a2aed1e43edcbe721f8703 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 1 Sep 2010 23:18:09 +0200
Subject: [PATCH] Disable broken unittests and fix one.

---
 src/stream-tcp.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 8084914267..a84a77ec7f 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -30,7 +30,10 @@
 #include "decode.h"
 #include "debug.h"
 #include "detect.h"
+
 #include "flow.h"
+#include "flow-util.h"
+
 #include "threads.h"
 #include "conf.h"
 #include "conf-yaml-loader.h"
@@ -5934,6 +5937,7 @@ end:
     return ret;
 }
 
+#if 0
 /**
  *  \test   Test the resetting of the sesison with bad checksum packet and later
  *          send the malicious contents on the session. Engine should drop the
@@ -5991,6 +5995,7 @@ static int StreamTcpTest29(void)
     p.ip4h = &ipv4h;
     p.tcpc = tcpc;
     p.tcpc.comp_csum = -1;
+    tcpvars.hlen = 20;
     p.tcpvars = tcpvars;
     ssn.state = TCP_ESTABLISHED;
     addr.s_addr = inet_addr("10.1.3.53");
@@ -6777,6 +6782,7 @@ end:
     StreamTcpFreeConfig(TRUE);
     return ret;
 }
+#endif
 
 /**
  *  \test   Test the processing of out of order FIN packets in tcp session.
@@ -6799,6 +6805,8 @@ static int StreamTcpTest37(void) {
     memset(&stt, 0, sizeof (StreamTcpThread));
     memset(&tcph, 0, sizeof (TCPHdr));
 
+    FLOW_INITIALIZE(&f);
+
     stt.ra_ctx = ra_ctx;
     p.flow = &f;
     tcph.th_win = htons(5480);
@@ -6941,6 +6949,9 @@ void StreamTcpRegisterTests (void) {
     UtRegisterTest("StreamTcpTest27 -- test ecn/cwr sessions",
                     StreamTcpTest27, 1);
     UtRegisterTest("StreamTcpTest28 -- Memcap Test", StreamTcpTest28, 1);
+#if 0 /* VJ 2010/09/01 disabled since they blow up on Fedora and Fedora is
+       * right about blowing up. The checksum functions are not used properly
+       * in the tests. */
     UtRegisterTest("StreamTcpTest29 -- Badchecksum Reset Test", StreamTcpTest29, 1);
     UtRegisterTest("StreamTcpTest30 -- Badchecksum Overlap Test", StreamTcpTest30, 1);
     UtRegisterTest("StreamTcpTest31 -- MultipleSyns Test", StreamTcpTest31, 1);
@@ -6949,6 +6960,7 @@ void StreamTcpRegisterTests (void) {
     UtRegisterTest("StreamTcpTest34 -- SYN-PUSH Test", StreamTcpTest34, 1);
     UtRegisterTest("StreamTcpTest35 -- SYN-URG Test", StreamTcpTest35, 1);
     UtRegisterTest("StreamTcpTest36 -- PUSH-URG Test", StreamTcpTest36, 1);
+#endif
     UtRegisterTest("StreamTcpTest37 -- Out of order FIN Test", StreamTcpTest37, 1);
 
     /* set up the reassembly tests as well */