Commit graph

19017 commits

Author SHA1 Message Date
Guy Harris
753811929d Clean up indentation.
svn path=/trunk/; revision=53742
2013-12-03 10:54:10 +00:00
Anders Broman
089e4d999f Try to fix [-Wmissing-prototypes]
svn path=/trunk/; revision=53741
2013-12-03 06:20:18 +00:00
Anders Broman
a21898cf69 - copy paste error in parlay
- Add pragmas to remove warnings, this should go into the generation script.

svn path=/trunk/; revision=53740
2013-12-03 05:22:47 +00:00
Chris Maynard
231e52a9ea Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53737
2013-12-02 21:52:46 +00:00
Chris Maynard
ae2e12d1f7 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53735
2013-12-02 21:34:23 +00:00
Guy Harris
ce7b83123c No C++/C99 comments, as not all compilers handle them. Use #if 0/#endif
instead.

svn path=/trunk/; revision=53734
2013-12-02 21:18:25 +00:00
Chris Maynard
b5e3775535 eject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53733
2013-12-02 21:13:29 +00:00
Chris Maynard
99d9c3d0f5 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53732
2013-12-02 21:05:11 +00:00
Anders Broman
ba0e04ed1b Character conversion error.
svn path=/trunk/; revision=53731
2013-12-02 20:31:42 +00:00
Anders Broman
c0407d6bc5 Add pragmas to remove warnings, this should go into the generation script.
svn path=/trunk/; revision=53730
2013-12-02 20:18:48 +00:00
Chris Maynard
baf569188a Reject the packet if data is NULL.
svn path=/trunk/; revision=53709
2013-12-02 02:31:33 +00:00
Chris Maynard
9b38829b34 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53708
2013-12-02 02:31:04 +00:00
Chris Maynard
acc5fd78e4 Reject the packet if data is NULL.
svn path=/trunk/; revision=53707
2013-12-02 02:18:21 +00:00
Chris Maynard
42a64c3557 If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly.
svn path=/trunk/; revision=53706
2013-12-02 02:07:42 +00:00
Chris Maynard
a9900375b4 Fix Coverity CID 1134045: Printf format string issue. (As documented in the printf man page for the ' option, "Note that many versions of gcc(1) cannot parse this option and will issue a warning." (r47940 reverted a similar change, so this keeps things consistent.)
svn path=/trunk/; revision=53705
2013-12-02 01:53:13 +00:00
Chris Maynard
87d36305f9 Fix Coverity CID 1134046: Structurally dead code.
svn path=/trunk/; revision=53704
2013-12-02 00:45:44 +00:00
Anders Broman
9baa93519c Update to V11.7.1 (2013-09)
svn path=/trunk/; revision=53700
2013-12-01 20:34:21 +00:00
Michael Mann
7ee8d48670 Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)
From Peter Paluch

svn path=/trunk/; revision=53694
2013-12-01 13:47:11 +00:00
Jörg Mayer
402df00544 Looks like the problem with redefined symbols is not new, it
just got a few new ones.
Add HAVE_STRING_H and HAVE_STDLIB_H to the list.

svn path=/trunk/; revision=53691
2013-12-01 10:10:24 +00:00
Martin Mathieson
a9bd097e71 Start teid_data field from the correct offset
svn path=/trunk/; revision=53688
2013-12-01 08:52:06 +00:00
Martin Mathieson
da7af5c1f7 Also add filter and expert info for ICMPv6 requests with no responses.
svn path=/trunk/; revision=53687
2013-12-01 08:51:07 +00:00
Michael Mann
e2d2d12098 Replace "btsdp" tap with function to query service_infos tree, since that's all dissectors were doing with it. Not used outside of dissectors and cuts down on a few redundant global variables.
svn path=/trunk/; revision=53677
2013-11-30 19:26:18 +00:00
Guy Harris
d62b116380 Make the code testing the Rx MCS Bitmask subfield of the Supported MCS
Set field of the HT Capabilities element a bit clearer, and add
comments.

Fix it so it doesn't assign a variable to itself, as clang warns about
that.

svn path=/trunk/; revision=53674
2013-11-30 10:17:30 +00:00
Pascal Quantin
4e3d8291fe From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9490 :
Couple packets in RTPproxy dissector not only with CookieID but also with Call-IDs

svn path=/trunk/; revision=53673
2013-11-30 09:50:04 +00:00
Michael Mann
e1532f39ec Tx MCS set is not interpreted properly in WLAN beacon frame. Bug 8894 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8894)
#BACKPORT

