Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Add sorting canonifier to rotate-custom unit test. (addresses #846)
  Fix compiler warnings
  Fix segfault when there's an error/timeout resolving DNS requests.
This commit is contained in:
Robin Sommer 2012-07-10 16:25:16 -07:00
commit e3f6a467a4
17 changed files with 29 additions and 21 deletions

View file

@ -18,9 +18,9 @@ struct pcap_pkthdr;
class EncapsulationStack;
class Connection;
class ConnID;
class OSFingerprint;
class ConnCompressor;
struct ConnID;
declare(PDict,Connection);
declare(PDict,FragReassembler);