tcpreplay: Bump version to v4.2.0

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Chris Packham 2017-03-22 21:16:26 +13:00 committed by Thomas Petazzoni
parent 113fc1042c
commit 34fab3c049
3 changed files with 2 additions and 46 deletions

View File

@ -1,44 +0,0 @@
From d689d14dbcd768c028eab2fb378d849e543dcfe9 Mon Sep 17 00:00:00 2001
From: Fred Klassen <fklassen@appneta.com>
Date: Sun, 26 Feb 2017 20:45:59 -0800
Subject: [PATCH] #278 fail if capture has a packet that is too large (#286)
* #278 fail if capture has a packet that is too large
[baruch: remove the CHANGELOG update]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: upstream commit d689d14db
diff --git a/src/tcpcapinfo.c b/src/tcpcapinfo.c
index 775f1625b00f..96928820fe94 100644
--- a/src/tcpcapinfo.c
+++ b/src/tcpcapinfo.c
@@ -281,6 +281,15 @@ main(int argc, char *argv[])
caplen = pcap_ph.caplen;
}
+ if (caplentoobig) {
+ printf("\n\nCapture file appears to be damaged or corrupt.\n"
+ "Contains packet of size %u, bigger than snap length %u\n",
+ caplen, pcap_fh.snaplen);
+
+ close(fd);
+ break;
+ }
+
/* check to make sure timestamps don't go backwards */
if (last_sec > 0 && last_usec > 0) {
if ((pcap_ph.ts.tv_sec == last_sec) ?
@@ -306,7 +315,7 @@ main(int argc, char *argv[])
}
close(fd);
- continue;
+ break;
}
/* print the frame checksum */
--
2.11.0

View File

@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea tcpreplay-4.1.2.tar.gz
sha256 924f80cd1958a4c4447f0a6a54e8d3af7aebd3674aa4ef9973f69b43b1675221 tcpreplay-4.2.0.tar.gz

View File

@ -4,7 +4,7 @@
#
################################################################################
TCPREPLAY_VERSION = 4.1.2
TCPREPLAY_VERSION = 4.2.0
TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
TCPREPLAY_LICENSE = GPLv3
TCPREPLAY_LICENSE_FILES = docs/LICENSE