Attachment 154784 Details for Bug 198888 – svn diff for net-mgmt/tcptrack

[patch] svn diff for net-mgmt/tcptrack

2015-03-24.diff (text/plain), 10.55 KB, created by Chris Hutchinson on 2015-03-24 23:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2015-03-24 23:56:52 UTC

Size: 10.55 KB

patch

obsolete

>Index: tcptrack/Makefile
>===================================================================
>--- tcptrack/Makefile	(revision 382164)
>+++ tcptrack/Makefile	(working copy)
>@@ -2,16 +2,19 @@
> # $FreeBSD$
> 
> PORTNAME=	tcptrack
>-PORTVERSION=	1.4.2
>-PORTREVISION=	2
>+PORTVERSION=	1.4.3
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt
>-MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/tcptrack/tcptrack-1.4.2.tar.gz/dacf71a6b5310caf1203a2171b598610/
>+MASTER_SITES=	http://BSDforge.com/projects/source/net-mgmt/tcptrack/
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Packet sniffer which displays TCP information like top(1)
>+MAINTAINER=	portmaster@BSDforge.com
>+COMMENT=	Packet sniffer that displays TCP information like top(1)
> 
>-LICENSE=	LGPL21
>+LICENSE=	LGPL21 BSD2CLAUSE
>+LICENSE_COMB=	multi
> 
>+USES=	tar:xz
>+
> GNU_CONFIGURE=	yes
> 
> PLIST_FILES=	bin/tcptrack man/man1/tcptrack.1.gz
>Index: tcptrack/distinfo
>===================================================================
>--- tcptrack/distinfo	(revision 382164)
>+++ tcptrack/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tcptrack-1.4.2.tar.gz) = 6607b1e1c778c49d3e8795e119065cf66eb2db28b3255dbc56b1612527107049
>-SIZE (tcptrack-1.4.2.tar.gz) = 120569
>+SHA256 (tcptrack-1.4.3.tar.xz) = be32d93bd082e46200fea73d3ecaf8a89b2ccfec0bdb3bc9fd67906e8f00c038
>+SIZE (tcptrack-1.4.3.tar.xz) = 94412
>Index: tcptrack/files/patch-IPv6Address.cc
>===================================================================
>--- tcptrack/files/patch-IPv6Address.cc	(revision 382164)
>+++ tcptrack/files/patch-IPv6Address.cc	(working copy)
>@@ -1,11 +0,0 @@
>---- src/IPv6Address.cc.orig	2010-09-28 03:35:16.000000000 +0200
>-+++ src/IPv6Address.cc	2014-07-18 10:19:48.000000000 +0200
>-@@ -7,6 +7,8 @@
>- #include "IPv6Address.h"
>- #include "util.h"
>- 
>-+#define s6_addr16 __u6_addr.__u6_addr16
>-+
>- uint16_t IPv6Address::GetShort( int index ) const
>- {
>- 	assert(index >= 0);
>Index: tcptrack/files/patch-const
>===================================================================
>--- tcptrack/files/patch-const	(revision 382164)
>+++ tcptrack/files/patch-const	(working copy)
>@@ -1,22 +0,0 @@
>-Const is good...
>-
>-	-mi
>-
>---- src/Guesser.h	2010-09-27 19:02:01.000000000 -0400
>-+++ src/Guesser.h	2015-03-23 11:42:51.000000000 -0400
>-@@ -20,5 +20,5 @@
>- {
>- public:
>--	bool operator()( const SocketPair &sp1, const SocketPair & sp2 )
>-+	bool operator()( const SocketPair &sp1, const SocketPair & sp2 ) const
>- 	{
>- 		if( sp1==sp2 )
>---- src/TCContainer.h	2010-09-27 19:02:01.000000000 -0400
>-+++ src/TCContainer.h	2015-03-23 11:40:43.000000000 -0400
>-@@ -58,5 +58,5 @@
>- {
>- public:
>--	bool operator()( const SocketPair &sp1, const SocketPair &sp2 ) 
>-+	bool operator()( const SocketPair &sp1, const SocketPair &sp2 ) const
>- 	{
>- 		if( sp1==sp2 )
>Index: tcptrack/files/patch-headers.h
>===================================================================
>--- tcptrack/files/patch-headers.h	(revision 382164)
>+++ tcptrack/files/patch-headers.h	(working copy)
>@@ -1,10 +0,0 @@
>---- src/headers.h-orig	2014-07-18 09:58:12.000000000 +0200
>-+++ src/headers.h	2014-07-18 09:58:31.000000000 +0200
>-@@ -120,7 +120,6 @@
>-     #define TH_URG 0x20
>-     #define TH_ECE 0x40
>-     #define TH_CWR 0x80
>--    #define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG|TH_ECE|TH_CWR)
>-     u_short th_win; /* window */
>-     u_short th_sum; /* checksum */
>-     u_short th_urp; /* urgent pointer */
>Index: tcptrack/files/patch-no-stack-limits
>===================================================================
>--- tcptrack/files/patch-no-stack-limits	(revision 382164)
>+++ tcptrack/files/patch-no-stack-limits	(working copy)
>@@ -1,160 +0,0 @@
>-Remove attempts to set arbitrary limits on stack-sizes for different
>-threads, which cause segfaults (due, presumably, to the limits being
>-too low).
>-
>-	-mi
>-
>---- src/defs.h	2010-09-27 19:02:01.000000000 -0400
>-+++ src/defs.h	2015-03-23 16:39:53.000000000 -0400
>-@@ -30,8 +30,2 @@
>- //#define FASTMODE_INTERVAL 250000000 // one quarter of a second
>- #define FASTMODE_INTERVAL 100000000 // one tenth of a second
>--
>--// stack sizes for the different threads
>--#define SS_PB  2048 // PacketBuffer
>--#define SS_S   4096 // Sniffer 2048 -> segfault on freebsd
>--#define SS_TCC 4096 // TCContainer
>--#define SS_TUI 5120 // TextUI. 4096 -> segfault on solaris
>---- src/PacketBuffer.cc	2010-09-27 19:02:01.000000000 -0400
>-+++ src/PacketBuffer.cc	2015-03-23 16:23:36.000000000 -0400
>-@@ -53,14 +53,6 @@
>- 	// Start up maintenence thread
>- 	//
>--	pthread_attr_t attr;
>--	if( pthread_attr_init( &attr ) != 0 )
>--		throw GenericError("pthread_attr_init() failed");
>--
>--	// TODO: there is no man page for this call on linux. Not sure what it
>--	// may return. On some systems it may not be supported at all 
>--	// (should return ENOSYS). Should be safe to ignore return val.
>--	pthread_attr_setstacksize( &attr, SS_PB );
>- 
>--	if( pthread_create(&maint_thread_tid,&attr,pbmaint_thread_func,this) != 0 )
>-+	if (pthread_create(&maint_thread_tid, NULL, pbmaint_thread_func, this) != 0)
>- 		throw GenericError("pthread_create() returned an error");
>- 
>---- src/Sniffer.cc	2010-09-27 19:02:22.000000000 -0400
>-+++ src/Sniffer.cc	2015-03-23 16:25:10.000000000 -0400
>-@@ -55,5 +66,5 @@
>- }
>- 
>--void Sniffer::init(char *iface, char *fexp, char *test_file)
>-+void Sniffer::init(const char *iface, const char *fexp, const char *test_file)
>- {
>- 	assert(pcap_initted==false);
>-@@ -89,6 +102,4 @@
>- 	// prepare the filter	
>- 	//
>--	struct bpf_program filter; // the filter for the sniffer
>--	char *filter_app = fexp;  // The filter expression
>- 	bpf_u_int32 mask;  // The netmask of our sniffing device
>- 	bpf_u_int32 net;    // The IP of our sniffing device
>-@@ -102,28 +113,23 @@
>- 		mask = 0;
>- 	}
>--	if( pcap_compile(handle, &filter, filter_app, 0, net) == -1 )
>--	{
>--		pcap_close(handle);
>--		throw PcapError("pcap_compile",pcap_geterr(handle));
>--	}
>--	if( pcap_setfilter(handle, &filter) ) // apply filter to sniffer
>--	{
>--		pcap_freecode(&filter);
>--		pcap_close(handle);
>--		throw PcapError("pcap_setfilter",pcap_geterr(handle));
>-+	if (fexp != NULL && fexp[0] != '\0') {
>-+		struct bpf_program filter; // the filter for the sniffer
>-+		if (pcap_compile(handle, &filter, fexp, 0, net) == -1)
>-+		{
>-+			pcap_close(handle);
>-+			throw PcapError("pcap_compile", pcap_geterr(handle));
>-+		}
>-+		if (pcap_setfilter(handle, &filter)) // apply filter to sniffer
>-+		{
>-+			pcap_freecode(&filter);
>-+			pcap_close(handle);
>-+			throw PcapError("pcap_setfilter", pcap_geterr(handle));
>-+		}
>-+		pcap_freecode(&filter); // filter code not needed after setfilter
>- 	}
>--	pcap_freecode(&filter); // filter code not needed after setfilter
>--	
>--	pcap_initted=true;
>--
>- 
>--	pthread_attr_t attr;
>--
>--	if( pthread_attr_init( &attr ) != 0 )
>--		throw GenericError("pthread_attr_init() failed");
>--
>--	pthread_attr_setstacksize( &attr, SS_S );
>-+	pcap_initted=true;
>- 
>--	if( pthread_create(&sniffer_tid,&attr,sniffer_thread_func,this) != 0 )
>-+	if (pthread_create(&sniffer_tid, NULL, sniffer_thread_func, this) != 0)
>- 		throw GenericError("pthread_create() failed.");
>- 
>-@@ -163,9 +170,11 @@
>- void Sniffer::processPacket( const pcap_pkthdr *header, const u_char *packet )
>- {
>--	assert( pthread_mutex_lock(&pb_mutex)==0 );
>-+
>-+	if (pthread_mutex_lock(&pb_mutex) != 0)
>-+		return;
>- 
>- 	if( pb==NULL ) 
>- 	{
>--		assert( pthread_mutex_unlock(&pb_mutex) == 0 );
>-+		pthread_mutex_unlock(&pb_mutex);
>- 		return;
>- 	}
>-@@ -193,5 +202,5 @@
>- 	pb->pushPacket(n);
>- 	
>--	assert( pthread_mutex_unlock(&pb_mutex) == 0 );
>-+	pthread_mutex_unlock(&pb_mutex);
>- }
>- 
>---- src/Sniffer.h	2010-09-27 19:02:22.000000000 -0400
>-+++ src/Sniffer.h	2015-03-23 15:07:57.000000000 -0400
>-@@ -43,5 +43,5 @@
>- 	// init performs some constructor-like activity. It is separate
>- 	// so that exceptions don't have to be thrown in the constructor.
>--	void init(char *iface, char *fexp, char *test_file);
>-+	void init(const char *iface, const char *fexp, const char *test_file);
>- 
>- 	// set the place where sniffed packets are sent for further 
>---- src/TCContainer.cc	2010-09-27 19:02:01.000000000 -0400
>-+++ src/TCContainer.cc	2015-03-23 16:23:05.000000000 -0400
>-@@ -47,15 +47,8 @@
>- 	state=TSTATE_IDLE;
>- 
>--	pthread_attr_t attr;
>--
>- 	pthread_mutex_init( &conlist_lock, NULL );
>- 	pthread_mutex_init( &state_mutex, NULL );
>- 
>--	if( pthread_attr_init( &attr ) != 0 )
>--		throw GenericError("pthread_attr_init() failed");
>--
>--	pthread_attr_setstacksize( &attr, SS_TCC );
>--
>--	if( pthread_create(&maint_thread_tid,&attr,maint_thread_func,this) != 0 )
>-+	if( pthread_create(&maint_thread_tid, NULL, maint_thread_func, this) != 0 )
>- 		throw GenericError("pthread_create() failed.");
>- 
>---- src/TextUI.cc	2011-08-03 13:34:45.000000000 -0400
>-+++ src/TextUI.cc	2015-03-23 16:24:20.000000000 -0400
>-@@ -80,11 +80,5 @@
>- 	run_displayer = true;
>- 
>--	pthread_attr_t attr;
>--	if( pthread_attr_init( &attr ) != 0 )
>--		throw GenericError("pthread_attr_init() failed");
>--
>--	pthread_attr_setstacksize( &attr, SS_TUI );
>--
>--	if( pthread_create(&displayer_tid,&attr,displayer_thread_func,this) != 0 )
>-+	if (pthread_create(&displayer_tid, NULL, displayer_thread_func, this) != 0)
>- 		throw GenericError("pthread_create() returned an error.");
>- 
>Index: tcptrack/files/patch-util.cc
>===================================================================
>--- tcptrack/files/patch-util.cc	(revision 382164)
>+++ tcptrack/files/patch-util.cc	(working copy)
>@@ -1,10 +0,0 @@
>---- src/util.cc-orig	2014-07-18 09:55:37.000000000 +0200
>-+++ src/util.cc	2014-07-18 09:56:11.000000000 +0200
>-@@ -22,6 +22,7 @@
>- #include "util.h"
>- #include <stdio.h>
>- #include <cstring>
>-+#include <string>
>- #include "headers.h"
>- #ifdef HAVE_HASH_MAP
>- # include <hash_map>
>Index: tcptrack/pkg-descr
>===================================================================
>--- tcptrack/pkg-descr	(revision 382164)
>+++ tcptrack/pkg-descr	(working copy)
>@@ -1,8 +1,9 @@
>-tcptrack is a sniffer which displays information about TCP connections it
>-sees on a network interface. It passively watches for connections on the
>-network interface, keeps track of their state and displays a list of
>-connections in a manner similar to the unix 'top' command. It displays
>-source and destination addresses and ports, connection state, idle time, and
>-bandwidth usage.
>+Tcptrack is a network sniffer that displays information about
>+TCP connections it sees on a network interface. It passively
>+watches for connections on the network interface, keeps track
>+of their state and displays a list of connections in a manner
>+similar to the UNIX 'top' command. It displays source and
>+destination addresses, and ports, connection state, idle time,
>+and bandwidth usage.
> 
>-WWW: http://www.rhythm.cx/~steve/devel/tcptrack/
>+WWW: http://BSDforge.com/projects/net-mgmt/tcptrack/

Actions: View | Diff

Attachments on bug 198888: 154784 | 154785