afpacket: add null decoder, put ethernet first

BeanGu · Dec 6, 2015 · 49dbb45 · 49dbb45
1 parent 7b45a8a
commit 49dbb45
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/source-af-packet.c b/src/source-af-packet.c
@@ -1860,19 +1860,22 @@ TmEcode DecodeAFP(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Packet
  }
 
  /* call the decoder */
- switch(p->datalink) {
- case LINKTYPE_LINUX_SLL:
- DecodeSll(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
- break;
+ switch (p->datalink) {
  case LINKTYPE_ETHERNET:
  DecodeEthernet(tv, dtv, p,GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
  break;
+ case LINKTYPE_LINUX_SLL:
+ DecodeSll(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
+ break;
  case LINKTYPE_PPP:
  DecodePPP(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
  break;
  case LINKTYPE_RAW:
  DecodeRaw(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
  break;
+ case LINKTYPE_NULL:
+ DecodeNull(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
+ break;
  default:
  SCLogError(SC_ERR_DATALINK_UNIMPLEMENTED, "Error: datalink type %" PRId32 " not yet supported in module DecodeAFP", p->datalink);
  break;