Commit graph

16786 commits

Author SHA1 Message Date
Pascal Quantin
1af56ab0c7 Upgrade NAS disssectors to v11.6.0
svn path=/trunk/; revision=48427
2013-03-19 20:47:48 +00:00
Anders Broman
6bde918078 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
Anders Broman
3eb06be97d From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48425
2013-03-19 19:28:57 +00:00
Anders Broman
c3a054e6c1 Don't calculate checksum for ICMP packsets with a partial IP packet.
svn path=/trunk/; revision=48423
2013-03-19 18:51:36 +00:00
Alexis La Goutte
d16cb61d96 From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8497
Add support for 11R RIC IE's: Data and Descriptors for both FT-Over-Air and FT-Over-DS

Add 802.11 Tag RIC Data (57)
Add 802.11 Tag RIC Descriptor (75) (Not tested...)

From me:
- Remove tabs and whitespace
- Fix fix-encodings-args "warning"

svn path=/trunk/; revision=48421
2013-03-19 16:59:06 +00:00
Evan Huus
d70fafb0db And packet-isup.c is the first to fall to r48415.
From Anders via
https://www.wireshark.org/lists/wireshark-dev/201303/msg00183.html

svn path=/trunk/; revision=48417
2013-03-19 15:38:14 +00:00
Pascal Quantin
d31620a7bf From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from Bluetooth dissectors and switch to wmem API

svn path=/trunk/; revision=48414
2013-03-19 13:51:52 +00:00
Anders Broman
a10b98284c From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48412
2013-03-19 04:54:30 +00:00
Pascal Quantin
f904464fe9 Add a missing static
svn path=/trunk/; revision=48410
2013-03-18 22:58:36 +00:00
Anders Broman
d8bd66c291 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48409
2013-03-18 22:38:56 +00:00
Pascal Quantin
86eda54fe6 As suggested by Evan Huus, use extended value_strings
svn path=/trunk/; revision=48407
2013-03-18 22:21:53 +00:00
Anders Broman
a46de56e38 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

(catch the one that almost slipped away)

svn path=/trunk/; revision=48404
2013-03-18 22:16:58 +00:00
Anders Broman
077c1eb385 Update a value_string
svn path=/trunk/; revision=48401
2013-03-18 21:31:56 +00:00
Anders Broman
55c498169d From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48400
2013-03-18 21:16:23 +00:00
Anders Broman
84241f46ad From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48399
2013-03-18 20:44:36 +00:00
Pascal Quantin
94f330030d use enum values instead of hardcoded values
(as suggested by Sylvain Munaut in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8487)

svn path=/trunk/; revision=48397
2013-03-18 20:26:47 +00:00
Anders Broman
434aae5245 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48396
2013-03-18 19:47:33 +00:00
Pascal Quantin
847fb4ef0a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8493 :
Use proto_tree_add_item instead of proto_tree_add_bits_item to display Used Cipher

svn path=/trunk/; revision=48393
2013-03-18 16:11:00 +00:00
Anders Broman
b0f4928ab2 From Michal Labedzki:
Use external value list for character set values
 in AVRCP

There is a special list with a lot of values so why not using it.

- From me: import packet-wap.h.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48390
2013-03-18 06:29:57 +00:00
Anders Broman
3b24b8bbef From Michal Labedzki:
Be consistent in short name of protocols

Use prefix "BT " in short name for all Bluetooth dissectors. A reason
for that is protocol names start by "bt", Bluetooth dissectors can
be easy identificated, also DecodeBy looks better (sorted).
Please be note that "SDP" is reserved for different dissector, so using
"BT SDP" is good choice.

Also fix two naming mistakes.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48389
2013-03-18 06:23:22 +00:00
Anders Broman
2ae1d08bbe From Michal Labedzki:
Fix issues found by fix-encoding-args.pl
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48388
2013-03-18 06:13:09 +00:00
Anders Broman
c2976ac508 From Michal Labedzki:
Fix issues discovered by cppcheck

Also use global OUI array in AVRCP.
Thanks to Evan Huus for cppcheck.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48387
2013-03-18 06:04:09 +00:00
Anders Broman
5726546c63 From Michal Labedzki:
Update HID to version 1.1

