Commit graph

1825 commits

Author SHA1 Message Date
Robin Sommer
035de0216e Merge remote-tracking branch 'origin/topic/jsiwek/coverage-tweaks'
* origin/topic/jsiwek/coverage-tweaks:
  Changes to how script coverage integrates with test suites.

Closes #794.
2012-03-02 09:36:11 -08:00
Robin Sommer
ada5f38d04 Merge branch 'master-merge-helper'
* master-merge-helper:
  possible use after free forbidden
  Suppression of unused code
  Fix of some memory leaks
  removing dead code
  A destructor must free the memory allocated by the constructor
  Good overridance with the good qualifier
  Better use of operators priorities
  protection from bad frees on unallocated strings
2012-02-24 16:37:45 -08:00
Robin Sommer
3323692771 Merge remote-tracking branch 'origin/topic/jsiwek/ipaddr-refactoring'
* origin/topic/jsiwek/ipaddr-refactoring:
  Refactoring various usages of new IPAddr class.

Conflicts:
	src/bro.bif

Closes #784.
2012-02-24 15:21:57 -08:00
Robin Sommer
33777f13c5 Merge branch 'master' of ssh://git.bro-ids.org/bro 2012-02-24 15:04:06 -08:00
Robin Sommer
4ef8607e60 Merge remote-tracking branch 'origin/topic/dnthayer/ftp-ipv6'
* origin/topic/dnthayer/ftp-ipv6:
  Add test case for FTP over IPv4
  Fix IPv6 URLs
  Add a test for FTP over IPv6
  Update FTP EPSV response processing for IPv6
  Fix parsing of FTP EPRT command and EPSV response

Conflicts:
	src/bro.bif

