updated subproject and fixed error in operator <

Author: simsong

ChangeLog

@@ -1,3 +1,7 @@
+2012-12-07  Simson Garfinkel  <simsong@Mucha.local>
+
+	* src/tcpdemux.h (class flow_addr): fixed operator< type 
+
 2012-11-17  Simson Garfinkel  <simsong@npsair.local>
 
 	* src/tcpflow.cpp (usage): usage now goes to stdout and not stderr.

bootstrap.sh

@@ -1,7 +1,14 @@
 #!/bin/sh
-#/bin/rm -rf aclocal.m4
-git submodule init
-git submodule update
+
+# Hopefully you checked out with git clone --recursive git@github.com:simsong/tcpflow.git
+
+if [ ! -d src/be13_api ] ;
+then
+  echo bringing in submodules
+  echo next time check out with git clone --recursive
+  git submodule init
+  git submodule update
+fi
 aclocal
 autoreconf
 automake --add-missing

gitpull.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+# http://stackoverflow.com/questions/5828324/update-git-submodule
+# pull root and subprojects
+git pull
+for dir in src/be13_api 
+do
+  pushd $dir
+  git checkout master
+  git pull
+  popd
+done

src/be13_api

@@ -208,7 +208,7 @@ class flow_addr {
 	if (this->dport<b.dport) return true;
 	if (this->dport>b.dport) return false;
 	if (this->family < b.family) return true;
-	if (this->family > b.family) return true;
+	if (this->family > b.family) return false;
 	return false;    /* they are equal! */
     }
 };