Also fix SDP TAP to avoid crash.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48386
2013-03-18 05:51:01 +00:00
Anders Broman
fa1f2a2935 From Michal Labedzki:
USB: Use hfi name instead of hardcoded value.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48385
2013-03-18 05:34:39 +00:00
Anders Broman
d1f89f81d8 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48384
2013-03-18 05:18:32 +00:00
Anders Broman
b7617b32eb From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48383
2013-03-17 22:16:39 +00:00
Alexis La Goutte
aaeb101b2b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48382
2013-03-17 19:25:20 +00:00
Alexis La Goutte
824e7fd6e8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48381
2013-03-17 19:25:08 +00:00
Alexis La Goutte
716deac16d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48380
2013-03-17 19:25:00 +00:00
Alexis La Goutte
ce5a997d99 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48379
2013-03-17 19:24:51 +00:00
Alexis La Goutte
e4f9ca4afd Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48378
2013-03-17 19:24:42 +00:00
Alexis La Goutte
edcedbfed3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48377
2013-03-17 19:24:34 +00:00
Alexis La Goutte
0367aaaa9b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48376
2013-03-17 19:24:25 +00:00
Alexis La Goutte
086eaf58bf Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48375
2013-03-17 19:24:17 +00:00
Alexis La Goutte
55cdb2b45b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48374
2013-03-17 19:24:09 +00:00
Alexis La Goutte
64e30a1686 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48373
2013-03-17 19:24:00 +00:00
Alexis La Goutte
af50b77f78 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48372
2013-03-17 19:23:52 +00:00
Alexis La Goutte
f07cd6c974 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48371
2013-03-17 19:23:43 +00:00
Alexis La Goutte
771999b83d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48370
2013-03-17 19:23:35 +00:00
Alexis La Goutte
01f88e9207 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48369
2013-03-17 19:23:26 +00:00
Alexis La Goutte
ac8801b396 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48368
2013-03-17 19:23:18 +00:00
Alexis La Goutte
b31873a5bd Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48367
2013-03-17 19:23:09 +00:00
Alexis La Goutte
f311e3ca64 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48366
2013-03-17 19:23:01 +00:00
Alexis La Goutte
7c6767303e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48365
2013-03-17 19:22:53 +00:00
Alexis La Goutte
88be4f8651 Remove some whitespaces
svn path=/trunk/; revision=48364
2013-03-17 19:22:44 +00:00
Alexis La Goutte
b53f1ab2f0 Add Modelines info
svn path=/trunk/; revision=48363
2013-03-17 19:22:36 +00:00
Alexis La Goutte
311a15eebe Support (TCP) fragmentation for RPKI-RTR Protocol (Using tcp_dissect_pdus)
svn path=/trunk/; revision=48362
2013-03-17 19:22:27 +00:00
Alexis La Goutte
6c6d8f1629 Enhance 802.11 FCS check - Replace proto_tree_add_* by proto_tree_add_item - Add bad FCS to colorfilters
svn path=/trunk/; revision=48361
2013-03-17 19:22:19 +00:00
Alexis La Goutte
bfe7af447d Enhance 802.11 Qos Control dissection - Replace proto_tree_add_* by proto_tree_add_item - Use Bitmask feature
svn path=/trunk/; revision=48360
2013-03-17 19:22:10 +00:00
Alexis La Goutte
1f7466aa63 Enhance 802.11 Frame control dissection - Replace proto_tree_add_* by proto_tree_add_item - Add Expert info when Retry 802.11 Frame
svn path=/trunk/; revision=48359
2013-03-17 19:22:01 +00:00
Alexis La Goutte
6dcc65e366 Enhance Vendor RSN IE - Remove hf_ieee80211_tag_interpretation... - Replace proto_tree_add_* by proto_tree_add_item
svn path=/trunk/; revision=48358
2013-03-17 19:21:52 +00:00
Alexis La Goutte
a9787be380 Add 802.11 Tag RM Enabled Capabilities (70)
svn path=/trunk/; revision=48357
2013-03-17 19:21:42 +00:00
Anders Broman
3e38475176 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48356
2013-03-17 17:52:26 +00:00
Anders Broman
81e80f2c0b From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48355
2013-03-17 16:48:47 +00:00
Gerald Combs
9a376b8cd0 Pick up changes missed by the automatic update script (which should
now be fixed).

