Commit Graph

25188 Commits

Author SHA1 Message Date
Bill Meier 9ef15c9aa4 temp fix (until the proper fix) to handle buildbot errs;
svn path=/trunk/; revision=25922
2008-08-04 23:15:51 +00:00
Gerald Combs 7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +00:00
Anders Broman da85c3dfab From Alexey Neyman :
This patch implements a function for dissecting bitfields with better control
over the resulting representation than the existing proto_tree_add_bitmask()
routine. This function will be used by reworked IPMI/ATCA dissector (bug 2048).

The function is described in README.developer. In short, the differences are as
follows:

- The new function does not require a hf_XXX field for the whole bitmask. When
the bitmask includes several unrelated fields, such hf_XXX field does not make
sense.

- The new function allows better control over the way the sub-item descriptions
are added to the top-level item. For example, proto_tree_add_bitmask() function
does not add non-enumerated integers, does not use true_false_string to display
boolean.

- The new function allows to specify "fallback" text for the top-level item
which is used if no items were added to the top-level item.

svn path=/trunk/; revision=25920
2008-08-04 20:41:43 +00:00
Anders Broman 774f288597 Give Vincent Helfre and Magnus Sörman credit.
svn path=/trunk/; revision=25919
2008-08-04 20:21:41 +00:00
Anders Broman 5cbe7f0f17 Fix packet-gsm_a_common.c:63: warning: assignment makes integer from pointer without a cast.
Assuming the default shouldn't occure and fix a copy past error.

svn path=/trunk/; revision=25918
2008-08-04 20:17:34 +00:00
Anders Broman 082a5aec04 From Neil Piercy:
All I've done in these is to split the 3 obviously distinct protocols (BSSMAP & RP) from the still-large (and wrongly-named) DTAP (really the whole of layer 3 - it includes RR and packet parts too).

So far I've only split in a "minimum change" manner - there is clearly some tidying and structure enhancement of how the common bits are used, removing the globals just added, and great scope for consistency of white space, improved naming etc. - but I thought it best to keep it very close to the original initially to establish the split.

With some changes to make it compile on Windows.

svn path=/trunk/; revision=25917
2008-08-04 19:44:03 +00:00
Martin Mathieson ad16b7b403 Declare next_tvb volatile. This prevents the warning:
packet-infiniband.c:806: warning: variable 'next_tvb' might be clobbered by `longjmp' or `vfork'

seen with gcc 3.4.6 (building for 32-bits on a pentium 4).

svn path=/trunk/; revision=25916
2008-08-04 16:36:16 +00:00
Anders Broman 96aa45646d First step to split the gsm_a dissector into several smaller ones ( done by Neil Piercy)
rename the "old" one to gsm_a_common.

svn path=/trunk/; revision=25915
2008-08-04 16:11:17 +00:00
Bill Meier f4a7b39753 Print various uints with %u ...
svn path=/trunk/; revision=25914
2008-08-04 03:46:49 +00:00
Bill Meier 8f84b18945 Fix 2 bugs:
- Misplaced } resulted in incorrect program flow in switch statement;
- Invalid input caused "Dissector bug: infinite loop";

svn path=/trunk/; revision=25913
2008-08-04 02:56:47 +00:00
Bill Meier be04142585 Fix buildbot error: "no newline at end of file"
svn path=/trunk/; revision=25912
2008-08-04 02:31:35 +00:00
Bill Meier 1fc904c6be Adjust various indentation/spacing; Do some minor reformatting
svn path=/trunk/; revision=25911
2008-08-04 02:27:20 +00:00
Anders Broman d8c21bbe38 Revert previous checkin.
svn path=/trunk/; revision=25910
2008-08-03 16:11:23 +00:00
Anders Broman 86e0bde995 packet-multipart.c:179: warning: unused parameter 'pinfo'
packet-multipart.c:179: warning: unused parameter 'name'
( restore a bit of previous code)
Move inclusion of tvbuff.h to base64.c

svn path=/trunk/; revision=25909
2008-08-03 15:44:26 +00:00
Anders Broman 2b9d63a4b5 Move common code to base64.c
svn path=/trunk/; revision=25908
2008-08-03 14:27:22 +00:00
Guy Harris ea4fbda062 Don't fetch data until you need it.
svn path=/trunk/; revision=25907
2008-08-02 21:59:33 +00:00
Anders Broman 38ac851958 Fix packet-netflow.c:2666: warning: 'pen' may be used uninitialized in this function
and remove some C++ comments - some compilers don't allow them (at least not by default).

svn path=/trunk/; revision=25906
2008-08-02 16:13:40 +00:00
Anders Broman 7be2278d3c From Hitoshi Irino:
This patch
(1) fixes to decode IPFIX packets.
The revision 25601 warns and be not able to decodes IPFIX packets fully,
because the array "hf_register_info" does not have an entry
"hf_cflow_datarecord_length", and a length check for IPFIX packets is incorrect
in "dissect_netflow" function.
(2) is able to decode all Information Elements standardized by RFC 5102
(3) is able to decode IPFIX templates and data that contains PEN (Private
Enterprise Number) fields standardized by RFC 5101, and is able to decode
bi-directional flow standardized by RFC 5103.

