kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes to tcpdump2xplot:

Browse source 
- 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.
This commit is contained in:
bad 2006-10-14 09:20:14 +00:00
parent 49e233737e
commit ae61158616
3 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/xplot-devel/Makefile
View file

@ -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/

3
graphics/xplot-devel/distinfo
View file

@ -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

34
graphics/xplot-devel/patches/patch-ab Normal file
View file

@ -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);