svn path=/trunk/; revision=48354
2013-03-17 15:39:56 +00:00
Evan Huus
4f48f35dfd Remove sqloracle dissector, it wasn't being built and was full of bugs.
It's on the wiki now at: http://wiki.wireshark.org/Oracle

For discussion of this, see:
https://www.wireshark.org/lists/wireshark-dev/201303/msg00161.html

svn path=/trunk/; revision=48349
2013-03-17 12:51:24 +00:00
Anders Broman
2e52e2ac99 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48347
2013-03-17 09:11:21 +00:00
Evan Huus
e8c305fd3b From Sylvain Munaut via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8487
Use enum values instead of manual constants in value_strings. This was
introduced by r47218, which was designed to fix r47209, which would have been
correct in the first place if the value_strings hadn't been full of hacks.

I think everything is correct now. Perhaps it may be worth using extended
value_strings though, since most of the tables seem to be consecutive in order?

svn path=/trunk/; revision=48345
2013-03-16 20:46:19 +00:00
Anders Broman
d456976017 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48344
2013-03-16 20:22:54 +00:00
Anders Broman
55c20aa55a #if 0 out apparently unsed code.
svn path=/trunk/; revision=48343
2013-03-16 20:00:03 +00:00
Anders Broman
263a9d0683 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48341
2013-03-16 16:25:41 +00:00
Martin Kaiser
20769a8bee no need for if(tree)
removed unnecessary initialization

svn path=/trunk/; revision=48339
2013-03-16 09:37:06 +00:00
Anders Broman
5a85b7fed2 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48338
2013-03-16 08:52:09 +00:00
Anders Broman
27744ecc2d From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48337
2013-03-16 08:12:29 +00:00
Evan Huus
1931018a58 Check for overflow in the websocket dissector payload.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8448

svn path=/trunk/; revision=48336
2013-03-16 02:56:17 +00:00
Anders Broman
43e8a22781 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48334
2013-03-15 22:40:15 +00:00
Anders Broman
f5a5b3d0fe From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48333
2013-03-15 22:39:37 +00:00
Evan Huus
7bd686fafb Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8481
Trivially wrong format string being passed to val_to_str().

svn path=/trunk/; revision=48332
2013-03-15 22:09:51 +00:00
Anders Broman
54eb4a6cec [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48319
2013-03-15 16:39:30 +00:00
Anders Broman
ec4701ae72 Make the default port zero.
svn path=/trunk/; revision=48317
2013-03-15 16:35:54 +00:00
Anders Broman
ef249623e6 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48313
2013-03-15 06:26:47 +00:00
Anders Broman
4f1f9903f4 [-Wmissing-prototypes]
explicit casts.

svn path=/trunk/; revision=48310
2013-03-15 04:52:42 +00:00
Michael Mann
3a48e7e1e2 Bugfix Decryption Key Management dialog, bug 8446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446)
Needed to convert use of old IEEE802.11 preference strings to UAT.  Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.

svn path=/trunk/; revision=48308
2013-03-15 01:31:53 +00:00
Jaap Keuter
930deed11d From Tyson Key:
I have just finished slightly refactoring part of the PN532 dissector's  
with InListPassiveTarget Response handler, to resolve some issues where 
ISO 14443-A UIDs of various lengths in the aforementioned packet types 
are incorrectly dissected.

The patch also introduces basic support for identifying, and dissecting 
InListPassiveTarget Responses from cards/tokens with variable-length 
Answer To Select (ATS) payloads, such as contactless EMV payment smartcards. 

svn path=/trunk/; revision=48306
2013-03-14 23:09:58 +00:00
Anders Broman
5970ee5a65 From beroset:
remove C++ incompatibilities from packet-catapult-dct2000.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48305
2013-03-14 22:10:59 +00:00
Anders Broman
f2266d87f5 [-Wmissing-prototypes]
explicit casts.

svn path=/trunk/; revision=48302
2013-03-14 19:01:06 +00:00
Anders Broman
ffaf67b615 from Katrina Zhang:
According to the latest TS29.274 -- adding 4 IE support: H(e)NB Information Reporting[165]; IPv4 Configuration Parameters (IP4CP)[166]; Change to Report Flags[167]; Action Indication[168]

 -- cause values of IE(Cause)

svn path=/trunk/; revision=48301
2013-03-14 19:00:40 +00:00
Anders Broman
fe5848271f from Katrina Zhang:
Adding Bit 5 support of AVP(IDR-Flags)

