Commit graph

6248 commits

Author SHA1 Message Date
Johanna Amann
ba8742ebb4 Update submodule
[nomail]
2016-02-08 17:54:33 -08:00
Johanna Amann
8f33d7fa4d Updating CHANGES and VERSION. 2016-02-08 14:30:56 -08:00
Johanna Amann
8913b60fd1 Add IRC leak test. 2016-02-08 14:27:58 -08:00
Dirk Leinenbach
6b5fd442f0 fix memory leaks in find_all() and IRC analyzer 2016-02-08 14:20:47 -08:00
Johanna Amann
9cdf869456 Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Removed duplicate parameter for IRC "QUIT" event handler.

Also add a test-case that checks the output of the quit
event handler.
2016-02-08 13:02:09 -08:00
Johanna Amann
043ebba937 Update submodule
[nomail]
2016-02-08 12:36:22 -08:00
Mark Taylor
e0e7a14031 Removed duplicate parameter for IRC "QUIT" event handler. 2016-02-05 19:26:04 -05:00
Robin Sommer
9ec6927cc1 Updating submodule(s).
[nomail]
2016-02-01 12:38:39 -08:00
Robin Sommer
72f0c2bd65 Merge remote-tracking branch 'origin/topic/johanna/cve-2015-3194'
* origin/topic/johanna/cve-2015-3194:
  Add testcase for CVE-2015-3194

BIT-1527 #merged
2016-02-01 12:36:54 -08:00
Robin Sommer
46931aa316 Merge remote-tracking branch 'origin/topic/dnthayer/mktemp'
* origin/topic/dnthayer/mktemp:
  Fix portability issue with use of mktemp
2016-02-01 12:34:24 -08:00
Robin Sommer
e63990398d Updating submodule(s).
[nomail]
2016-01-29 10:49:08 -08:00
Robin Sommer
67324a6a64 Updating submodule(s).
[nomail]
2016-01-29 10:48:45 -08:00
Daniel Thayer
3ba671ab3a Fix portability issue with use of mktemp
Some platforms require six Xs in the mktemp template.
2016-01-28 14:32:22 -06:00
Robin Sommer
cb41161d9f Merge branch 'master' of git.bro.org:bro
(Fixing a merge conflict in CHANGES).
2016-01-28 08:07:38 -08:00
Johanna Amann
aff555c95e Merge branch 'master' of https://github.com/marktayl/bro
* 'master' of https://github.com/marktayl/bro:
  Correct irc_privmsg_message handling.
2016-01-27 13:55:28 -08:00
Mark Taylor
e3d196ed7d Correct irc_privmsg_message handling.
Due to a logic bug, once an "irc_privmsg_message" event handler is created, *all* IRC events were routed down the code path, generally creating a Weird("irc_invalid_privmsg_message_format") event and terminating the inspection.
2016-01-27 14:54:48 -05:00
Robin Sommer
43ffc95b0d Updating submodule(s).
[nomail]
2016-01-25 15:59:46 -08:00
Robin Sommer
f78bbc8e6f Updating submodule(s).
[nomail]
2016-01-25 14:23:53 -08:00
Johanna Amann
bf52f986c2 Update copyright year for sphinx.
That way, not all of our pages say '2013' anymore.
2016-01-21 13:47:33 -08:00
Johanna Amann
600d6480b4 Update submodule
[nomail]
2016-01-21 10:25:03 -08:00
Johanna Amann
072a3fa28d Merge remote-tracking branch 'origin/topic/seth/radiotap'
BIT-1526 #merged

* origin/topic/seth/radiotap:
  Improved Radiotap support and a test.
  Fixed RadioTap support (still "Works for Me")
  Initial commit of RadioTap encapsulation support)
2016-01-20 17:45:25 -08:00
Johanna Amann
a88b32ca03 Add testcase for CVE-2015-3194 2016-01-19 14:45:52 -08:00
Robin Sommer
176b0e7b44 Merge remote-tracking branch 'origin/topic/seth/compiler-cleanup'
BIT-1524 #merged

* origin/topic/seth/compiler-cleanup:
  Updating binpac submodule.
  Fixed a format specifier.
  Adding override/final to overridden virtual methods.
