Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'patch-1' of https://github.com/balintm/bro

Browse source 
* 'patch-1' of https://github.com/balintm/bro:
  Update to SIP protocol
This commit is contained in:
Robin Sommer 2015-08-21 17:37:56 -07:00
commit d3f513fc80
3 changed files with 14904 additions and 14895 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,4 +1,11 @@
2.4-96 | 2015-08-21 17:37:56 -0700
* Update SIP analyzer. (balintm)
- Allows space on both sides of ':'.
- Require CR/LF after request/reply line.
2.4-94 | 2015-08-21 17:31:32 -0700 2.4-94 | 2015-08-21 17:31:32 -0700
* Add file type detection support for video/MP2T. (Mike Freemon) * Add file type detection support for video/MP2T. (Mike Freemon)

2
VERSION
View file

@ -1 +1 @@
2.4-94 2.4-96

6
src/analyzer/protocol/sip/sip-protocol.pac
View file

@ -10,6 +10,7 @@ type SIP_COLON = RE/:/;
type SIP_TO_EOL = RE/[^\r\n]*/; type SIP_TO_EOL = RE/[^\r\n]*/;
type SIP_EOL = RE/(\r\n){1,2}/; type SIP_EOL = RE/(\r\n){1,2}/;
type SIP_URI = RE/[[:alnum:]@[:punct:]]+/; type SIP_URI = RE/[[:alnum:]@[:punct:]]+/;
type SIP_NL = RE/(\r\n)/;
type SIP_PDU(is_orig: bool) = case is_orig of { type SIP_PDU(is_orig: bool) = case is_orig of {
true -> request: SIP_Request; true -> request: SIP_Request;
@ -18,13 +19,13 @@ type SIP_PDU(is_orig: bool) = case is_orig of {
type SIP_Request = record { type SIP_Request = record {
request: SIP_RequestLine; request: SIP_RequestLine;
newline: padding[2]; newline: SIP_NL;
msg: SIP_Message; msg: SIP_Message;
}; };
type SIP_Reply = record { type SIP_Reply = record {
reply: SIP_ReplyLine; reply: SIP_ReplyLine;
newline: padding[2]; newline: SIP_NL;
msg: SIP_Message; msg: SIP_Message;
}; };
@ -67,6 +68,7 @@ type SIP_Message = record {
type SIP_HEADER_NAME = RE/[^: \t]+/; type SIP_HEADER_NAME = RE/[^: \t]+/;
type SIP_Header = record { type SIP_Header = record {
name: SIP_HEADER_NAME; name: SIP_HEADER_NAME;
: SIP_WS;
: SIP_COLON; : SIP_COLON;
: SIP_WS; : SIP_WS;
value: SIP_TO_EOL; value: SIP_TO_EOL;