svn path=/trunk/; revision=53670
2013-11-30 01:35:03 +00:00
Michael Mann
6d3d1556dc STANAG 5066 DTS Layer dissector. Bug 9217 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9217)
From İbrahim Can Yüce

From me: Update to new tcp_dissect_pdus format, minor whitespace issues noticed in wiretap files.

svn path=/trunk/; revision=53669
2013-11-30 01:18:22 +00:00
Michael Mann
00737f834b Add wifi display port to the RTSP dissector. Bug 9339 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9339)
From chaitanya

From me: Add another obsolete preference and cleanup whitespace

svn path=/trunk/; revision=53667
2013-11-30 00:30:56 +00:00
Pascal Quantin
68c8c7ef0a From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9487 :
Use RTP payload descriptions from RTP dissector in RTPproxy codec param value

svn path=/trunk/; revision=53658
2013-11-29 22:56:34 +00:00
Jakub Zawadzki
82e2675f45 Avoid including <wiretap/wtap.h> in dissectors.
svn path=/trunk/; revision=53655
2013-11-29 20:53:00 +00:00
Jakub Zawadzki
d99fdfda63 Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.
XXX, people are not aware that expression of this macros might be evaluated multiple times, like:
 -  BSWAP16(tvb_get_letohs(tvb, off)) : \
 +  GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \

Should be tvb_get_ntohs() called?


svn path=/trunk/; revision=53653
2013-11-29 19:21:20 +00:00
Jakub Zawadzki
5ac6474c94 Rename some of pint.h macros to match common style (bits number on the end).
pntohs  -> pntoh16
   pntohl  -> pntoh32
   pletohs -> pletoh16
   pletohl -> pletoh32
   phtons  -> phton16
   phtonl  -> phton32


svn path=/trunk/; revision=53652
2013-11-29 18:59:06 +00:00
Jakub Zawadzki
288efa5128 Expand macros: htoles(), htolel(), htolell()
svn path=/trunk/; revision=53651
2013-11-29 18:44:00 +00:00
Michael Mann
9c9a038428 General "Prosody" placeholder parameter ("prosody-") is broken down to a 6 new "Prosody" specific parameters. Bug 9425 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9425)
From zeljko

svn path=/trunk/; revision=53650
2013-11-29 17:51:56 +00:00
Martin Mathieson
73f042aa35 Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_
svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
Michael Mann
bf9fdc8e8f Bugfix timestamp formatting of Gigamon trailer. Bug 9433 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9433)
From Sandeep Dahiya

svn path=/trunk/; revision=53646
2013-11-29 14:55:49 +00:00
Michael Mann
8821cb7e2d Bugfixes of r53636, part of bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423)
From DSR Corporation

svn path=/trunk/; revision=53645
2013-11-29 13:42:09 +00:00
Pascal Quantin
9a48c7e8da Improve request / response tracking in case you have several open / close commands in the capture
svn path=/trunk/; revision=53644
2013-11-29 10:38:00 +00:00
Alexis La Goutte
5cb8483d82 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=53642
2013-11-29 08:33:51 +00:00
Alexis La Goutte
09e1e860d4 Enable by default UDP conversation (Needed by udp.stream)
svn path=/trunk/; revision=53641
2013-11-29 08:02:39 +00:00
Alexis La Goutte
7e0645563a Add udp.stream display filter
The result is the same filter used by Follow UDP (may be reuse the new filter in Follow)

svn path=/trunk/; revision=53640
2013-11-29 08:02:30 +00:00
Alexis La Goutte
110795132b Add HTTP2 heuristic when it is encapsulated in SSL
the heuristic may be leak (only check if type > 10...)

svn path=/trunk/; revision=53638
2013-11-29 08:02:09 +00:00
Michael Mann
563cf65155 Improved ZCL dissectors. Bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423)
From DSR Corporation

svn path=/trunk/; revision=53636
2013-11-29 03:40:16 +00:00
Jakub Zawadzki
9e0cd5d1d8 Fix typo (r53633) in one more place, fix typo in filename, make hex numbers capital.
svn path=/trunk/; revision=53634
2013-11-28 23:09:55 +00:00
Guy Harris
26446f8882 Fix (presumed) tpyo.
svn path=/trunk/; revision=53633
2013-11-28 22:36:10 +00:00
Jakub Zawadzki
3bbfb68ffa Move MPEG section table id defines to packet-mpeg-sect.h
svn path=/trunk/; revision=53632
2013-11-28 22:31:55 +00:00
Pascal Quantin
37660f413b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9478 :
GSM SMS User Data header fill bits are wrong when using a 7 bits ASCII / IA5 encoding