svn path=/trunk/; revision=25905
2008-08-02 13:53:49 +00:00
Anders Broman 449e40f6b1 From Abhik Sarkar:
Some buttons are always disabled in the "User DLTs Table" dialog.

svn path=/trunk/; revision=25904
2008-08-02 13:47:31 +00:00
Bill Meier c90024fe80 WIN32 ==> _WIN32
svn path=/trunk/; revision=25903
2008-08-02 12:20:38 +00:00
Anders Broman bb54e0bb03 From metatech:
- In DRDA the data is of different "nature" : EBCDIC vs ASCII, so I think they
deserve different field names.

svn path=/trunk/; revision=25902
2008-08-01 18:17:23 +00:00
Jaap Keuter 18b69aef03 Really start printing in 8 pnt Courier, not just state so in the template.
Add Wireshark version info to the page header.

svn path=/trunk/; revision=25901
2008-08-01 17:36:09 +00:00
Jaap Keuter 2db97aed2c Several improvements to the PostScript code:
- Remove old code and comments.
- Add 5 pnt between last lines baseline and lower horizontal line to avoid having the last line sitting right on top of the horizontal line
- Fix pagewidth expression (although outcome is the same)
- Add page decorations for single page print as well
- Add DSC end of file marker

svn path=/trunk/; revision=25900
2008-08-01 17:34:36 +00:00
Stig Bjørlykke 341fba51c5 Remove a few warnings.
svn path=/trunk/; revision=25899
2008-08-01 16:49:12 +00:00
Stig Bjørlykke 2f2a8edbd7 Regenerated to use the new decode function for UTCTime.
svn path=/trunk/; revision=25898
2008-08-01 16:45:30 +00:00
Stig Bjørlykke d255e44bfa From Martin Peylo (bug 2507):
The attached patch enables asn2wrs.py and packet-ber.c to decode UTCTime
according to the definitions in X.680.

svn path=/trunk/; revision=25897
2008-08-01 16:44:06 +00:00
Anders Broman 1fa1d7736e packet-turnchannel.c:219: warning: passing argument 2 of 'register_dissector' from incompatible pointer type
A dissector returning int should return the length consumed of the tvb and be
registered with new_register_dissector();

svn path=/trunk/; revision=25896
2008-08-01 15:45:29 +00:00
Anders Broman 47aca4c30f From stéphane bryant:
STUN, STUN2 and TURN dissection enhancements.

svn path=/trunk/; revision=25895
2008-08-01 15:11:06 +00:00
Stig Bjørlykke 94d4e2c70a boolean -> gboolean
svn path=/trunk/; revision=25894
2008-08-01 14:26:48 +00:00
Anders Broman b43d3c1380 fix packet-sndcp-xid.c:483: warning: unused parameter 'pinfo'
svn path=/trunk/; revision=25893
2008-08-01 12:42:38 +00:00
Anders Broman 2c4bdd2e82 From Bill Meier:
segmentation fault loading trace containing NCP packets.

svn path=/trunk/; revision=25892
2008-08-01 11:56:57 +00:00
Anders Broman acd81d93f8 Fix packet-gprs-llc.c:413: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'guint32' and the modified makfiloe.common missed in previous checkin.
svn path=/trunk/; revision=25891
2008-08-01 11:25:23 +00:00
Anders Broman 37969b91b1 From Yaniv Kaul:
( I edited the template files)
Failure to dissect long SASL wrapped LDAP response.

svn path=/trunk/; revision=25890
2008-08-01 11:20:50 +00:00
Anders Broman 21381b2f37 From Vincent Helfre:
Implementation of a dissector for SNDCP XID parameters

svn path=/trunk/; revision=25889
2008-08-01 11:08:21 +00:00
Anders Broman baf9959afa From Alexey Neyman:
Fix proto_tree_add_*_format_value() operation on bitfields.

svn path=/trunk/; revision=25888
2008-08-01 10:16:52 +00:00
Jaap Keuter fea73c637c From Joe Eykholt:
patch to fix misuse of format specifier %d for unsigned ints.

svn path=/trunk/; revision=25887
2008-08-01 06:13:25 +00:00
Gerald Combs 502524d7b3 Use guints for our tap array indices and use >= to make sure they wrap. This
works around bug 2758 (which is apparently a compiler bug).

