osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

provide global default files for cfilters/colorfilters/dfilters 

at least the colorfilters file needs some more "finetuning"

NSIS (Win32): install these files into the Ethereal Program dir, but don't overwrite existing ones

makefile.am: I've added the three files to EXTRA_DIST and pkgdata_DATA, which *seems* to be the right places

svn path=/trunk/; revision=14595
This commit is contained in:
Ulf Lamping 2005-06-09 07:43:32 +00:00
parent d77f558c59
commit 45bac4dda7
5 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -71,12 +71,12 @@ EXTRA_PROGRAMS = ethereal tethereal capinfos editcap mergecap dftest \
EXTRA_SCRIPTS = idl2eth
#
# Ethereal configuration files are put in $(pkgdatadir). It currently
# contains the "AUTHORS-SHORT" and "manuf" files and a "diameter" directory.
# Ethereal configuration files are put in $(pkgdatadir).
#
pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
ethereal-filter.html capinfos.html editcap.html \
idl2eth.html mergecap.html text2pcap.html
idl2eth.html mergecap.html text2pcap.html \
cfilters colorfilter dfilters
#
# Install the Diameter DTD and XML files in the "diameter" subdirectory
@ -434,7 +434,9 @@ EXTRA_DIST = \
capture-wpcap.h \
capture_wpcap_packet.c \
capture_wpcap_packet.h \
cfilters \
cleanbld.bat \
colorfilters \
config.h.win32 \
config.nmake \
debian/README.debian \
@ -447,6 +449,7 @@ EXTRA_DIST = \
debian/postinst \
debian/prerm \
debian/rules \
dfilters \
dictionary.dtd \
dictionary.xml \
doc/Makefile.am \

13
cfilters Normal file
View File

@ -0,0 +1,13 @@
"Ethernet address 00:08:15:00:08:15" ether host 00:08:15:00:08:15
"Ethernet type 0x0806 (ARP)" ether proto 0x0806
"No Broadcast and no Multicast" not broadcast and not multicast
"No ARP" not arp
"IP only" ip
"IP address 192.168.0.1" host 192.168.0.1
"IPX only" ipx
"TCP only" tcp
"UDP only" udp
"TCP or UDP port 80 (HTTP)" port 80
"HTTP TCP port (80)" tcp port http
"No ARP and no DNS" not arp and port not 53
"Non-HTTP and non-SMTP to/from www.ethereal.com" not port 80 and not port 25 and host www.ethereal.com

11
colorfilters Normal file
View File

@ -0,0 +1,11 @@
@tcp.analysis.flags@tcp.analysis.flags@[65535,0,19789][0,0,0]
@ARP@arp@[55011,59486,65534][0,0,0]
@ICMP@icmp@[31062,31186,65534][0,0,0]
@SMB@smb || nbss || nbns || nbipx || ipxsap || netbios@[65534,64008,39339][0,0,0]
@HTTP@http || tcp.port == 80@[26820,65534,22193][0,0,0]
@IPX@ipx || stp@[65534,58325,58808][0,0,0]
@Routing@hsrp || eigrp || cdp || vrrp || gvrp || igmp || ismp@[65534,62325,54808][0,0,0]
@DCERPC@dcerpc@[51199,38706,65533][0,0,0]
@TCP syn/fin@tcp.flags.syn == 1 || tcp.flags.fin == 1 || tcp.flags.reset == 1@[39040,49264,65534][0,0,0]
@TCP@tcp@[59345,58980,65534][0,0,0]
@TCP@udp@[28834,57427,65533][0,0,0]

15
dfilters Normal file
View File

@ -0,0 +1,15 @@
"Ethernet address 00:08:15:00:08:15" eth.addr == 00:08:15:00:08:15
"Ethernet type 0x0806 (ARP)" eth.type == 0x0806
"Ethernet broadcast" eth.addr == ff:ff:ff:ff:ff:ff
"No ARP" not arp
"IP only" ip
"IP address 192.168.0.1" ip.addr == 192.168.0.1
"IP address isn't 192.168.0.1, don't use != for this!" !(ip.addr == 192.168.0.1)
"IPX only" ipx
"TCP only" tcp
"UDP only" udp
"UDP port isn't 53 (not DNS), don't use != for this!" !(tcp.port == 53)
"TCP or UDP port is 80 (HTTP)" tcp.port == 80 || udp.port == 80
"HTTP" http
"No ARP and no DNS" not arp and !(udp.port == 53)
"Non-HTTP and non-SMTP to/from 192.168.0.1" not (tcp.port == 80) and not (tcp.port == 25) and ip.addr == 192.168.0.1

12
packaging/nsis/ethereal.nsi
View File

@ -271,6 +271,18 @@ File "..\..\manuf"
File "..\..\doc\ethereal.html"
File "..\..\doc\ethereal-filter.html"
; global config files - don't overwrite if already existing
IfFileExists cfilters dont_overwrite_cfilters
File "..\..\cfilters"
dont_overwrite_cfilters:
IfFileExists colorfilters dont_overwrite_colorfilters
File "..\..\colorfilters"
dont_overwrite_colorfilters:
IfFileExists dfilters dont_overwrite_dfilters
File "..\..\dfilters"
dont_overwrite_dfilters:
;
; Install the Diameter DTD and XML files in the "diameter" subdirectory
; of the installation directory.