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

43185 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Pascal Quantin
f69b25250b Simplify #ifdef blocks 
svn path=/trunk/; revision=45694
 2012-10-21 19:17:36 +00:00
Pascal Quantin
b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32 
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
 2012-10-21 19:12:18 +00:00
Alexis La Goutte
5af3defc46 Try to fix LINK : fatal error LNK1181: cannot open input file 'win32/console_win32.obj' 
move ui/win32/console_win32.[ch] to ui/console_win32.[ch]

svn path=/trunk/; revision=45692
 2012-10-21 18:10:31 +00:00
Alexis La Goutte
1d4bd1cb33 Make Windows Buildbot happy 
svn path=/trunk/; revision=45691
 2012-10-21 16:37:45 +00:00
Alexis La Goutte
96f58b6f38 Make buildbot happy and add modelines info 
svn path=/trunk/; revision=45690
 2012-10-21 15:26:48 +00:00
Alexis La Goutte
b700020a83 Add svn:keyworks and svn:eol-style to ui/win32/console_win32.[ch] (not found how to add with git-svn...) 
svn path=/trunk/; revision=45689
 2012-10-21 15:04:50 +00:00
Anders Broman
8d178187e3 AddressString can have a size of 1, fixes Bug 7882 -GSM_MAP show malformed Packets when two IMSI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7882 
svn path=/trunk/; revision=45687
 2012-10-21 15:01:23 +00:00
Alexis La Goutte
1ae6c353e7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45686
 2012-10-21 14:54:11 +00:00
Alexis La Goutte
5d448950f8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45685
 2012-10-21 14:54:01 +00:00
Alexis La Goutte
55356782db Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45684
 2012-10-21 14:53:51 +00:00
Alexis La Goutte
732a735429 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45683
 2012-10-21 14:53:38 +00:00
Alexis La Goutte
0baa7413a9 Fix Passed-by-value struct argument contains uninitialized data Warning found by Clang 
svn path=/trunk/; revision=45682
 2012-10-21 14:53:29 +00:00
Alexis La Goutte
2ce9037866 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45681
 2012-10-21 14:53:20 +00:00
Alexis La Goutte
523417a5ca Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45680
 2012-10-21 14:53:10 +00:00
Alexis La Goutte
8e0fc436f9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=45679
 2012-10-21 14:53:01 +00:00
Alexis La Goutte
b88ff840a3 Add MSWindows console to QtShark 
svn path=/trunk/; revision=45678
 2012-10-21 14:45:40 +00:00
Alexis La Goutte
62ce10ced8 Move MSWindows console "windows" to ui/win32/console_win32.[ch] 
svn path=/trunk/; revision=45677
 2012-10-21 14:45:23 +00:00
Gerald Combs
6af91f9304 [Automatic manuf, services and enterprise-numbers update for 2012-10-21] 
svn path=/trunk/; revision=45675
 2012-10-21 14:03:28 +00:00
Jakub Zawadzki
829b2fc91f Make r45511 work also without HAVE_C_ARES. 
svn path=/trunk/; revision=45674
 2012-10-20 20:50:25 +00:00
Jakub Zawadzki
2fd81fdaf9 Move ep_free_all() *AFTER* packet dissection. 
Use glib allocator for data_source.

Thread on wireshark-dev: http://www.wireshark.org/lists/wireshark-dev/201210/msg00116.html

svn path=/trunk/; revision=45673
 2012-10-20 20:04:40 +00:00
Jakub Zawadzki
b53dbea042 Make data_source opqaue, add getter for tvb. 
svn path=/trunk/; revision=45672
 2012-10-20 19:54:56 +00:00
Jakub Zawadzki
33b064cd81 I don't understand how this variable might be clobbered, but mark it volatile to silent gcc warning. 
svn path=/trunk/; revision=45671
 2012-10-20 19:52:23 +00:00
Jakub Zawadzki
77368c3668 Introduce epan_dissect_run_with_taps() which run dissection with taps. 
unexport tap_queue_init, tap_push_tapped_queue

svn path=/trunk/; revision=45670
 2012-10-20 19:27:24 +00:00
Jakub Zawadzki
6dc977b7d2 - Allow reseting edt with new function epan_dissect_reset(), 
- initialize edt once in few places, and later reset it after dissecting
  (add_packet_to_packet_list),
- revert r45667, probably no longer needed.

svn path=/trunk/; revision=45669
 2012-10-20 16:44:55 +00:00
Jakub Zawadzki
ef72e0eed3 - Free root node and tree data outside proto_tree_free_node, 
- remove #if 0 code.

svn path=/trunk/; revision=45668
 2012-10-20 16:38:55 +00:00
Evan Huus
eb4e26e1b7 Make a few variables volatile to fix longjmp warnings. 
svn path=/trunk/; revision=45667
 2012-10-20 13:16:10 +00:00
Jakub Zawadzki
88ac0dbea2 Pass create_proto_tree, cinfo directly to add_packet_to_packet_list 
svn path=/trunk/; revision=45666
 2012-10-20 12:51:34 +00:00
Jakub Zawadzki
ea31ff66a0 Remove always TRUE refilter argument from rescan_packets, add_packet_to_packet_list 
svn path=/trunk/; revision=45665
 2012-10-20 12:51:05 +00:00
Evan Huus
99ddfe913c Remove unused variable. 
svn path=/trunk/; revision=45664
 2012-10-19 22:04:44 +00:00
Guy Harris
6bcb25c6cb Pass parse_vms_hex_dump() a pointer to a wtap_pkthdr structure and have 
it always fill it in.  Have the seek-read routine pass its phdr argument
in.  Have it just return a success/failure indication; do the check for
the packet size in the seek-read routine by looking at the caplen field
of the wtap_pkthdr structure.

svn path=/trunk/; revision=45663
 2012-10-19 21:05:03 +00:00
Gerald Combs
d16be272c9 Fix columns. 
svn path=/trunk/; revision=45662
 2012-10-19 20:56:22 +00:00
Gerald Combs
b369a09cd2 The file set and export object trees are lists. Make them act like 
it. Show human-readable sizes in the file set dialog. Move the
format_size_flags_e operator to qt_ui_utils.cpp for lack of a better
place.

svn path=/trunk/; revision=45661
 2012-10-19 19:04:21 +00:00
Chris Maynard
ebaf451a4e Add back the "%!" removed in r33773; otherwise, for some unknown reason, only 1 page will be viewable. (Tested w/gsview 5.0 and ghostscript 9.06) 
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=45660
 2012-10-19 18:05:02 +00:00
Gerald Combs
b924cfed2b The U3 and PortableApps packaging processes depend on simple 
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
 2012-10-19 17:47:34 +00:00