svn path=/trunk/; revision=53631
2013-11-28 21:59:02 +00:00
Guy Harris
710feed2e0 GUINT_TO_POINTER() does just enough casting to suppress complaints about
32-bit integers and 64-bit pointers, so it needs to be handed a guint
(or equivalent type); it doesn't suppress warnings about 8-bit or 16-bit
integers, so those have to be cast up to guint first.

svn path=/trunk/; revision=53630
2013-11-28 20:40:46 +00:00
Michael Mann
a31d10208b Bluetooth: HSP: Add support for HSP. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
HSP is modest version of HFP.

From Michal Labedzki.

svn path=/trunk/; revision=53629
2013-11-28 18:33:26 +00:00
Michael Mann
8dab82556c Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
From Michal Labedzki.

1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles.
2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP.
3. Bluetooth: HFP: Fix unexpected expert info
4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles.

svn path=/trunk/; revision=53628
2013-11-28 18:11:02 +00:00
Balint Reczey
30ae01c73b Support long Domain Names in NTLMSSP v2
... instead of crashing on them. :-)

Discovered by Garming Sam <garming@catalyst.net.nz>

svn path=/trunk/; revision=53626
2013-11-28 16:39:04 +00:00
Michael Mann
71d05170dc USB: Enable Decode As. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki

From me: 
Have #defines in packet-usb.c because they are only used in the module.

Break out the value computation so that it can be properly wrapped in GUINT_TO_POINTER without adding more complexity.

svn path=/trunk/; revision=53625
2013-11-28 16:33:54 +00:00
Michael Mann
3d9e55b8be RTPproxy dissector: Add expert info about timeouts. Bug 9484 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9484)
From Peter Lemenkov

svn path=/trunk/; revision=53622
2013-11-28 14:11:48 +00:00
Michael Mann
f74c645499 Adjust fc_stat.c to use newer fc_exchange_t structure for its stats.
svn path=/trunk/; revision=53621
2013-11-28 14:00:23 +00:00
Michael Mann
e450b9baae Bugfix Negative Fibre Channel scsi_time value. Bug 3209 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3209)
The solution was to move the itlq_nexus_t structure handling from the FC dissector to the FCS dissector since it's actually the one with the LUN field.  OXID+LUN makes a unique exchange at FC layer so track that separately.  Also needed some additional OXID->LUN mapping at the FC layer to keep LUN correctly persistent.

Not backporting because this was partially made possible by r53569, which won't be backported.

svn path=/trunk/; revision=53620
2013-11-28 01:49:29 +00:00
Martin Kaiser
be4e248a07 try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9485
fc dissector rejects the packet if data parameter is empty


svn path=/trunk/; revision=53617
2013-11-27 21:52:44 +00:00
Bill Meier
c3a8eca1c8 Try fixing Sun compiler error: "warning: this decimal constant is unsigned only in ISO C90"
svn path=/trunk/; revision=53616
2013-11-27 17:23:00 +00:00
Bill Meier
914605a31f Fix a badly formed comment;
svn path=/trunk/; revision=53615
2013-11-27 16:48:00 +00:00
Bill Meier
04cdccdb83 - Create/use several extended value_strings
(sort associated value_string arrays as needed);

- Use new VALUE_STRING_LIST mechanism/macros to
  create enums and value_string arrays for:
    WERR_errors, DOS_errors, SRV_errors, and HRD_errors;

- Declare certain global value_string arrays as static (local)
  and use global extended value_strings to reference same;
    (e.g., ms_coiuntry_codes value_string_array)

- Rename SMBE_... defs used in several different value_string arrays
  to prevent potential name collisions:
   ( e.g., for SRV_errors: SMBE_... ==> SMBE_SRV_...)
   Done for value_string arrays: DOS_errors, SRV_errors, HRD_errors;

- WERR_errors value_string array:
    Note that WERR associated defs no longer exist in the latest samba doserr.h.
    (The WERR_errors defs were originally generated from the samba doserr.h).
    For now: WERR_errors kept as is.

- ToDo: Fix PIDL-generated dcerpc dissectors to use NT_errors_ext
        and WERR_errors_ext extended value_strings.

- Add editor modelines to a few files.

- Make whitespace changes.


svn path=/trunk/; revision=53614
2013-11-27 16:30:20 +00:00
Bill Meier
d1daa67cab Create/use several extended value_strings;
Add editor modelines.

svn path=/trunk/; revision=53613
2013-11-27 14:37:33 +00:00
Pascal Quantin
ca8b7b1ad0 Reinitialize counter between loops to avoid an out of bound access found with fuzz testing.
svn path=/trunk/; revision=53612
2013-11-27 08:09:55 +00:00
Guy Harris
cc538dbb6c Squelch a compiler warning.
svn path=/trunk/; revision=53606
2013-11-26 22:54:25 +00:00
Pascal Quantin
f2d28c05bc From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9476 :
Add DTMF dissector setup based on the information found in RTPproxy requests

svn path=/trunk/; revision=53605
2013-11-26 22:40:52 +00:00
Pascal Quantin
a955db9c0d From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9444 :
Add initial parameter parser for commands in RTPproxy dissector

svn path=/trunk/; revision=53604
2013-11-26 22:32:33 +00:00
Pascal Quantin
dff6b2aecb From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9397 :
Add RTP/RTCP dissector setup based on the replies found in rtpproxy dissector

svn path=/trunk/; revision=53603
2013-11-26 22:05:33 +00:00
Martin Kaiser
a5d8e1a535 fix encoding args
svn path=/trunk/; revision=53602
2013-11-26 21:49:31 +00:00
Bill Meier
f5ed7255c4 Create/use two extended value_strings;
Replace 'offset++' (and similar) by 'offset += 1' for consistency;
Remove some unneeded initializers;
Fix indentation &  whitespace style to be consistent;
Add editor modelines.

svn path=/trunk/; revision=53601
2013-11-26 20:53:43 +00:00
Anders Broman
861e0334f4 From Vineeth:
Support for Nokias GSM MAP Private Extensions

svn path=/trunk/; revision=53600
2013-11-26 20:29:17 +00:00
Martin Kaiser
e72632c101 From Ralph Böhme
Add QUERY_FS_INFO info level SMB_QUERY_POSIX_WHOAMI

from me
remove unnecessary if(tree) checks
add one check before guint16 *bcp is decremented

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

svn path=/trunk/; revision=53598
2013-11-26 12:18:23 +00:00
Martin Mathieson
aac0ba6508 When there is no ICMP reply, add a filterable field and expert info warning
svn path=/trunk/; revision=53588
2013-11-25 23:01:37 +00:00
Pascal Quantin
af892f0553 Fix typo errors
svn path=/trunk/; revision=53585
2013-11-25 22:25:03 +00:00
Martin Kaiser
5e65315e29 there were two identical copies of the function to process a DVB-SI time
remove the one in DVB-CI, use the version in mpeg-sect instead

svn path=/trunk/; revision=53580
2013-11-25 20:56:34 +00:00
Bill Meier
1516e5f9d9 Create/use two extended value-strings;
Comment out an unused variable definition;
Do some whitespace changes & several other minor changes;
Add editor modelines.

svn path=/trunk/; revision=53578
2013-11-25 20:04:25 +00:00
Bill Meier
21c772c7ed Create/use an extended value_string;
Use 'offset += 1' instead of 'offset++' for consistency;
Replace 32767 (as a mask) with 0x7FFF for clarity;
Remove some unneeded boilerplate comments;
Do whitespace changes.


svn path=/trunk/; revision=53577
2013-11-25 18:55:45 +00:00
Jeff Morriss
b023777a76 The defragment_xudt preference is used to control reassembly of both XUDTs
and also DT1s.  Update the preference text to reflect that.

(Don't change the actual preference name to avoid breaking backward
compatibility.)

svn path=/trunk/; revision=53576
2013-11-25 18:29:40 +00:00
Pascal Quantin
12618aadcd Add command type to info column
svn path=/trunk/; revision=53575
2013-11-25 18:04:07 +00:00
Martin Kaiser
de590abe6c fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9474
make mepg-sect a new-style dissector and do a length check on the
incoming tvb

svn path=/trunk/; revision=53573
2013-11-25 17:04:58 +00:00
Martin Kaiser
818ce4f301 mark unused parameter
svn path=/trunk/; revision=53571
2013-11-25 16:59:06 +00:00
Bill Meier
3e3c976377 Create/use extended value_string;
Move value_string array definitions from .h to .c file
 (value_string definitions should never be in a .h file);
Add XXX comments re value_string arrays containing
 duplicate values [ptp_opcode_names & ptp_respcode_names];
Remove unneeded #includes (stdio.h, stdlib.h & string.h);
Remove some unneeded initializers;
Add editor modelines.
Do some whitespace & long-lines changes;

svn path=/trunk/; revision=53570
2013-11-25 16:57:43 +00:00
Michael Mann
a9dd765d47 Remove Fibre Channel specific fields from packet_info and just have the fc_hdr or fc_data_t structure passed between all necessary dissectors.
svn path=/trunk/; revision=53569
2013-11-25 16:04:57 +00:00
Bill Meier
15083359a7 Create/use some extended value_strings.
Add editor modelines.

svn path=/trunk/; revision=53565
2013-11-25 15:37:56 +00:00
Pascal Quantin
402fed459f Fix a shadowed declaration error when compiling with gcc 4.3.2
svn path=/trunk/; revision=53562
2013-11-25 11:23:11 +00:00
Pascal Quantin
17e16ae136 Prettify LTE Positioning Protocol dissection
svn path=/trunk/; revision=53561
2013-11-25 11:16:24 +00:00
Michael Mann
6505190fb7 Move DCERPC data in packet_info needed for Decode As into packet scoped proto data.
svn path=/trunk/; revision=53559
2013-11-25 00:14:50 +00:00
Bill Meier
a15b7e998a Create/use a fair number of extended value_strings;
Add an XXX comment noting that the 'ndps_error_types' array has a
 number of duplicate values; Also note the commenting out of those
 dups which would not have been found via a linear search in the
 original unsorted array.

svn path=/trunk/; revision=53558
2013-11-24 23:55:26 +00:00
Pascal Quantin
db7405bb13 Dissect UE Rx - Tx time difference field
svn path=/trunk/; revision=53557
2013-11-24 23:09:48 +00:00
Guy Harris
91159d959f Note that I've filed a Samba bug for one of the problems.
svn path=/trunk/; revision=53555
2013-11-24 22:13:28 +00:00
Guy Harris
58771673a4 pidl would tag all pinfo arguments as unused, as it doesn't take the
effort to figure out whether they *are* used (and there's no point in it
doing so - might as well just flag them preemptively).

pidl can't handle this, at least not on OS X, as it's not handling the
C++/C99-style dissectors in the IDL for NSPI, so we manually put the
_U_s back.

svn path=/trunk/; revision=53554
2013-11-24 21:21:42 +00:00
Guy Harris
0f28eb7cc6 Squelch a Coverity warning (not necessary, but it still complains).
svn path=/trunk/; revision=53553
2013-11-24 21:15:22 +00:00
Michael Mann
e2df7c83cb Move dceprc_procedure_name from packet_info to dcerpc_info. Doesn't appear to be "used" by dissectors, just stored (for help in debugging?).
svn path=/trunk/; revision=53552
2013-11-24 20:55:55 +00:00
Bill Meier
7510deeab7 Create/use some extended value_strings;
Do a few trivial whitespace tweaks.

svn path=/trunk/; revision=53549
2013-11-24 15:55:10 +00:00
Jeff Morriss
a98072967e Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.
Also, as per Peter Harris' request, update copyright date.

svn path=/trunk/; revision=53545
2013-11-24 14:27:52 +00:00
Guy Harris
92fba9d072 Actually, the "1632" types do exist, and are 16-bit for NDR and 32-bit
for NDR64, and we handle them.  The real problems are elsewhere.

svn path=/trunk/; revision=53543
2013-11-24 04:39:27 +00:00
Guy Harris
0a2519f39c These are two of the problems that pidl has with dfs.idl.
svn path=/trunk/; revision=53542
2013-11-24 04:15:25 +00:00
Guy Harris
61cce924e4 Get rid of trailing spaces, fix some proto_tree_add_item() calls as per
the result of pidl on dce.idl.

(We can't just regenerate it, as there are some pidl bugs that cause bad
code to be generated.)

svn path=/trunk/; revision=53541
2013-11-24 04:14:00 +00:00
Guy Harris
f7e5e2d594 The issue with misc.idl was a .cnf file that needed to be updated.
Give details of the problems with the other files.

