Merge branch 'master' into rpc

Conflicts:
	scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py

1 files changed, 2 insertions, 1 deletions

diff --git a/src/common/pcap.cpp b/src/common/pcap.cpp
index 6dd54514..9b360a3e 100755
--- a/src/common/pcap.cpp
+++ b/src/common/pcap.cpp
@@ -156,7 +156,8 @@ bool LibPCapReader::ReadPacket(CCapPktRaw *lpPacket)
    }
    if (pkt_header.len > READER_MAX_PACKET_SIZE) {
        /* cannot read this packet */
-	   assert(0);
+       printf("ERROR packet is too big, bigger than %d \n",READER_MAX_PACKET_SIZE);
+       exit(-1);
        return false;
    }