svn path=/trunk/; revision=48300
2013-03-14 18:59:56 +00:00
Anders Broman
96e7b183fb From beroset:
patch to remove C++ incompatibilities from packet-lmp.c
renamed class to lmp_class

remove C++ incompatibilities from packet-rcpap.c
renamed class to inst_class (instruction class).

remove C++ incompatibilities from emem.c and oids.c

remove C++ incompatibilities from packet-radius.c

remove C++ incompatibilities from packet-enip.c


https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48299
2013-03-14 18:58:42 +00:00
Bill Meier
77376a2363 Change "4 space tabs" indentation to use "4 spaces" indentation.
Also:
- remove some unneeded initializers;
- remove several unneeded 'col_clear()' calls;
- guint8 --> guint to prevent a possible overflow;
- reformat for style in some cases.


svn path=/trunk/; revision=48297
2013-03-14 14:42:12 +00:00
Stig Bjørlykke
8dfa2eac7e Set correct item lengths. They cannot all be until end of buffer.
svn path=/trunk/; revision=48296
2013-03-14 12:23:05 +00:00
Stig Bjørlykke
d9aff2d872 Fixed an indent to avoid a warning: for loop has empty body [-Wempty-body]
svn path=/trunk/; revision=48294
2013-03-14 08:41:11 +00:00
Anders Broman
b539916835 [-Wmissing-prototypes]
explicit casts.

svn path=/trunk/; revision=48293
2013-03-14 07:37:13 +00:00
Martin Kaiser
3fa84d8af5 From Weston Schmidt
fix DSM-CC CRC calculation
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8466

svn path=/trunk/; revision=48292
2013-03-14 07:01:37 +00:00
Anders Broman
44be81ba93 From beroset:
changed implicit casts to explicit and substituted se_new for se_alloc

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48288
2013-03-14 06:45:23 +00:00
Anders Broman
672a54c156 From beroset:
converted implicit casts to explicit casts, moved nested structure definition outside, and changed se_alloc to se_new.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48287
2013-03-14 06:31:31 +00:00
Anders Broman
fad318ad44 From beroset:
changed implicit casts to explicit casts and corrected one erroneous cast (from void* to void**)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48286
2013-03-14 06:26:55 +00:00
Martin Kaiser
455139f4be dissect more descriptors in the AIT
svn path=/trunk/; revision=48285
2013-03-13 23:26:09 +00:00
Martin Kaiser
8772db463a actx is used, remove _U_
svn path=/trunk/; revision=48284
2013-03-13 22:54:46 +00:00
Anders Broman
04766017df - [-Wmissing-prototypes]
- explicit casts.

svn path=/trunk/; revision=48282
2013-03-13 21:14:20 +00:00
Alexis La Goutte
1d74daaec3 Remove unused bgp_route_refresh struct
svn path=/trunk/; revision=48278
2013-03-13 15:02:17 +00:00
Alexis La Goutte
e22e3eeb0e From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8354 Add support for WAPI parameter set IE dissection
Need to add support for WAPI parameter set IE in management frames.
We already have WAI frames dissection support in place.

From me:
Small changes...
- Add links to WAPI specs
- Replace tabs by space
- Remove whitespaces

svn path=/trunk/; revision=48276
2013-03-13 14:49:46 +00:00
Anders Broman
27fc641a79 - [-Wmissing-prototypes]
- explicit casts.

svn path=/trunk/; revision=48274
2013-03-12 23:09:37 +00:00
Martin Kaiser
f58e2cc90a dissect Application Signalling Descriptor
svn path=/trunk/; revision=48273
2013-03-12 22:04:09 +00:00
Anders Broman
221b249acd svn path=/trunk/; revision=48272 2013-03-12 21:58:04 +00:00
Martin Kaiser
7c10fd2724 use correct data type in the cast
this fixes
packet-afs.c: In function 'dissect_afs':
packet-afs.c:1539:35: error: expected expression before ')' token


svn path=/trunk/; revision=48266
2013-03-12 20:14:45 +00:00
Anders Broman
455f5c8243 - [-Wmissing-prototypes]
- explicit casts.