2016-01-19 10:22:31 -08:00
Seth Hall
88f2a066ce Improved Radiotap support and a test.
Radiotap support should be fully functional now with Radiotap
packets that include IPv4 and IPv6.  Other radiotap packets are
silently ignored.  This includes a test which has 802.11 headers
both with and without QoS data.
2016-01-19 04:10:44 -05:00
Seth Hall
7d5acfd8c8 Merge remote-tracking branch 'origin/master' into topic/seth/radiotap 2016-01-18 12:17:07 -05:00
Seth Hall
154bc47e2e Updating binpac submodule. 2016-01-17 00:42:16 -05:00
Seth Hall
f88f3b56f5 Fixed a format specifier. 2016-01-16 23:44:05 -05:00
Seth Hall
a58c308427 Adding override/final to overridden virtual methods.
C++11 compilers complain about overridden virtual methods
not being specified as either final or overridden.
2016-01-16 23:35:31 -05:00
Johanna Amann
ad61267ce6 add new plugins so they are picked up by sphinx.
Also remove reference to dataseries.
2016-01-15 19:23:51 -08:00
Johanna Amann
8d8a883e78 Updating submodule.
[nomail]
2016-01-15 19:23:28 -08:00
Johanna Amann
895a56c019 Unbreak "make doc" after dataseries removal. 2016-01-15 17:21:39 -08:00
Robin Sommer
9423c325a6 Updating submodule(s).
[nomail]
2016-01-15 15:08:20 -08:00
Robin Sommer
a72626f01a Updating submodule(s).
[nomail]
2016-01-15 15:06:17 -08:00
Robin Sommer
642ef5d3c1 Tweaking how HTTP requests without URIs are handled.
The change from #49 made it an error to not have a URI. That however
then led requests with an URI yet no version to abort as well.
Instead, we now check if the token following the method is an "HTTP/"
version identifier. If, so accept that the URI is empty (and trigger
a weird) but otherwise keep processing.

Adding test cases for both HTTP requests without URI and without
version.
2016-01-15 12:59:11 -08:00
Robin Sommer
adb3fab019 Updating test baselines for http.log now including version. 2016-01-15 12:18:16 -08:00
Robin Sommer
9431ed3fe9 Merge branch 'patch-3' of https://github.com/aeppert/bro
* 'patch-3' of https://github.com/aeppert/bro:
  Add version to HTTP::Info
2016-01-15 10:35:57 -08:00
Robin Sommer
4a56a17817 Merge branch 'patch-2' of https://github.com/aeppert/bro
* 'patch-2' of https://github.com/aeppert/bro:
  NOTIFY is a valid SIP message per RFC3265
2016-01-15 10:21:21 -08:00
Robin Sommer
e42d25e705 Merge branch 'topic/http-missing-uri' of https://github.com/0xcc-labs/bro
* 'topic/http-missing-uri' of https://github.com/0xcc-labs/bro:
  update ParseRequest to handle missing uri
2016-01-15 10:19:49 -08:00
Robin Sommer
942b140fe5 Merge remote-tracking branch 'origin/topic/johanna/bit-1519'
BIT-1519 #merged

* origin/topic/johanna/bit-1519:
  Fix crash when deleting non existing record member.
2016-01-15 10:12:49 -08:00
Johanna Amann
990726b514 Fix crash when deleting non existing record member.
Addresses BIT-1519
2016-01-12 15:02:20 -08:00
Aaron Eppert
ada2b0088b Add version to HTTP::Info 2016-01-12 14:58:36 -05:00
Aaron Eppert
47a5db230e NOTIFY is a valid SIP message per RFC3265
Exists in newer Asterisk servers.
2016-01-08 17:11:14 -05:00
wglodek
020b09faa0 update ParseRequest to handle missing uri 2015-12-23 13:37:06 -05:00
Robin Sommer
374e61ee20 Updating submodule(s).
[nomail]
2015-12-19 13:40:28 -08:00
Robin Sommer
4218ab2dba Updating submodule. 2015-12-18 17:47:47 -08:00
Robin Sommer
aee312b5d2 Adding usage guard to canonifier script. 2015-12-18 12:59:26 -08:00
Robin Sommer
5cb4cd3970 Merge branch 'patch-1' of https://github.com/aeppert/bro 2015-12-18 11:43:38 -08:00
Robin Sommer
677f1172d9 Merge remote-tracking branch 'origin/topic/johanna/os-x-openssl'
* origin/topic/johanna/os-x-openssl:
  Update installation instructions to add os-x openssl dependency.

BIT-1506 #merged
2015-12-18 11:27:10 -08:00
Robin Sommer
eae21d4d33 Merge branch 'master' of git.bro.org:bro 2015-12-18 11:22:39 -08:00
Robin Sommer
0ba6bec710 Merge remote-tracking branch 'origin/topic/johanna/irc-starttls'
* origin/topic/johanna/irc-starttls:
  StartTLS support for IRC

BIT-1513 #merged
2015-12-18 11:20:59 -08:00