svn path=/trunk/; revision=25886
2008-08-01 00:22:36 +00:00
Anders Broman f330069fc4 Fix:
packet-gsm_a.c:13503: warning: unused parameter 'len'
packet-gsm_a.c:13548: warning: unused parameter 'len'
packet-gsm_a.c:13568: warning: unused parameter 'len'
packet-gsm_a.c:13610: warning: unused parameter 'len'
packet-gsm_a.c:13656: warning: unused parameter 'len'
packet-gsm_a.c:13690: warning: unused parameter 'len'
packet-gsm_a.c:13714: warning: unused parameter 'len'
packet-gsm_a.c:13736: warning: unused parameter 'len'
packet-gsm_a.c:13758: warning: unused parameter 'len'
packet-gsm_a.c:13807: warning: unused parameter 'len'
packet-gsm_a.c:13832: warning: unused parameter 'len'

svn path=/trunk/; revision=25885
2008-07-31 10:39:37 +00:00
Anders Broman 11c13bccb9 From Pascal Quantin:
Add Tests Procedures decoding to GSM A Interface (BSSMAP/DTAP) dissection.

svn path=/trunk/; revision=25884
2008-07-31 10:06:05 +00:00
Anders Broman d0c26a3c21 From Alex <burlyga :
Better display of callback info for NFSv4 SETCLIENTID op

svn path=/trunk/; revision=25883
2008-07-31 09:32:03 +00:00
Anders Broman b95bfb9503 From Erik Bray:
Incorrect dissasembly of IPv6 packets with extension headers after the fragment header

svn path=/trunk/; revision=25882
2008-07-31 09:22:22 +00:00
Anders Broman 6858fbdbf3 From Steve Karg:
BACnet MS/TP PDU Length is decoded incorrectly

svn path=/trunk/; revision=25881
2008-07-31 09:11:11 +00:00
Anders Broman e2070d0efb From Stephen Donnelly:
Fences incorrectly set in source/destination columns in IB plugin.

svn path=/trunk/; revision=25880
2008-07-31 09:08:13 +00:00
Gerald Combs b5a8677250 Add WPA group key decryption from Brian Stormont, via bug 1420:
Although this patch successfully recognizes group keys and decrypts packets
properly using the group key, there is a limitation.  If an AP is using key
rotation, clicking on individual packets in a trace may not properly decrypt a
packet encrypted with a group key.  This is because the current structure used
in Wireshark only supports one active unicast and one active group key.  If a
new key has been seen, but you are looking at a packet encrypted with an older
key, it will not decrypt.  The summary lines, however, do show the packets
properly decrypted.

I've written up a much longer and more detailed explanation in a comment in the
code, along with a proposed idea for a solution, plus a clunky work-around in
the GUI when using the current code.

I also suspect there might still be a problem with decrypting TKIP groups keys
that are sent using WPA2 authentication.  In the most common operation, if you
are using WPA2, you'll also be using AES keys. It's not a common AP
configuration to use WPA2 with TKIP. In fact, most APs don't seem to support
it.  Since it is an uncommon setup, I haven't put aside the time to test this
patch against such an AP.   I do have access to an AP that supports this, so
when I have the time I'll test it and if needed, will submit another patch to
handle that odd-ball condition.

From me:

Remove the decrypt element of s_rijndael_ctx (which was unused, as indicated
in the comments).
Preserve the GPL licensing text in several files (which the patch shouldn't
have removed).
Remove changes that added whitespace.
Convert C++-style comments to C-style.
Update to include recent SVN changes (e.g. renaming variables named "index").
Remove extraneous printf's.
Define DEBUG_DUMP in airpdcap_debug.h.
Comment out some instances of DEBUG_DUMP.
Change malloc/free to g_malloc/g_free.
Use g_memdup instead of allocating and copying.
Use gint16 instead of INT16 in airpdcap_rijndael.c.
Add Brian to AUTHORS.


svn path=/trunk/; revision=25879
2008-07-30 22:32:21 +00:00
Guy Harris 476c61472a No C++ comments - some compilers don't allow them (at least not by default).
svn path=/trunk/; revision=25878
2008-07-30 19:11:28 +00:00
Anders Broman de0ca39861 From Stephen Donnelly:
Infiniband Dissector Plugin 1.2.0

svn path=/trunk/; revision=25876
2008-07-30 15:47:11 +00:00
Anders Broman c954861fe5 From Bruno Verstuyft:
DOCSIS3.0 support in wireshark (MDD, REG-REQ-MP, REG-RSP-MP)

svn path=/trunk/; revision=25875
2008-07-30 15:13:12 +00:00
Anders Broman 152973c876 From Gerhard Olsson:
X25 reassembly fragment table and dissected proto presented for all X25 packets

svn path=/trunk/; revision=25874
2008-07-30 14:50:17 +00:00
Anders Broman 28bb6da642 From didier:
Wireshark doesn't parse iSCSI PDUs that their header spans multiple TCP segments

svn path=/trunk/; revision=25873
2008-07-30 14:28:04 +00:00
Anders Broman 6444284b59 packet-megaco.c:2208: warning: unused parameter 'pinfo'
svn path=/trunk/; revision=25872
2008-07-30 13:38:31 +00:00