From: Josh <jrosenba@cisco.com>
Date: Tue, 2 Sep 2014 14:15:42 +0000 (-0400)
Subject: Merge branch 'codecs' from Josh's Mac onto linux machine.
X-Git-Tag: 3.0.0-233~1414^2~2^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a06f4b8acf9dd3b62fd9cfd283713fdac705b3ff;p=thirdparty%2Fsnort3.git

Merge branch 'codecs' from Josh's Mac onto linux machine.

Conflicts:
	src/codecs/ip/cd_frag.cc
	src/codecs/root/cd_eth.cc
	src/codecs/template.cc
	src/protocols/protocol_ids.h
---

a06f4b8acf9dd3b62fd9cfd283713fdac705b3ff
diff --cc src/codecs/root/cd_eth.cc
index 15ef23afd,c5aa917cf..bb2a9252d
--- a/src/codecs/root/cd_eth.cc
+++ b/src/codecs/root/cd_eth.cc
@@@ -138,15 -138,15 +138,14 @@@ bool EthCodec::decode(const uint8_t *ra
              );
  
      next_prot_id = ntohs(eh->ether_type);
 -
      if (next_prot_id > eth::MIN_ETHERTYPE )
-     {
          p->proto_bits |= PROTO_BIT__ETH;
-         lyr_len = eth::ETH_HEADER_LEN;
-         return true;
-     }
+     else
+         next_prot_id = ETHERNET_LLC;
  
  
-     return false;
+     lyr_len = eth::ETH_HEADER_LEN;
+     return true;
  }