svn path=/trunk/; revision=48265
2013-03-12 20:00:50 +00:00
Anders Broman
97bb558394 Introduce a preference to select how Websocket text should be dissected.
svn path=/trunk/; revision=48264
2013-03-12 19:16:35 +00:00
Anders Broman
30a9b4855d Detect HTTP/1.1 heuristically.
svn path=/trunk/; revision=48263
2013-03-12 19:15:39 +00:00
Jaap Keuter
827eb58b04 From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
2013-03-12 06:53:39 +00:00
Anders Broman
2cc00294c7 Use explicit casts.
svn path=/trunk/; revision=48260
2013-03-12 06:41:00 +00:00
Anders Broman
d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Ronnie Sahlberg
d249e6111a SPC-3 and later has a 16-bit allocation length for the INQUIRY allocation
length.

While SPC-2 only has one byte for allocation length

Change this to treat allocation length as a 16 bit quantity starting one byte prior to the current single byte that wireshark dissects.
This makes it correct for SPC-3 and later  and still works for SPC-2 since that first byte is reserverd, == must be 0, in SPC-2 and prior.
  

svn path=/trunk/; revision=48258
2013-03-12 01:25:06 +00:00
Chris Maynard
7be1086254 Fix Coverity CID 990224 and 990225: Unused pointer value.
svn path=/trunk/; revision=48256
2013-03-11 20:43:52 +00:00
Anders Broman
dd33c46501 Improve heuristics for gmtrailer.
svn path=/trunk/; revision=48255
2013-03-11 19:32:33 +00:00
Anders Broman
9a5368a705 Dissect GRE Key and Service Selection.
svn path=/trunk/; revision=48254
2013-03-11 19:31:59 +00:00
Anders Broman
5257351bfb Dissect Contractor Number digits.
svn path=/trunk/; revision=48253
2013-03-11 19:30:59 +00:00
Anders Broman
01c1661412 From: Erik Hugne
tipc: update link header according to spec
The bcastsequence gap have been removed, and the sequence field is now 13 bits.

svn path=/trunk/; revision=48238
2013-03-11 06:34:34 +00:00
Evan Huus
ee744dd8c7 Allocate zeroed memory instead of manually zeroing some of the fields. We were
missing a few anyways.

Fixes the rest of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8456

Also, add modelines.

svn path=/trunk/; revision=48236
2013-03-10 22:02:07 +00:00
Evan Huus
7d1520c217 Use col_append_sep_str instead of col_set_str. Fixes another piece of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8456

Fix suggested by Jakub in comment #5.

svn path=/trunk/; revision=48235
2013-03-10 21:42:16 +00:00
Anders Broman
812efccdae Off by one error in name length.
svn path=/trunk/; revision=48234
2013-03-10 18:32:59 +00:00
Evan Huus
bbb4058954 Remove slab.h and replace its last remaining usage with glib slices.
Take the opportunity to deduplicate some code that was common to both an
if block and its else block.

svn path=/trunk/; revision=48227
2013-03-10 14:52:14 +00:00
Evan Huus
f5c82262b4 Add two missing NULL checks, fixes most of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8456

svn path=/trunk/; revision=48224
2013-03-10 13:40:50 +00:00
Anders Broman
97c4bc6292 Use explicit casts.
svn path=/trunk/; revision=48212
2013-03-09 10:09:58 +00:00
Alexis La Goutte
f6019d9d88 Make checkAPIs Happy
svn path=/trunk/; revision=48211
2013-03-09 09:45:28 +00:00
Alexis La Goutte
a4eb0a12ed From Jose Pico via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8377 NEW FEATURE IMPLEMENTED: SMB2 SUPPORT FOR EXPORT->OBJECTS->SMB
Added functionality:
- SMB2 support for Export->Objects->SMB
- support for SMB_COM_CREATE, SMB_COM_OPEN, SMB_COM_READ and SMB_COM_WRITE commands
- Ability to choose between File Id and full file name as identifier for file re-building. Implemented as an option under Edit->Preferences->Protocols->SMB and Edit->Preferences->Protocols->SMB2.

Other minor changes and fixes:
- Full filename in file
- Inclusion of IP of SMB server when treeid name (i.e. hostname) is not known
- UTF-8 filenames encoding before passing them to Export Object Window
- Re-written insert_chunk function of export_object_smb.c to make it easier to debug
- Fixed of an error in insert_chunk function of export_object_smb.c (the verification of next free_chunk was always skipped after deleting one free_chunk).
- Removed duplicated code by inserting the function feed_eo_smb in packet-smb.c and packet-smb2.c
- Changed the label of Export->Objects->SMB menu into Export->Objects->SMB/SMB2