svn path=/trunk/; revision=53540
2013-11-24 03:33:17 +00:00
Guy Harris
eb223ff796 Regenerate - new API changes, get rid of trailing whitespace.
svn path=/trunk/; revision=53539
2013-11-24 03:21:50 +00:00
Guy Harris
f070b9e0e2 Fix to match API changes.
svn path=/trunk/; revision=53538
2013-11-24 03:20:25 +00:00
Guy Harris
9410fcccbc Fix line endings, set svn:eol-style to native.
svn path=/trunk/; revision=53537
2013-11-24 03:18:22 +00:00
Guy Harris
d30959df3e Update a date, explain what the problems are with a bunch of IDL files,
add another file that *might* be generating incorrect code.

svn path=/trunk/; revision=53536
2013-11-24 02:58:26 +00:00
Guy Harris
3f6b85ecbe Regenerate - for whatever reason, the fields come out in a different
random order, but nothing else changes.

svn path=/trunk/; revision=53535
2013-11-24 02:57:24 +00:00
Guy Harris
70cea27d59 Regenerated with the current version of pidl; mainly removes trailing
white space, but also gets rid of an apparently-unnecessary _U_ for one
argument.

svn path=/trunk/; revision=53534
2013-11-24 02:51:36 +00:00
Guy Harris
cafef8b111 Updates to:
suggest using our version of pidl, given that its Wireshark
	parser generator has changes to support the current internal
	Wireshark APIs for dissectors;

	suggest using "--includedir ." to make IDL files in
	subdirectories of epan/dissectors/pidl work;

	update the list of IDL files with issues;

	reformat to 80x66 (if it's good enough for Herman Hollerith,
	it's good enough for me!).

svn path=/trunk/; revision=53533
2013-11-24 02:45:38 +00:00
Jeff Morriss
de2a922b55 Some patches from Peter Harris to make it possible to build the X11 dissector
again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.


Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

svn path=/trunk/; revision=53532
2013-11-24 01:32:55 +00:00
Jeff Morriss
a434d9647e Some patches from Peter Harris to make it possible to build the X11 dissector
again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.


Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

svn path=/trunk/; revision=53531
2013-11-24 01:32:20 +00:00
Evan Huus
1db1b8e2bb Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit
of ansi_tcap code while in the neighbourhood.

svn path=/trunk/; revision=53530
2013-11-23 22:37:33 +00:00
Evan Huus
df1aec4a6b Remove old (2009) and no-longer-necessary compatibility macro.
svn path=/trunk/; revision=53527
2013-11-23 22:03:48 +00:00
Michael Mann
ea63042f9b Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
From Michal Labedzki 

svn path=/trunk/; revision=53525
2013-11-23 21:41:08 +00:00
Michael Mann
55c6869980 Remove ip_ttl from packet_info structure.
Part of the fix includes having the IPv6 dissector populate as much of a ws_ip structure as possible to pass to subdissectors of the "ip.proto" table, so the ttl value can be picked up.

svn path=/trunk/; revision=53522
2013-11-23 19:16:05 +00:00
Pascal Quantin
9150571bf3 Check the packet length when using the "Force decoding of unknown USB control data as MBIM" option to reduce false positives.
Align text in info column.

svn path=/trunk/; revision=53521
2013-11-23 12:30:19 +00:00
Michael Mann
9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Martin Mathieson
65e3e91208 Tweak filter names for expert items, mostly to consistently use - rather than _
svn path=/trunk/; revision=53514
2013-11-22 17:18:11 +00:00
Martin Mathieson
a906b1f5fe Tidy up some TODOs
svn path=/trunk/; revision=53513
2013-11-22 16:52:28 +00:00
Alexis La Goutte
2350754b88 Fix unused-const-variable error when build with clang 3.4
svn path=/trunk/; revision=53511
2013-11-22 14:52:15 +00:00
Alexis La Goutte
14ee1a5a86 Fix unused-const-variable error when build with clang 3.4
svn path=/trunk/; revision=53510
2013-11-22 14:52:04 +00:00
Alexis La Goutte
0d20064172 Fix unused-const-variable error when build with clang 3.4
svn path=/trunk/; revision=53509
2013-11-22 14:51:52 +00:00
Alexis La Goutte
f39f943db0 Fix unused-const-variable error when build with clang 3.4 (with ugly hack... Maybe remove all ugly INIT_FIELD/ ADD_FIELD macro)
svn path=/trunk/; revision=53508
2013-11-22 14:51:43 +00:00
Pascal Quantin
cebc175814 Make use of ctrl_ack_vals value_string array
svn path=/trunk/; revision=53506
2013-11-22 11:22:46 +00:00
Michael Mann
9ba190f2a5 Create multiple dissection functions if packet_info->ipproto is used to distinguish behavior.
svn path=/trunk/; revision=53504
2013-11-22 02:52:41 +00:00
Gerald Combs
70709e1b35 Move common "decode as" preference code to epan.
We presumably want "decode as" behavior to be consistent across UIs so
call load_decode_as_entries() from read_prefs().

svn path=/trunk/; revision=53498
2013-11-22 00:20:23 +00:00
Bill Meier
fc5adb9b66 Comment out *many* unused vars found by CLANG;
Fix 2 minor bugs wherein an incorrect (NULL) tree was always used;
Remove some unneeded initializers;
Localize some variables;
Use consistent indentation & whitespace formatting
Add editor modelines.

svn path=/trunk/; revision=53497
2013-11-21 23:21:49 +00:00
Bill Meier
9f485b9e89 #if 0 some unused vars found by CLANG
svn path=/trunk/; revision=53496
2013-11-21 23:17:59 +00:00
Martin Kaiser
a5317f8646 From Abhik Sarkar
improve relative offset calculations for Kyoto-Tycoon protocol

from me:
use col_append_sep_str()
set the correct length in dissect_kt()

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

svn path=/trunk/; revision=53495
2013-11-21 22:30:55 +00:00
Martin Kaiser
36f11a79cc next unprocessed descriptor 0xFF means that
all descriptors were processed

svn path=/trunk/; revision=53494
2013-11-21 21:54:31 +00:00
Guy Harris
63c8b20360 Widen the Ethertype to a guint, to avoid compiler warnings.
Fix indentation while we're at it.

svn path=/trunk/; revision=53493
2013-11-21 20:50:13 +00:00
Guy Harris
dad2b94703 Get rid of unused variable.
svn path=/trunk/; revision=53492
2013-11-21 20:33:28 +00:00
Michael Mann
eabaddaca9 Remove ethertype, mpls_label and ppids from packet_info structure.
The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".

svn path=/trunk/; revision=53489
2013-11-21 20:08:20 +00:00
Michael Mann
9fa6c9fb80 Create new dissectors when a protocol goes across ethernet and "something else" instead a single dissector that uses pinfo->ethertype to determine if it's the "ethernet" or the "something else" case.
svn path=/trunk/; revision=53488
2013-11-21 19:51:17 +00:00
Bill Meier
7727623d8c Do some constification;
Create/use value_string_ext_free();
Display certain numbers also as hex in the
   "forced to fall back to linear search: ..." value-string warning msg
Add editor-modelines to some files;
Do some whitespace changes.

svn path=/trunk/; revision=53484
2013-11-21 18:46:40 +00:00
Bill Meier
de60c9c76b (Trivial) Formatting & whitespace changes ....
svn path=/trunk/; revision=53483
2013-11-21 18:37:26 +00:00
Bill Meier
13124b7b8b Constify two vars;
Add editor modelines;
Rework some whitespace.

svn path=/trunk/; revision=53482
2013-11-21 18:03:10 +00:00
Bill Meier
0f5f63bbf0 Constify a character array;
Fix a typo;
Add editor modelines.

svn path=/trunk/; revision=53480
2013-11-21 17:41:17 +00:00
Bill Meier
774b7caa05 Create/use a number of extended value-strings;
Use FT_BOOLEAN instead of FT_UINT16 with 'ptp_bool_vals' value_string array;
Add editor modelines;
Do some whitespace & formatting changes.

svn path=/trunk/; revision=53477
2013-11-21 17:12:05 +00:00
Pascal Quantin
3894de27f3 Indicate fragments in info column
svn path=/trunk/; revision=53472
2013-11-21 11:20:06 +00:00
Pascal Quantin
2f3d057857 Do not add an unknown tag item for End-of-options
svn path=/trunk/; revision=53471
2013-11-21 09:33:01 +00:00
Michael Mann
32b66a9671 Fix memory leak from formatted string.
svn path=/trunk/; revision=53468
2013-11-21 03:26:42 +00:00
Michael Mann
3111b6c889 USB CCID and PN532_HCI can be now used in Decode As. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki

svn path=/trunk/; revision=53463
2013-11-21 01:18:23 +00:00
Michael Mann
091fd3d12b Fix DecodeBy priorities. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki.

svn path=/trunk/; revision=53462
2013-11-21 01:12:25 +00:00
Guy Harris
8b8cf5671d strncpy() consideered unsafe (it doesn't, for example, guarantee that
the result is null-terminated); use g_strlcpy() (which *does* guarantee
null termination) instead.

svn path=/trunk/; revision=53461
2013-11-21 00:38:22 +00:00
Evan Huus
123caff957 Remove one accidentally remaining reference to emem in XMPP utils.
Kill a bunch of now-unused emem tree code.

svn path=/trunk/; revision=53458
2013-11-21 00:18:12 +00:00
Jakub Zawadzki
50aa247c72 Fix Bug #9457 Update BACnet vendor list
Based on attachment #12139 (diff for adding the table) by rtsking117,
but keep original formatting and encoding (ASCII).

svn path=/trunk/; revision=53457
2013-11-20 23:32:02 +00:00
Evan Huus
a252026213 Fix minor issue introduced with conversion to new expert API in r51688.
Specifically, proto_tree_add_expert() must take an actual tree node (for example
from proto_item_add_subtree()) and cannot take just any old item node. The
original intent (before the conversion) appeared to be just to put it on the
tree, so do that.

Another assertion gone from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9406

svn path=/trunk/; revision=53456
2013-11-20 22:51:14 +00:00
Evan Huus
3b6573c2fb As per suggestion of Mike Morrin via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9406

The GSM CBCH assertion should be <= 48 not <48. Fixes one of the failing
assertions with the capture from that bug.

svn path=/trunk/; revision=53453
2013-11-20 22:34:36 +00:00
Pascal Quantin
ff6a590edb Mark another parameter as unused
svn path=/trunk/; revision=53451
2013-11-20 20:36:22 +00:00
Pascal Quantin
564b444eb3 Add explicit casts to please GCC
svn path=/trunk/; revision=53449
2013-11-20 20:07:42 +00:00
Pascal Quantin
61a4e7d46d Add explicit casts to please GCC
svn path=/trunk/; revision=53448
2013-11-20 20:05:17 +00:00
Anders Broman
304eba4d95 Mark parameter as unused
packet-ber.c:391: warning: unused parameter 'table_name'

svn path=/trunk/; revision=53447
2013-11-20 19:52:21 +00:00
Michael Mann
01c8945438 Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450)
The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table.  When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog.  Any GUI (GTK+/Qt/tshark) can just hook into the "decode as list" to see what can be provided.

