Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads

This commit is contained in:
Bernhard Amann 2012-04-18 09:28:49 -07:00
commit a2f1af12fa
77 changed files with 1333 additions and 379 deletions

View file

@ -509,9 +509,9 @@ protected:
#define NUM_PORT_SPACES 4
#define PORT_SPACE_MASK 0x30000
#define TCP_PORT_MASK 0x10000
#define UDP_PORT_MASK 0x20000
#define ICMP_PORT_MASK 0x30000
#define TCP_PORT_MASK 0x10000
#define UDP_PORT_MASK 0x20000
#define ICMP_PORT_MASK 0x30000
class PortVal : public Val {
public: