diff --git a/CHANGES b/CHANGES index 6fd14a2dd7..50a0f465ce 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.3-490 | 2015-03-02 17:11:10 -0800 + + * Updating docs for recent addition of local_resp. (Robin Sommer) + 2.3-489 | 2015-03-02 15:29:30 -0800 * Integrate Broker, Bro's new communication library. (Jon Siwek) @@ -8,8 +12,9 @@ Broker support is by default off for now; it can be enabled at configure time with --enable-broker. It requires CAF - (https://github.com/actor-framework/actor-framework); for now - needs the "develop" branch. Broker also requires a C++11 compiler. + (https://github.com/actor-framework/actor-framework); for now iot + needs CAF's "develop" branch. Broker also requires a C++11 + compiler. Broker will become a mandatory dependency in future Bro versions. diff --git a/VERSION b/VERSION index 3155627498..db60f45856 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-489 +2.3-490 diff --git a/doc/scripting/index.rst b/doc/scripting/index.rst index fb1c1b67a1..11c2119df9 100644 --- a/doc/scripting/index.rst +++ b/doc/scripting/index.rst @@ -826,7 +826,7 @@ example of the ``record`` data type in the earlier sections, the ``conn.log``, is shown by the excerpt below. .. btest-include:: ${BRO_SRC_ROOT}/scripts/base/protocols/conn/main.bro - :lines: 10-12,16-17,19,21,23,25,28,31,35,38,57,63,69,92,95,99,102,106,110-111,116 + :lines: 10-12,16-17,19,21,23,25,28,31,35,38,57,63,69,75,98,101,105,108,112,116-117,122 Looking at the structure of the definition, a new collection of data types is being defined as a type called ``Info``. Since this type diff --git a/testing/btest/Baseline/doc.sphinx.include-scripts_base_protocols_conn_main_bro/output b/testing/btest/Baseline/doc.sphinx.include-scripts_base_protocols_conn_main_bro/output index 9966341119..83e9d5bea1 100644 --- a/testing/btest/Baseline/doc.sphinx.include-scripts_base_protocols_conn_main_bro/output +++ b/testing/btest/Baseline/doc.sphinx.include-scripts_base_protocols_conn_main_bro/output @@ -17,6 +17,7 @@ export { resp_bytes: count &log &optional; conn_state: string &log &optional; local_orig: bool &log &optional; + local_resp: bool &log &optional; missed_bytes: count &log &default=0; history: string &log &optional; orig_pkts: count &log &optional; diff --git a/testing/btest/doc/sphinx/include-scripts_base_protocols_conn_main_bro.btest b/testing/btest/doc/sphinx/include-scripts_base_protocols_conn_main_bro.btest index 4b15400080..83e9d5bea1 100644 --- a/testing/btest/doc/sphinx/include-scripts_base_protocols_conn_main_bro.btest +++ b/testing/btest/doc/sphinx/include-scripts_base_protocols_conn_main_bro.btest @@ -18,11 +18,12 @@ export { conn_state: string &log &optional; local_orig: bool &log &optional; local_resp: bool &log &optional; - ## - ## lower-case. Multiple packets of the same type will only be - ## Number of packets that the originator sent. - ## Number of IP level bytes that the originator sent (as seen on - ## Number of packets that the responder sent. - ## the wire, taken from the IP total_length header field). - ## Only set if :bro:id:`use_conn_size_analyzer` = T. + missed_bytes: count &log &default=0; + history: string &log &optional; + orig_pkts: count &log &optional; + orig_ip_bytes: count &log &optional; + resp_pkts: count &log &optional; + resp_ip_bytes: count &log &optional; tunnel_parents: set[string] &log; + }; +}