svn path=/trunk/; revision=48210
2013-03-09 08:44:14 +00:00
Evan Huus
e5d5bb67bc Put items in the tree we just created, mark an unused param as _U_.
Fixes GCC build.

svn path=/trunk/; revision=48209
2013-03-09 03:31:27 +00:00
Michael Mann
88205d4b72 RTPS Cleanup, Part 2
1. Convert more proto_tree_add_text to proto_tree_add_<something else>/expert_info.  checkAPIs.pl is happy (for packet-rtps.c), but the raw number is a bit deceiving because of macros and wrappers. 
2. Fixed the offending "uses snprintf + strlen to assemble strings" in packet-rtps.c.  The exact same code is used in packet-rtps2.c, so just proper refactoring will fix it.  There is still too much unnecessary use of g_snprintf/g_strlcpy/strlen, but that's for a later date.
3. Removed most of the "useless" wrapper functions.  Again, the number of proto_tree_add_text is deceiving, so the number of hfs that really need to be created is much larger.  
4. Whitespace cleanup.   Removed a lot of whitespace so I could see more code on the screen, to help determine duplication between packet-rtps.c and packet-rtps2.c  Comments/descriptions of fields remain untouched.

The more I trim, the more I think this should all be in a single dissector file, which will be the goal of the next update.  Trying to patch this in somewhat manageable chunks.

Also need to submit sample traces generated for (fuzz)testing.

svn path=/trunk/; revision=48206
2013-03-09 00:21:56 +00:00
Evan Huus
3721df7b19 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414
Fix minor cut-and-paste error in USB-Video dissector caught by cppcheck.

svn path=/trunk/; revision=48205
2013-03-09 00:10:14 +00:00
Guy Harris
0d4763b3e7 Dissect the DCCP header by stepping through it a field at a time and
adding the fields to the protocol tree as we fetch them, rather than
fetching a bunch of them up front.  That way, if the packet was cut
short by a snapshot length, we'll dissect what we have.

Create the top-level tree item at the beginning, with an unknown length,
and set the length when we're done.  If we're putting details into that
item, update the item as we process each field; also update the Info
column as we process each field.

Don't use tvb_bytes_exist() to do our own tvbuff bounds-checking; let
the tvbuffs themselves do that.  Do not use it to do header-length
checking; check the actual header length value instead.

Do not fail if the *captured* data in the tvbuff is too short; we're
selected by an IP protocol number, which we can expect to definitively
identify us, not by a transport-layer port number, which is often an
unreliable identifier.

Do header length checks as we go along, and bail as soon as we identify
the header length as wrong.  (We do the first check once we get the X
bit, so we know whether the generic header is 12 or 16 bytes long.) 
Treat a too-*large* header as a protocol violation, not a malformed
packet indication.

Use tvb_get_ntoh24() and tvb_get_ntoh48() to fetch the sequence number,
rather than fetching it in pieces and putting them together ourselves.

Correctly pluralize "byte".

Don't use tvb_length_remaining() to check whether we have a payload, use
tvb_reported_length_remaining(), so we base it on whether the packet
actually had the data, not on whether we actually captured it.

svn path=/trunk/; revision=48201
2013-03-08 19:56:41 +00:00
Anders Broman
1b788d4061 Update to V11.5.0 (2012-12).
svn path=/trunk/; revision=48195
2013-03-08 17:55:53 +00:00
Anders Broman
4237d33ab8 Add new SIP headers.
svn path=/trunk/; revision=48192
2013-03-08 16:53:14 +00:00
Evan Huus
826c14b456 From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8414
Dissector for USBVIDEO.

svn path=/trunk/; revision=48190
2013-03-08 14:25:55 +00:00
Pascal Quantin
d915e3c04f Prettify a bit dissection of sr-ProhibitTimer-r9 and drxShortCycleTimer
svn path=/trunk/; revision=48188
2013-03-08 08:19:26 +00:00
Anders Broman
2cc8731bec From beroset:
remove C++ incompatibilities

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48185
2013-03-08 06:06:56 +00:00
Evan Huus
c6c7efd1a7 From Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431
Add a few member variables to the USB conversation structure, necessary
for a USB PTP dissector.

svn path=/trunk/; revision=48184
2013-03-07 23:57:43 +00:00
Martin Kaiser
24fe8f7fb2 correctly mark the payload for unknown extension tags
(fixes a bug introduced by my previous commit)

svn path=/trunk/; revision=48181
2013-03-07 22:06:18 +00:00
Guy Harris
f7e497a522 Properly pluralize "octet" for the Extended Capabilities tag.
If we don't decode a tag, just say "Undecoded" on the top-level item;
the tag name or number is already on that item, and the length is
underneath it.

svn path=/trunk/; revision=48180
2013-03-07 21:42:01 +00:00
Martin Kaiser
d96c8ee09d dissect Supplementary Audio Descriptor as defined in EN300468
svn path=/trunk/; revision=48176
2013-03-07 19:14:11 +00:00
Martin Kaiser
faed099b43 use defines for extension tags
svn path=/trunk/; revision=48175
2013-03-07 19:05:45 +00:00
Pascal Quantin
aec6d0a755 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from ssl and ssh files

svn path=/trunk/; revision=48174
2013-03-07 18:37:58 +00:00
Pascal Quantin
85048f5a96 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from packet-nfs.c

svn path=/trunk/; revision=48172
2013-03-07 18:09:23 +00:00
Chris Maynard
cfcd6deca1 Avoid a potential divide-by-zero condition.
#BACKPORT(1.8)

svn path=/trunk/; revision=48159
2013-03-07 02:04:41 +00:00
Guy Harris
9bfeb4963f Make the GTP and GTP' dissectors new-style dissectors, so that they can
reject packets that don't look enough like GTP/GTP' packets.  This fixes
bug 1706, and fixes some other cases where non-GTP/GTP' packets are
being dissected as GTP/GTP'.

svn path=/trunk/; revision=48118
2013-03-06 00:02:18 +00:00
Guy Harris
049428d5a1 Use XDLC_IS_INFORMATION() to determine whether there's a payload to hand
to the X.25 dissector or not.

svn path=/trunk/; revision=48097
2013-03-05 20:50:25 +00:00
Martin Kaiser
47a8a496f1 fix
packet-bssgp.c: In function 'de_bssgp_unconfim_send_state_var':
packet-bssgp.c:3318:13: error: variable 'state_var' set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=48095
2013-03-05 20:17:29 +00:00
Guy Harris
dcf054dd5e Fix some variable names to better indicate what they do.
Fix indentation.

Fix a proto_tree_add_uint_format_value() call not to include the name of
the field - proto_tree_add_uint_format_value() will add that for you.

Have dte_address_util() take the offset of the address as an argument;
it's not always at the same offset from the beginning of the facility.

Have it return the pointer to the generated string directly, rather than
through a pointer argument.

Create only one subtree for each facility, and give it a text description
of the facility code rather than the numerical value of the facility
code.  Make the top-level item for the facility cover all the bytes of
the facility, including code, length if present, and parameters.

Dissect the end-to-end transit delay and priorities facilities
completely.  Also, fix an incorrect use of "transmit delay" to say
"transit delay".

Get rid of the last of the spaces preceding colons in "Field: value"
descriptions and in a "default:" case label.

Do the data vs. non-data packet thing ith

	if (PACKET_IS_DATA(pkt_type)) {
		...
	} else {
		...
	}

rather than, in effect, doing the "else" with a break; that makes the
code a bit clearer.

Put the logical channel number into the protocol tree in common code for
the default case, rather than doing it separately for data and non-data
packets.  Clean up the dissection of non-data packets to add entries
before updating the columns, so that we don't throw an exception
updating the columns before we get to add items that wouldn't throw
exceptions.  Clear the Info column early in the dissection, in case we
throw an exception before getting to set it and thus leave behind the
column information for the protocol atop which we're running.

svn path=/trunk/; revision=48093
2013-03-05 19:31:13 +00:00
Anders Broman
f6ce72ee04 From Joseph Chai:
Add aditional IE dissection.
From me patch cleanup and add set fence for multiple DTAP messages in one frame.

