Commit Graph

43219 Commits

Author SHA1 Message Date
Guy Harris 8cb31ee512 Note why there's no AT_IEEE_802_15_4_LONG (that's AT_EUI64).
svn path=/trunk/; revision=45744
2012-10-23 23:27:29 +00:00
Guy Harris 7c76ad78d3 Add an AT_ value for 802.15.4 short addresses.
Note that, if you want EUI-64's to resolve the OUI in the display,
hacking individual dissectors to do it themselves and use AT_STRINGZ is
*not* the right way to do it.

svn path=/trunk/; revision=45743
2012-10-23 21:19:02 +00:00
Martin Kaiser 31f7fee054 From Steve Magnani
fix USB descriptor parsing

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

svn path=/trunk/; revision=45742
2012-10-23 21:02:28 +00:00
Chris Maynard f05cc88f6f Don't bother to check if cdata is NULL; it has already been dereferenced.
Fixes Coverity CID 719420: Dereference before null check.

svn path=/trunk/; revision=45741
2012-10-23 21:00:34 +00:00
Martin Kaiser c9b7d8c3c2 j should also be guint16 to prevent overflows in the while-loops
svn path=/trunk/; revision=45740
2012-10-23 20:35:19 +00:00
Pascal Quantin 67fdfbbcde From Allan M. Madsen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7905 :
Fix infinite loop in bthci_evt eir data handling

svn path=/trunk/; revision=45739
2012-10-23 20:27:57 +00:00
Anders Broman afc96b6276 Add B flag to Proxy Binding messages.
svn path=/trunk/; revision=45738
2012-10-23 16:06:57 +00:00
Anders Broman 9887b09f88 Mark unused parameters.
svn path=/trunk/; revision=45737
2012-10-23 12:18:25 +00:00
Anders Broman b70e8b63ff Allways use sminmpec_values_ext to print the vendor id regardless if we have it in the database or not.
svn path=/trunk/; revision=45736
2012-10-23 11:49:19 +00:00
Anders Broman 4c792b7214 - Use mip6_mh_types to build the INFO_COL string rather than a fixed string in the subroutines.
- Use proto_add_item for ipproto.
- extend an enum and use definse for new messages.

svn path=/trunk/; revision=45735
2012-10-23 11:47:57 +00:00
Chris Maynard 26989e9d11 Inspired by http://www.wireshark.org/lists/wireshark-users/201206/msg00025.html, add support for being able to specify a numeric range as the <selector> part of tshark's -d <layer type>==<selector>,<decode-as protocol> option.
svn path=/trunk/; revision=45734
2012-10-23 00:58:38 +00:00
Evan Huus bfe304a9a4 Make the fuzz-test plugin error into a warning, since lacking plugins
doesn't seem (to me) to warrant preventing someone from fuzz-testing.

Anyone know why this was put in in the first place?

svn path=/trunk/; revision=45733
2012-10-22 23:33:48 +00:00
Evan Huus 048727f724 Add eol-style and Id properties to new AOL dissector.
svn path=/trunk/; revision=45732
2012-10-22 23:24:13 +00:00
Evan Huus 8987cd4bd7 From Tim Hentenaar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7860
Add a dissector for the America Online protocol (not the AIM protocol).

From me: always use ENC_NA for FT_UINT8 types.

svn path=/trunk/; revision=45731
2012-10-22 23:22:00 +00:00
Bill Meier 78494ccbbf Fix some encoding args; (still more to do).
svn path=/trunk/; revision=45730
2012-10-22 21:40:06 +00:00
Jakub Zawadzki d127d974f5 volatile fixes.
svn path=/trunk/; revision=45729
2012-10-22 21:22:35 +00:00
Bill Meier 19d2c33091 Cleanup:
- Ethereal --> Wireshark;
- gerald@ethereal.com --> gerald@wireshark.org;
- update FSF address;
- remove unneeded #includes;
- Fix ENC args for proto_tree_add_item() & etc;
- simplify/remove proto_reg_handoff...() as appropriate;
- remove some boilerplate comments;
- move proto_register...() and proto_reg_handoff...() to
   the end of the file as per convention;
- remove some unneeded initializers.
- simplify some code;
- replace "" in hf[] blurb by NULL.


