Browse Source

Drop patch upstream.catch-caplen-exceed.patch, fixed upstream

See https://github.com/appneta/tcpreplay/pull/442
Christoph Biedl 11 months ago
parent
commit
11d7938107
2 changed files with 0 additions and 23 deletions
  1. 0 1
      debian/patches/series
  2. 0 22
      debian/patches/upstream.catch-caplen-exceed.patch

+ 0 - 1
debian/patches/series

@@ -1,7 +1,6 @@
 # cherry-picked commits. Keep in upstream's chronological order
 
 # patches that should go upstream
-upstream.catch-caplen-exceed.patch
 
 # modifications for Debian
 debian.disable-tcpreplay-test.patch

+ 0 - 22
debian/patches/upstream.catch-caplen-exceed.patch

@@ -1,22 +0,0 @@
-Description: Catch frames with a capture length bigger than the buffer
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Bug: https://github.com/appneta/tcpreplay/issues/405
-Last-Update: 2017-06-12
-
---- a/src/tcpcapinfo.c
-+++ b/src/tcpcapinfo.c
-@@ -306,6 +306,14 @@
-                 last_usec = pcap_ph.ts.tv_usec;
-             }
- 
-+            if (caplen > 10000) {
-+                printf("\n\nCapture file appears to be damaged or corrupt.\n"
-+                        "Contains packet of size %u, bigger than buffer length %u\n",
-+                        caplen, 10000);
-+                close(fd);
-+                break;
-+            }
-+
-             /* read the frame */
-             maxread = min((size_t)caplen, sizeof(buf));
-             if ((ret = read(fd, &buf, maxread)) != maxread) {