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

Merge remote-tracking branch 'origin/topic/seth/tunnels-merge'

Browse source 
* origin/topic/seth/tunnels-merge:
  Add another SOCKS command.

Conflicts:
	scripts/base/protocols/socks/consts.bro
This commit is contained in:
Robin Sommer 2012-06-21 10:12:43 -07:00
commit fb8e9fc5f0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/protocols/socks/consts.bro
View file

@ -2,8 +2,9 @@ module SOCKS;
export { export {
type RequestType: enum { type RequestType: enum {
CONNECTION = 1, CONNECTION = 1,
PORT = 2, PORT = 2,
UDP_ASSOCIATE = 3,
}; };
const v5_authentication_methods: table[count] of string = { const v5_authentication_methods: table[count] of string = {
@ -36,5 +37,4 @@ export {
[7] = "Command not supported", [7] = "Command not supported",
[8] = "Address type not supported", [8] = "Address type not supported",
} &default=function(i: count):string { return fmt("unknown-%d", i); }; } &default=function(i: count):string { return fmt("unknown-%d", i); };
} }