summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-08-03 16:21:12 +0300
committerYaroslav Brustinov <ybrustin@cisco.com>2016-08-03 16:21:12 +0300
commit0f863b48e742ecd6b6dd522803e95a528024bbc9 (patch)
tree81798d3fb9d40ee41efbb41d69170c752a5c3a5f /src/common
parent3159743120d9e1033c5ed809c1031b814204fd8f (diff)
parent0ccbb8ff779d4e905fc4fea5d2570f6e72821b0e (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/common')
-rwxr-xr-xsrc/common/pcap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/pcap.cpp b/src/common/pcap.cpp
index a68fb620..8e9bf0ac 100755
--- a/src/common/pcap.cpp
+++ b/src/common/pcap.cpp
@@ -154,18 +154,18 @@ bool LibPCapReader::ReadPacket(CCapPktRaw *lpPacket)
if (m_is_flip) {
flip(&pkt_header);
}
- if (pkt_header.len > READER_MAX_PACKET_SIZE) {
+ if (pkt_header.caplen > READER_MAX_PACKET_SIZE) {
/* cannot read this packet */
//printf("ERROR packet is too big, bigger than %d \n",READER_MAX_PACKET_SIZE);
return false;
}
- lpPacket->pkt_len = fread(lpPacket->raw,1,pkt_header.len,m_file_handler);
+ lpPacket->pkt_len = fread(lpPacket->raw,1,pkt_header.caplen,m_file_handler);
lpPacket->time_sec = pkt_header.ts.sec;
lpPacket->time_nsec = pkt_header.ts.msec*1000;
- if ( lpPacket->pkt_len < pkt_header.len) {
+ if ( lpPacket->pkt_len < pkt_header.caplen) {
lpPacket->pkt_len = 0;
return false;
}