svn path=/trunk/; revision=45728
2012-10-22 20:46:47 +00:00
Bill Meier 3b4260cfe0 ethereal --> wireshark
svn path=/trunk/; revision=45727
2012-10-22 19:58:15 +00:00
Bill Meier ecb3783318 Minor cleanup:
- Ethereal -> Wireshark;
- remove unneeded #include.

svn path=/trunk/; revision=45726
2012-10-22 19:55:20 +00:00
Jakub Zawadzki 7ba01c587a Fix warning: file.c(776) : warning C4028: formal parameter 2 different from declaration
svn path=/trunk/; revision=45725
2012-10-22 19:46:30 +00:00
Jakub Zawadzki 9e52b48cc6 Move some variables inside TRY { } block.
svn path=/trunk/; revision=45724
2012-10-22 19:44:51 +00:00
Guy Harris 3c93cdbddc Make progbar_quantum volatile to suppress setjmp/longjmp warnings.
svn path=/trunk/; revision=45723
2012-10-22 19:34:09 +00:00
Jakub Zawadzki d26925c9cf Move TRY CATCH outside reading packet loops.
svn path=/trunk/; revision=45722
2012-10-22 19:14:43 +00:00
Jakub Zawadzki b03dda64d8 Comment more cases where static allocation is used with SET_ADDRESS.
svn path=/trunk/; revision=45721
2012-10-22 18:14:54 +00:00
Jakub Zawadzki 9680c9a9d9 Memory for address->data store in pinfo can no longer be ep_ allocated.
svn path=/trunk/; revision=45720
2012-10-22 18:14:17 +00:00
Chris Maynard 6147e6d1d5 Wireshark Filter Expression dialog does not sort list of named fields. Patch from Jakub Zawadzki. Resolves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7743
svn path=/trunk/; revision=45719
2012-10-22 18:10:48 +00:00
Jakub Zawadzki 0bf9560cb0 Fix bug #7892: Buildbot crash output: fuzz-2012-10-21-27120.pcap
Memory for address->data store in pinfo can no longer be ep_ allocated.

svn path=/trunk/; revision=45718
2012-10-22 17:59:22 +00:00
Chris Maynard e6983eb890 Avoid potential infinite loops. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7879
#BACKPORT (1.8, 1.6)

svn path=/trunk/; revision=45717
2012-10-22 16:22:21 +00:00
Pascal Quantin bbadc4134e Add missing newline at end of file
svn path=/trunk/; revision=45716
2012-10-22 16:12:37 +00:00
Chris Maynard 573dd5b3dc 1) Allow for the possibility for both packet summary and packet details to be
printed when either -T is not specified or "-T text" or "-T ps" is selected.

2) Allow for packet hex/ascii to be printed without necessarily requiring that
either packet summary or packet details also be printed.  This just means that
if you want packet summary information, use "-Px" instead of just "-x".

3) Fix bug with order of evaluation of -V and "-T psml".

4) If a packet separator is specified, always use it regardless of the -PVx
options chosen.

5) Don't print 2 lines of separation between packets when only printing
hex/ascii.  Print 1 line of separation as in all other cases.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7782 plus other misc. enhancements.

svn path=/trunk/; revision=45715
2012-10-22 15:56:59 +00:00
Gerald Combs caf8ed8e0c Try reverting r45351 again. It looks like the recent changes are
confusing SVN:
http://www.wireshark.org/lists/wireshark-dev/201210/msg00190.html

svn path=/trunk/; revision=45714
2012-10-22 15:50:43 +00:00
Anders Broman 3ae4bcd596 Extend value_strings with entries from IANA.
svn path=/trunk/; revision=45713
2012-10-22 14:47:44 +00:00
Anders Broman 52724813a6 Add a link to IANA.
svn path=/trunk/; revision=45712
2012-10-22 14:46:52 +00:00
Jörg Mayer c0d20887f0 Fix
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2611:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format]
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2617:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format]


svn path=/trunk/; revision=45711
2012-10-22 14:02:10 +00:00
Anders Broman 0eefbb4b09 Fix
../../../epan/dissectors/packet-btatt.c:299:25: error: too many arguments for format [-Werror=format-extra-args]
../../../epan/dissectors/packet-btatt.c:254:12: error: unused variable 'col_info' [-Werror=unused-variable]