Closes #778.
2012-02-24 15:00:41 -08:00
Robin Sommer
d887eb3178 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  GeoIP installation documentation update.
  Decrease strictness of parsing IPv4 strings into addrs. (fixes #775)
  Fix memory leak in DNS manager (fixes #777).

Closes #777.
2012-02-22 05:28:29 -08:00
Robin Sommer
b3333a7da2 Reverting loopback change which doesn't seem to fully work. 2012-02-17 17:46:51 -08:00
Robin Sommer
0e3934b196 Updating NEWS. 2012-02-17 15:39:59 -08:00
Robin Sommer
7458ebf385 Checkpoint after pass. 2012-02-15 13:07:08 -08:00
Robin Sommer
357cdd3f8d Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix minor typos in the documentation
  Fix compiler warning about Brofiler ctor init list order.
2012-02-10 00:04:02 -08:00
Seth Hall
44bb4d0320 Updates for CHANGES and VERSION files. 2012-02-03 16:17:45 -05:00
Robin Sommer
396e8c901c Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix minor typos in documentation
2012-02-03 01:56:30 -08:00
Robin Sommer
9c9b72a1b8 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix sorting of lines in Brofiler coverage.log
2012-01-31 11:51:25 -08:00
Robin Sommer
c607785cec Merge remote-tracking branch 'origin/topic/jsiwek/brofiler'
* origin/topic/jsiwek/brofiler:
  Fix mktemp portability issue affecting test coverage. (addresses #752)

Closes #752.
2012-01-27 10:43:43 -08:00
Robin Sommer
b649ade9ba Merge remote-tracking branch 'origin/topic/bif_cleanup'
* origin/topic/bif_cleanup:
  Give mode2string a more generic name.
  Change some BiF return values from bool to any.
  Perform type checking on count-to-port conversion.
  Remove redundant connection_record() BiF.
  Remove redundant active_connection() BiF.
  Make exit() parameterizable.
  to_port() now parses a string instead of a count.

Closes #684.
2012-01-25 16:48:00 -08:00
Robin Sommer
7a8c9b1c69 Merge remote-tracking branch 'origin/topic/jsiwek/local-table-init'
* origin/topic/jsiwek/local-table-init:
  Allow local table variables to be initialized with {} list expressions.

Closes #739.
2012-01-25 13:47:42 -08:00
Robin Sommer
27ce62077f Merge remote-tracking branch 'origin/topic/jsiwek/complex-record-indices'
* origin/topic/jsiwek/complex-record-indices:
  Teach CompHash to allow indexing by records with vector/table/set fields.

Closes #464
2012-01-25 13:38:36 -08:00
Robin Sommer
2a06617e71 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fixed a bug resulting in over-logging of detected webapps.
2012-01-25 13:25:48 -08:00
Robin Sommer
8b06fdfc67 Updating CHANGES and VERSION. 2012-01-10 17:51:34 -08:00
Robin Sommer
b284dd25cf Merge remote-tracking branch 'origin/master' 2012-01-10 10:46:49 -08:00
Robin Sommer
82b1ee0720 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Change SFTP/SCP log rotators to use 4-digit year in filenames (fixes #745).
  Adding back the stats.bro file.

Closes #745.
Closes #656.
2012-01-10 09:49:58 -08:00
Robin Sommer
cbfe16db0e Updating baseline. 2012-01-09 18:01:13 -08:00
Robin Sommer
03306d791d Merge remote-tracking branch 'origin/topic/jsiwek/sftp-pp'
* origin/topic/jsiwek/sftp-pp:
  Add SFTP log postprocessor that transfers logs to remote hosts.
  Add FAQ entry about disabling NIC offloading features.

Closes #737.
2012-01-08 20:49:50 -08:00
Robin Sommer
edb6e80ff3 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove upgrade documentation regarding change in default snaplen.
  Reduce snaplen default from 65535 to old default of 8192. (fixes #720)

Closes #720.
2012-01-05 15:03:06 -08:00
Robin Sommer
e5b3d318a6 Merge remote-tracking branch 'origin/topic/seth/ssl-improvements'
* origin/topic/seth/ssl-improvements:
  Removed the SSLv2.cc file since it's not used.
  Added the ssl_session_ticket_handshake event back.
  Added the ssl_session_ticket_handshake event and fixed a few SSL bugs.
2012-01-04 12:48:39 -08:00
Robin Sommer
0ca6e492b3 Merge branch 'master' of ssh://git.bro-ids.org/bro 2012-01-04 12:45:42 -08:00
Robin Sommer
358db60503 Merge remote-tracking branch 'origin/topic/jsiwek/remove-refined-type'
* origin/topic/jsiwek/remove-refined-type:
  Remove dead code related to record type inheritance.
2012-01-03 15:42:44 -08:00
Robin Sommer
5e9153d7d6 Merge remote-tracking branch 'origin/topic/bernhard/notice-proto'
* origin/topic/bernhard/notice-proto:
  log protocol in notices.

Conflicts:
	scripts/base/frameworks/notice/main.bro

Closes #718.
2012-01-03 14:52:07 -08:00
Robin Sommer
5435dcbfb1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  CMake 2.6 top-level 'install' target compat. (fixes #729)
  Minor fixes to external test process. (addresses #298)
  Increase timeout interval of communication-related btests.

Closes #729.
Closes #298.
2012-01-03 14:48:15 -08:00
Robin Sommer
43124d4b1c Update one more baseline. 2011-12-19 11:37:51 -08:00
Robin Sommer
26ff8e1dab Merge remote branch 'origin/topic/seth/notice-email-delay'
* origin/topic/seth/notice-email-delay:
  The hostname notice email extension works now.
  Fixed more bugs with delayed emails.
  Working around a problem with setting default container types.
  Ugh, still major failure.  I'm just cutting the timeout handling for now.
  Fixed a small bug major problem with email delay timeout catching.
  Initial fixes for the problem of async actions with notice email extensions.

Closes #727.
2011-12-19 07:10:28 -08:00
Robin Sommer
0a3e160a8d Merge remote branch 'origin/topic/seth/dns-updates'
* origin/topic/seth/dns-updates:
  Fixed some bugs with capturing data in the base DNS script.
  Some updates to the base DNS script.

Closes #702.
2011-12-18 15:20:00 -08:00
Robin Sommer
719557a05b Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Enable warnings for malformed Broxygen xref roles.
  Broxygen fix for function parameter recognition; better than 80b2451.
  Allow Broxygen markup "##<" for more general use.
2011-12-18 15:10:49 -08:00
Robin Sommer
84e6caed2c Merge remote branch 'origin/master'
* origin/master:
  Cleanup some misc Broxygen css/js stuff.
  Add search box to Broxygen docs (fixes #726).

Some markup for the tracker to close the recently addresses tickets:

Closes #726.
Closes #433.
Closes #311.
Closes #664.
2011-12-16 02:41:43 -08:00
Robin Sommer
3c2fa085d4 Adapting diff-all so that it expands globs in both current and
baseline directory.

This way, it now spots if a Baseline file isn't produced anymore.

Closes #677.
2011-12-07 10:03:44 -08:00
Robin Sommer
9d5f79a0fa Updating submodule(s).
[nomail]
2011-12-06 11:49:49 -08:00
Robin Sommer
b449d5652d Merge remote-tracking branch 'remotes/origin/topic/robin/broccoli-connrec'
* remotes/origin/topic/robin/broccoli-connrec:
  Adapting attribute serialization when talking to Broccoli.
2011-12-03 15:57:39 -08:00
Robin Sommer
6943b3c4b1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Changes to Broxygen master script package index
2011-12-03 15:56:32 -08:00
Robin Sommer
89f4e44f6a Updating submodule(s).
[nomail]
2011-12-02 17:11:44 -08:00
Robin Sommer
e8a25ee68f Updating CHANGES and VERSION. 2011-12-01 15:49:10 -08:00
Robin Sommer
ebd15cf12e Fixing ASCII logger to escape the unset-field place-holder if written
out literally.
2011-11-29 17:01:47 -08:00
Robin Sommer
5fae0482a9 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add Broxygen links to notice frameworks docs.
  Fix order of include directories.
  vector entries also have to be atomic.
2011-11-29 15:37:47 -08:00
Robin Sommer
5fbebe1e22 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix small bug: sets that are written to logfiles may only contain atomic types. (trying to write sets of records, etc. leads to a bro segfault)
2011-11-16 08:40:09 -08:00
Robin Sommer
fa76330afb Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Binary packaging script tweaks.
  More default "weird" tuning for the "SYN_with_data" notice.
  Tiny bugfix for http file extraction along with test.
2011-11-15 07:53:36 -08:00
Robin Sommer
8935663981 Updating CHANGES and VERSION. 2011-11-07 05:44:38 -08:00
Robin Sommer
9aef0c0f5a Fixing packet filter test.
Adapting the IPv6 one as well, though I believe that's already
broken anyway ...
2011-11-03 17:42:06 -07:00
Robin Sommer
41a443677b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-03 15:27:23 -07:00
Robin Sommer
3b1f13b861 Merge remote-tracking branch 'origin/topic/jsiwek/compiler-warnings'
* origin/topic/jsiwek/compiler-warnings:
  Fixing compiler warnings (addresses #388)
2011-11-03 15:18:11 -07:00
Robin Sommer
e75fb1dd8b Updating submodule(s). 2011-10-27 17:46:28 -07:00
Robin Sommer
38876ac899 Updating submodule(s). 2011-10-27 13:00:33 -07:00