svn path=/trunk/; revision=48087
2013-03-05 17:38:44 +00:00
Anders Broman
95c478c47c Unused parameter.
svn path=/trunk/; revision=48084
2013-03-05 06:17:25 +00:00
Michael Mann
dd8c596851 RTPS Cleanup, Part 1
1. Cleanup COL_INFO processing
2. Add expert_info for "octet_to_next_header" ranges
3. Check "RTPS" all at once
4. Remove some unnecessary function declaration.

Next is probably consolidating packet-rtps.c and packet-rtps2.c as there seems to be a lot of duplicative functionality.

svn path=/trunk/; revision=48082
2013-03-05 05:52:23 +00:00
Guy Harris
9b01892eca Use hf_gtp_ext_hdr_next for all "next header" fields, and get rid of
hf_gtp_next.

Don't do "dummy" dissection of extension headers that we don't actually
dissect - we label them by next extension header type, and dissect them
in the default case, which should suffice (until somebody adds
dissection for those types).

svn path=/trunk/; revision=48075
2013-03-05 00:17:56 +00:00
Guy Harris
958574da78 If the length value is bad, an exception will be thrown; we don't need
the item for the length, as we aren't explicitly checking it and
attaching expert info items to it.

svn path=/trunk/; revision=48070
2013-03-04 22:01:29 +00:00
Evan Huus
1cece569c8 From Jiri Novak via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8424
Extend RTP dissector with ED-137 extension

From me: Don't try to dissect a non-existent payload (see comment #9
on the bug).

svn path=/trunk/; revision=48069
2013-03-04 22:00:48 +00:00
Guy Harris
029c5bdbac Give 3GPP TS numbers for GTP v0, GTP v1, and GTP'.
Give URLs for the 3gpp.org pages for all those specs.

Add #defines for all the GTP v1 extension header types we handle.

"gtp_prime" is a Boolean; make it a gboolean.

Dissect the first 4 octets of the header one field at a time, so that if
the packet is cut short by a snapshot length we at least dissect what's
there.

32.295 isn't entirely clear on what the 20-byte header for GTP' v0 is;
assume it's the same as the header for GTP v0.

Once we've fetched the length field from the fixed-length portion of the
header, set the length of the tvbuff to the sum of the offset past the
fixed-length portion and the length field, to catch running past that
value.

Use GTP_E_MASK|GTP_S_MASK|GTP_PN_MASK as the mask for testing for the
presence of those fields, to make it a bit clearer what's being checked
for.

Don't actually add those fields to the protocol tree unless the flag for
the field is set.

We only need one chunk of code to handle extension headers.

Make that chunk a loop, and put the header in as an FT_NONE item, with
the length, header data, and next header under it.  Put the initial next
header field in as well.  (We treat this like IPv6 extension headers,
with the next header field being part of the previous header, rather
than like a set of TLVs, with the next header field being the type value
of its header.)

Fail if the extension header length is zero.

Use the reported length when processing IEs or T-PDU payload.

svn path=/trunk/; revision=48068
2013-03-04 21:40:36 +00:00
Pascal Quantin
0efdddc61f From Josef Zila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8408 :
Add configurable TCP and UDP ports for MEMCACHE dissector

svn path=/trunk/; revision=48064
2013-03-04 17:48:56 +00:00
Alexis La Goutte
42dce2d033 Add 802.11 Tag RSNI IE (65)
(Not tested...)

svn path=/trunk/; revision=48063
2013-03-04 17:16:35 +00:00
Alexis La Goutte
512a68479c From chaitanya via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8432 BE (3) AC is wrongly named as "Video" in (qos_acs)
In the array of WME AC names, the name for tid 3 is wrongly named as "Video" it should be "Best Effort" instead.

#BACKPORT(1.8,1.6)

svn path=/trunk/; revision=48062
2013-03-04 17:16:26 +00:00
Alexis La Goutte
ea4c5708b2 Add 802.11 Tag Antenna (64)
svn path=/trunk/; revision=48061
2013-03-04 17:16:17 +00:00
Alexis La Goutte
95dff87ead Add 802.11 Tag BSS Average Access Delay IE (63)
svn path=/trunk/; revision=48060
2013-03-04 17:16:07 +00:00
Alexis La Goutte
430c8b13e3 Add 802.11 BSS AC Access Delay IE (68)
(Only display the value in decimal don't yet display the Average Access Delay , See 8.4.2.41 BSS Average Access Delay element )

svn path=/trunk/; revision=48057
2013-03-04 17:15:40 +00:00