Merge branch 'master' into topic/jsiwek/broxygen

This commit is contained in:
Jon Siwek 2013-10-16 13:34:14 -05:00
commit 47d7d9047b
200 changed files with 2709 additions and 9011 deletions

View file

@ -521,7 +521,7 @@ static inline bool compare(const maskedvalue_list& mvals, uint32 v,
break;
default:
reporter->InternalError("unknown comparison type");
reporter->InternalError("unknown RuleHdrTest comparison type");
break;
}
return false;
@ -556,7 +556,7 @@ static inline bool compare(const vector<IPPrefix>& prefixes, const IPAddr& a,
break;
default:
reporter->InternalError("unknown comparison type");
reporter->InternalError("unknown RuleHdrTest comparison type");
break;
}
return false;
@ -661,7 +661,7 @@ RuleEndpointState* RuleMatcher::InitEndpoint(analyzer::Analyzer* analyzer,
break;
default:
reporter->InternalError("unknown protocol");
reporter->InternalError("unknown RuleHdrTest protocol type");
break;
}