This patch includes the GUI portion of the functionality (including packet-dcerpc.[ch] because it had some GUI dependencies that are now removed).

Other notes:
1. Some "GUI text" (UTF8_LEFTWARDS_ARROW and similar) made their way into the dissector code.  Not sure how necessary it is and if reformatting the strings to avoid the macros is desired (TCP/UDP use it, SCTP doesn't).

2. I converted the SCTP functionality to have 2 tabs (instead of radio button), currently both are labeled "Transport" which could be confusing to users.  Naming suggestions welcome (as well as for naming of tabs from other dissectors).

3. BER and DCERPC have more opportunity to use Decode As now that they are selected based on dissector presense, not packet_info values.

4. Catapult DCT2000 populates pinfo->ipproto, yet under new design will not show up to do Decode As.  Should a "decode as item" be created for it?

5. BER dissector doesn't have Clear/Show Current functionality working (never did)

6. Bluetooth (in old design) could have been used "capture wide" instead of single packet (creating tabs of values not present in current packet), which goes against what I believe to be in the intent of Decode As, but I'm willing to hear counter-arguments.

svn path=/trunk/; revision=53446
2013-11-20 19:23:02 +00:00
Michael Mann
76ab93ea94 Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450)
The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table.  When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog.

This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI)

svn path=/trunk/; revision=53445
2013-11-20 19:17:08 +00:00
Alexis La Goutte
91b972ae5e From Jakub via http://www.wireshark.org/lists/wireshark-dev/201311/msg00153.html
Wrong offset incrementation in r53416 (Add status_request_v2 TLS extension dissection (RFC6961))

From me
Fix encoding args

svn path=/trunk/; revision=53444
2013-11-20 18:38:48 +00:00
Michael Mann
f34e11fabe Convert ethertype() function into a pure dissector. Bug 9454 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9454)
The main driving force for this was my new Decode As functionality (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) that wants a dissector/subdissector table relationship for all dissectors wanting to use Decode As functionality.  The ethertype() function provides the value to the "ethertype" subdissector table, so I think it should be matched to a dissector.  Only odd side effect is the display filter of "ethertype" returns no packets because there is no "item" associated with the dissector.


svn path=/trunk/; revision=53443
2013-11-20 02:28:14 +00:00