osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
47110 commits 23 branches 0 tags 1.3 GiB
Commit graph

47110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Morriss
bbf6a3766e Move tempfile.{h,c} into wsutil. 
svn path=/trunk/; revision=50163
 2013-06-26 01:14:35 +00:00
Guy Harris
3ab335948b Nothing uses the HAVE_GTK #define, so get rid of it. (Keep the 
Makefile.am conditional, however.)

svn path=/trunk/; revision=50162
 2013-06-26 00:48:58 +00:00
Jeff Morriss
9ef2507e34 editcap no longer has to link against nstime.o, it's in libwsutil now. 
svn path=/trunk/; revision=50161
 2013-06-26 00:45:38 +00:00
Jeff Morriss
003ba14660 This file is in the top-level directory. Don't try to include things from ../ 
svn path=/trunk/; revision=50160
 2013-06-26 00:20:56 +00:00
Jeff Morriss
74dc568ef1 As pointed out by Guy: timestats uses packet_info so it belongs in epan 
not wsutil.

svn path=/trunk/; revision=50159
 2013-06-26 00:18:44 +00:00
Jeff Morriss
e101fe1160 Put wsutil/*.h into the wireshark-dev package (in a blind attempt to fix the debian packaging step). Why do we allow/encourage a wirshark-dev package? IMO Wireshark (C language) development should only be done from the source (a tarball or better yet SVN). 
svn path=/trunk/; revision=50158
 2013-06-25 23:41:06 +00:00
Jeff Morriss
2259c5c47d There's no need to compile timestats.c any more--it's now in libwsutil. 
svn path=/trunk/; revision=50157
 2013-06-25 23:34:07 +00:00
Evan Huus
a69be407ab Arrays seems to be where the failure is, so remove excess verbiage around other 
tests, and add more details to that section.

Now we wait for the buildbots to fail again...

svn path=/trunk/; revision=50156
 2013-06-25 22:32:53 +00:00
Jeff Morriss
c56ea13cdb Link this plugin with libwsutil too (in order to pick up time symbols). 
svn path=/trunk/; revision=50155
 2013-06-25 22:15:11 +00:00
Jeff Morriss
a441793cba Move a couple of time-related modules into wsutil. 
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
 2013-06-25 22:02:20 +00:00
Guy Harris
847fbeefdb Fix build with packet editor enabled. (Fix a typo while we're at it.) 
svn path=/trunk/; revision=50153
 2013-06-25 21:45:56 +00:00
Luis Ontanon
0a060270b3 Last changes to autofoo, rename the files as they live now in their own dir... 
svn path=/trunk/; revision=50152
 2013-06-25 21:09:29 +00:00
Pascal Quantin
9216d338f0 From Reinhard Speyerer via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8851: 
ansi_637_tele dissector displays MSB as MBS for Call-Back Number

svn path=/trunk/; revision=50151
 2013-06-25 21:05:28 +00:00
Evan Huus
242a37ea3e Look for moc-qt4 before moc and uic-qt4 before uic, because (at least on my 
machine, with both qt4 and qt5 development tools installed), moc and uic are the
qt5 versions, but the rest of the configuration process grabs qt4 headers and
link paths, leading to a lot of weird errors.

svn path=/trunk/; revision=50150
 2013-06-25 20:49:16 +00:00
Jeff Morriss
9cb2e270d6 Of course I forgot to test the normal/default case (where no --with arguments 
are given)...

Actually default --with-gtk2 to "yes".

svn path=/trunk/; revision=50149
 2013-06-25 20:06:33 +00:00
Jeff Morriss
fd95d841b8 Allow the Gtk+ and Qt versions to be built simultaneously (with autotools). 
./configure now accepts:
	--with-gtk2 :  enabled by default; exclusive of --with-gtk3
	--with-gtk3 : disabled by default; exclusive of --with-gtk2
	--with-qt   : disabled by default, can be specified with gtk
	--enable-wireshark : controls whether *any* GUI is built

If Qt is enabled then a new program is created: "wireshark-qt".  "wireshark"
remains the Gtk+ version.

svn path=/trunk/; revision=50147
 2013-06-25 19:51:53 +00:00
Bill Meier
8b9135e9b5 Indentation/Whitespace cleanup; 
Add editor modelines.

svn path=/trunk/; revision=50146
 2013-06-25 19:38:15 +00:00
Michael Mann
1d5f640230 Bugfix iec104 dissector, bug 8849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849) 
From Jiří Engelthaler

1) Wrong bits definitions for SIQ.BL, SIQ.SB, SIQ.NT, SIQ.IV, QDS.BL, QDS.SB, QDS.NT, QDS.IV
2) Invalid field abbrev for VTI Transient
3) Wrong bit size for SCO.QU, DCO.QU, RCO.QU
4) Changes from BASE_DEC to BASE_HEX
5) Several code style changes

svn path=/trunk/; revision=50145
 2013-06-25 19:32:39 +00:00
Jakub Zawadzki
f0c9b34b55 Allocate memory for col_text[_len] when really needed 
remove columnized bit, now the same can be done with col_text.

svn path=/trunk/; revision=50144
 2013-06-25 18:27:31 +00:00
Jakub Zawadzki
f56d9b49b3 packet_list_iter_children() simplify, just call packet_list_iter_nth_child(..., 0) 
svn path=/trunk/; revision=50143
 2013-06-25 18:07:33 +00:00
Luis Ontanon
ab6c7a8bce remove the Makefile.nmake target to avoid errors in dist... 
svn path=/trunk/; revision=50142
 2013-06-25 17:55:47 +00:00
Luis Ontanon
e200f6cbf9 This should get cmake to ignore echld... 
svn path=/trunk/; revision=50141
 2013-06-25 17:43:52 +00:00
Chris Maynard
ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes. 
svn path=/trunk/; revision=50140
 2013-06-25 15:32:49 +00:00
Gerald Combs
03febfc819 From Dirk Jagdmann: Use a guint32 for IPv4 addresses. Fixes compilation 
on OS X + Cmake.

svn path=/trunk/; revision=50139
 2013-06-25 13:31:19 +00:00
Luis Ontanon
a75e89c787 Revert --with-echld until I find out how to get it to work with Cmake... 
:

svn path=/trunk/; revision=50138
 2013-06-25 04:50:36 +00:00
Luis Ontanon
1c8b686eb0 --with-echld 
svn path=/trunk/; revision=50137
 2013-06-25 04:20:08 +00:00
Luis Ontanon
db09d8d0f0 another iteration, prepared for automake. 
svn path=/trunk/; revision=50136
 2013-06-25 03:33:02 +00:00
Luis Ontanon
e591c9f21e more stuff... 
svn path=/trunk/; revision=50135
 2013-06-25 00:31:01 +00:00
Evan Huus
cf7a0dde68 Based on initial patch by Michal Labedzki 
Don't return a negative value from get_type_length, it can get us into bad
loops. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8831

svn path=/trunk/; revision=50134
 2013-06-24 23:26:56 +00:00
Evan Huus
d65fa93218 From Fabio Tarabelloni via 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

More zigbee dissection:
- illuminance measurement cluster
- temperature measurement cluster
- pressure measurement cluster
- relative humidity measurement cluster

svn path=/trunk/; revision=50133
 2013-06-24 22:59:02 +00:00
Evan Huus
6ebdc45af1 Fix wmem_tree.h ifdef guards, hopefully fixing the check-abi buildbot. 
svn path=/trunk/; revision=50132
 2013-06-24 22:37:04 +00:00
Evan Huus
29c75dae91 So it comes to this... 
Put in a whole bunch of stderr output in the wmem tree tests in the hopes that
the next time one of the buildbots randomly (and irreproducibly) fails on this
step we'll have at least a bit of a hint as to where it happened.

svn path=/trunk/; revision=50131
 2013-06-24 21:59:02 +00:00
Pascal Quantin
d23f769c0d Add an option to dissect RRC-Container IE 
svn path=/trunk/; revision=50130
 2013-06-24 21:31:25 +00:00
Chris Maynard
93002cb9c5 A follow-up to r50127 to highlight the correct 4 bytes of the Ethernet FCS for the hf_eth_fcs_good and hf_eth_fcs_bad fields. 
svn path=/trunk/; revision=50128
 2013-06-24 19:27:47 +00:00
Guy Harris
00b1a9df1a The Ethernet FCS is 32 bits, not 16 bits. 
svn path=/trunk/; revision=50127
 2013-06-24 19:00:55 +00:00
Balint Reczey
b276978309 Dumpcap can write raw packets to stdout 
svn path=/trunk/; revision=50126
 2013-06-24 14:49:19 +00:00
Chris Maynard
16cd5cb653 Display RSSI in dB instead of dBm. Fixes the last remaining issue reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4507 
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=50125
 2013-06-24 14:30:00 +00:00
Alexis La Goutte
8765ad273d Make Authentification String filterable 
svn path=/trunk/; revision=50124
 2013-06-23 20:41:32 +00:00
Alexis La Goutte
fde47f55a9 From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8837 Add support for VHT Transmit Power Envelope IE 
Added support for VHT TPE IE and also tested it

Also fixed a small typo from "IEEE Stc" to "IEEE Std" for all 802.11ac references.

From me:
* Remove some trailing whitespace
* Fix bitmask PWR Info Unit
* Modify expert_info to display error in PWR Info Count
* Fix (possibility) loop
* Fix value_string (not need to have Reserved...)

svn path=/trunk/; revision=50123
 2013-06-23 20:41:18 +00:00
Alexis La Goutte
b818229a52 Enhance VRRP Dissector * Make checksum field filterable * Add also a checksum_bad filter and display a expert info when checksum is bad 
svn path=/trunk/; revision=50122
 2013-06-23 20:41:09 +00:00
Jörg Mayer
1ac4456c62 Alphabetically sort in file-mp4.c 
svn path=/trunk/; revision=50121
 2013-06-23 19:13:25 +00:00
Jörg Mayer
67d59d519c Small whitespace fixes 
svn path=/trunk/; revision=50120
 2013-06-23 19:12:50 +00:00
Gerald Combs
a4c7880083 [Automatic manuf, services and enterprise-numbers update for 2013-06-23] 
svn path=/trunk/; revision=50117
 2013-06-23 14:03:31 +00:00
Evan Huus
a1eae659f0 Only do a tree lookup if we have a tree to look up in. 
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8833

svn path=/trunk/; revision=50116
 2013-06-22 21:01:03 +00:00
Evan Huus
bfa8d9af75 Make assertions in tree lookup more useful and fix formatting. 
Should help debugging https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8833

svn path=/trunk/; revision=50115
 2013-06-22 21:00:36 +00:00
Luis Ontanon
f25a68221c Not yet running but almost there with the dummy 
svn path=/trunk/; revision=50114
 2013-06-22 20:26:13 +00:00
Michael Mann
87eb22f464 More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone. 
svn path=/trunk/; revision=50113
 2013-06-22 15:08:18 +00:00
Ronnie Sahlberg
707e2ce409 Make TCP segment length a generated field instead of a hidden field. 
We should deprecate the use of hidden fields, at least for fields that arei
useful in filters. To make it easier for users to discover and use the fields.

Change the highly useful field for TCP segment payload length from
being a hidden field to be a generated field instead.



svn path=/trunk/; revision=50112
 2013-06-22 02:00:03 +00:00
Michael Mann
e18e933482 Add Uli Heilmeier 
svn path=/trunk/; revision=50111
 2013-06-21 23:23:08 +00:00
Stephen Fisher
eeaba530ac AF_INET and AF_INET6 undefined in textpcap.c when compiling on FreeBSD 
9.1-RELEASE with non-standard gcc 4.6, so pull in sys/socket.h when available.


svn path=/trunk/; revision=50110
 2013-06-21 22:43:24 +00:00