From 977c1d7c5adbf1b3bb2be55a99c4bd018e78a524 Mon Sep 17 00:00:00 2001
From: Bernhard Amann <bernhard@icsi.berkeley.edu>
Date: Sun, 26 Aug 2012 17:52:07 -0700
Subject: [PATCH] make set_separators different from , work for input
 framework.

1-line-patch + test.
---
 .../out                                       | 10 ++++
 .../base/frameworks/input/setseparator.bro    | 46 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 testing/btest/Baseline/scripts.base.frameworks.input.setseparator/out
 create mode 100644 testing/btest/scripts/base/frameworks/input/setseparator.bro

diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.setseparator/out b/testing/btest/Baseline/scripts.base.frameworks.input.setseparator/out
new file mode 100644
index 0000000000..d0e0f53310
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.input.setseparator/out
@@ -0,0 +1,10 @@
+{
+[1] = [s={
+b,
+e,
+d,
+c,
+f,
+a
+}, ss=[1, 2, 3, 4, 5, 6]]
+}
diff --git a/testing/btest/scripts/base/frameworks/input/setseparator.bro b/testing/btest/scripts/base/frameworks/input/setseparator.bro
new file mode 100644
index 0000000000..44b9d08d54
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/input/setseparator.bro
@@ -0,0 +1,46 @@
+# (uses listen.bro just to ensure input sources are more reliably fully-read).
+# @TEST-SERIALIZE: comm
+#
+# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
+# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
+
+@TEST-START-FILE input.log
+#separator \x09
+#fields	i	s	ss
+1	a|b|c|d|e|f	1|2|3|4|5|6
+@TEST-END-FILE
+
+redef InputAscii::set_separator = "|";
+
+@load frameworks/communication/listen
+
+global outfile: file;
+
+module A;
+
+type Idx: record {
+	i: int;
+};
+
+type Val: record {
+	s: set[string];
+	ss:vector of count;
+};
+
+global servers: table[int] of Val = table();
+
+event bro_init()
+	{
+	outfile = open("../out");
+	# first read in the old stuff into the table...
+	Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]);
+	Input::remove("ssh");
+	}
+
+event Input::update_finished(name: string, source:string)
+	{
+	print outfile, servers;
+	close(outfile);
+	terminate();
+	}