diff options
| author | bad <bad@pkgsrc.org> | 2006-10-14 09:20:14 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2006-10-14 09:20:14 +0000 |
| commit | ae611586160f82ebbb087f6b77d555e1ea7ba947 (patch) | |
| tree | eabf2b5ea75c2ea4f4bf6c63c64591ba1893e30f /graphics/xplot-devel | |
| parent | 49e233737e67c16139dc2952ad89bba5c2c5bc78 (diff) | |
| download | pkgsrc-ae611586160f82ebbb087f6b77d555e1ea7ba947.tar.gz | |
Fixes to tcpdump2xplot:
- Strip output added by modern tcpdump versions in verbose mode from
input lines (IP options, tcp checksum status).
- Split sack ranges on consecutive spaces instead of just a single space.
While here use a string comparison operator to compare second filed against
"IP" by copying the code from graphics/xplot patch-ab.
Diffstat (limited to 'graphics/xplot-devel')
| -rw-r--r-- | graphics/xplot-devel/Makefile | 3 | ||||
| -rw-r--r-- | graphics/xplot-devel/distinfo | 3 | ||||
| -rw-r--r-- | graphics/xplot-devel/patches/patch-ab | 34 |
3 files changed, 38 insertions, 2 deletions
diff --git a/graphics/xplot-devel/Makefile b/graphics/xplot-devel/Makefile index 3b243bed92b..c760097cda9 100644 --- a/graphics/xplot-devel/Makefile +++ b/graphics/xplot-devel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/08/16 18:11:40 gdt Exp $ +# $NetBSD: Makefile,v 1.2 2006/10/14 09:20:14 bad Exp $ DISTNAME= xplot-0.90.8 +PKGREVISION= 1 CATEGORIES= graphics x11 MASTER_SITES= http://acert.ir.bbn.com/downloads/acert-geospatial/ HOMEPAGE= http://www.xplot.org/ diff --git a/graphics/xplot-devel/distinfo b/graphics/xplot-devel/distinfo index 74bb062f542..5ff0f6a1e00 100644 --- a/graphics/xplot-devel/distinfo +++ b/graphics/xplot-devel/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/08/16 18:11:40 gdt Exp $ +$NetBSD: distinfo,v 1.2 2006/10/14 09:20:14 bad Exp $ SHA1 (xplot-0.90.8.tar.gz) = d87a382b01c7a48787d2c6fa2d16e0961de9d81c RMD160 (xplot-0.90.8.tar.gz) = ac8877ad7fa1c80afa0281236b3a4992482109c2 Size (xplot-0.90.8.tar.gz) = 243259 bytes SHA1 (patch-aa) = 48a475a550a2ea9d2bc50f2782d598830802817e +SHA1 (patch-ab) = f7eaac7296a830584b2cf02324086101579cc3d5 SHA1 (patch-ac) = 671b63a8db7c41df4e9f14147988d81ff921aca7 SHA1 (patch-ad) = fd19823030badf91734fde92b45fcaecc06cf0f8 diff --git a/graphics/xplot-devel/patches/patch-ab b/graphics/xplot-devel/patches/patch-ab new file mode 100644 index 00000000000..80622a6039b --- /dev/null +++ b/graphics/xplot-devel/patches/patch-ab @@ -0,0 +1,34 @@ +$NetBSD: patch-ab,v 1.1 2006/10/14 09:20:14 bad Exp $ + +--- tcpdump2xplot.pl.orig 2006-07-27 21:55:59.000000000 +0200 ++++ tcpdump2xplot.pl +@@ -229,12 +229,16 @@ for ($lineNo = 1; <$Tcpdump>; $lineNo++) + local(%opts); + + chop; ++ # strip unwanted output added by modern tcdump versions in verbose mode ++ s/\(tos.*?\)//; # (tos 0x0, ttl ... length: \d+) ++ s/ \[(?:bad )?tcp (?:ck)?sum.*?\]//; # [tcp sum ok]/[bad tcp cksum ....] + $opts = $_; # save this for later + +- split(/ /); +- if ($_[1] == "IP") { +- splice @_,1,1; +- } ++ split(/ +/); ++ # Sometime after version 3.7.1 tcpdump started to print 'IP' ++ # as the second field in the output. Get rid of it again. ++ # also remove additional fields printed in verbose mode ++ splice @_, 1, 1 if $_[1] eq 'IP'; + $time = $_[0]; + + # If there is if_signal.c-style signal strength info, elide it. +@@ -432,7 +436,7 @@ for ($lineNo = 1; <$Tcpdump>; $lineNo++) + + # print stderr "SACKS after : $sacks \n"; + +- @sacks = split(/ /, $sacks); ++ @sacks = split(/ +/, $sacks); + + for ($i = 0; $i <= $#sacks; $i++) { + local($start); |