svn path=/trunk/; revision=45710
2012-10-22 13:23:42 +00:00
Anders Broman 576b37ddd8 from Allan M. Madsen:
Add support for HCI 3.0+HS and v4.0, Bluetooth Low Energy. This includes
dissection of additional HCI commands and events, Attribute Protocol and
Security Manager Protocol.

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

svn path=/trunk/; revision=45709
2012-10-22 12:49:04 +00:00
Anders Broman 007a0b28ae From Matthias St. Pierre:
Add full rfc4868 support to both dissectors.

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

svn path=/trunk/; revision=45708
2012-10-22 12:34:01 +00:00
Anders Broman e9f13d771c g_strcmp0 first occures in GLIB 2.16 define it localy if it does not exist
to make builds on Fedora 8 with GTK 2.12 work.

svn path=/trunk/; revision=45707
2012-10-22 12:20:36 +00:00
Guy Harris 0c0cec7e69 Have separate seek-read routines for V1.0 and V2.0.
Set the subtype_read and subtype_seek_read routines for the file type,
rather than having a common read routine that checks the file type each
time.

Make the macros used in the read and seek-read routines more similar,
and use them more similarly in both.

svn path=/trunk/; revision=45706
2012-10-22 11:38:57 +00:00
Guy Harris 5071e32079 Pull the length-and-caplen setting operations in the read routines into
the macros.

Note why we don't pull the time setting operations into the macros (it's
because that would mean the macros can't be used in the seek-read
routines, as calculating time stamps requires accumulating the time
stamps in a sequential pass through the packets, given that the records
have time stamps relative to the previous packet).

Fix what is probably a typo in the definitions of some macros (which
happen to work without the fix because "fp" and "pp" are both local
variable names as well as macro arguments).

svn path=/trunk/; revision=45705
2012-10-22 10:06:13 +00:00
Guy Harris 3f032cdd12 Pass a pointer to a struct wtap_pkthdr to a bunch of macros; this allows
us to avoid one redefinition of those macros that, in the one
definition, for the read routines, refer to the pseudo-header as
wth->phdr.pseudo_header and, in the next definition, for the seek-read
routine, refer to it as *pseudo_header - instead, we pass &wth->phdr in
the read routine and phdr in the seek-read routine.

svn path=/trunk/; revision=45704
2012-10-22 08:09:05 +00:00
Michael Mann ca6eea0923 Bug 7884 - replace proto_tree_add_text with expert_info for packet-mpls-echo.c (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7884)
svn path=/trunk/; revision=45703
2012-10-22 02:41:19 +00:00
Guy Harris a0227ab739 More white-space cleanups.
svn path=/trunk/; revision=45702
2012-10-21 22:47:32 +00:00
Guy Harris 720271dd08 Use phdr->pseudo_header in the seek-read routine, rather than putting
its address into a pseudo_header pointer and using that.

svn path=/trunk/; revision=45701
2012-10-21 22:45:27 +00:00
Guy Harris 7c8f5f852b Tabs -> spaces, and other whitespace cleanups.
svn path=/trunk/; revision=45700
2012-10-21 22:30:01 +00:00
Pascal Quantin b5bc45b118 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7675 :
Fix improper use of negative value in AVCTP

svn path=/trunk/; revision=45699
2012-10-21 21:44:57 +00:00
Pascal Quantin 392a956822 Fix a few errors found by checkhf.pl and fix-encoding-args.pl
svn path=/trunk/; revision=45698
2012-10-21 21:32:58 +00:00
Pascal Quantin 89e9dde138 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740 :
Fix deadcode areas and improper use of negative value in AVRCP

svn path=/trunk/; revision=45697
2012-10-21 21:17:27 +00:00
Pascal Quantin ccc0d6bd2a From Sho Amano via https://www.wireshark.org/lists/wireshark-dev/201210/msg00186.html:
Fix WLAN decryption when using a WPA PSK key

svn path=/trunk/; revision=45696
2012-10-21 20:52:39 +00:00
Guy Harris 30c709777e Include ui/win32/console_win32.c.
svn path=/trunk/; revision=45695
2012-10-21 19:49:40 +00:00