osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
41,496 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

41496 Commits

Author SHA1 Message Date
Chris Maynard 2c773fad77 Fix Coverity CID 709726: Structurally dead code. Also, convert tabs to spaces. 
svn path=/trunk/; revision=43769
 2012-07-17 19:22:55 +00:00
Pascal Quantin c2883b7be2 Fix 'dereferencing type-punned pointer will break strict-aliasing rules' warning when compiling with gcc 4.1.3 
svn path=/trunk/; revision=43768
 2012-07-17 14:55:27 +00:00
Jörg Mayer 83a22a220a Now it compiles with 2.24 - hopefuly it will even work 
svn path=/trunk/; revision=43767
 2012-07-17 14:52:42 +00:00
Jörg Mayer 6bd20171ef Bring compilation with gtk 2.24 one step further (not yet working) 
svn path=/trunk/; revision=43766
 2012-07-17 14:33:06 +00:00
Pascal Quantin c312f14022 More a few ASN.1 based dissectors from the dirty to celan lib (as they should compile without any error now) 
svn path=/trunk/; revision=43765
 2012-07-17 13:14:23 +00:00
Pascal Quantin babe622987 Use G_MININT32 instead of -2^31 so as to get rid of 'this decimal constant is unsigned only in ISO C90' warning 
svn path=/trunk/; revision=43764
 2012-07-17 13:12:50 +00:00
Jakub Zawadzki a8016f6a57 Fix bug #7488: Unable to correctly identify IEC 61850 MMS packets 
In r39066 was added 'final check to see if the next SPDU, if present, is also valid',
but it didn't properly check for tvb length which causes exception if there's no next SPDU.

svn path=/trunk/; revision=43763
 2012-07-17 13:01:17 +00:00
Anders Broman db3f6fe80c From Peter Paluch: 
recognize VLAN-bridge STP 

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

svn path=/trunk/; revision=43762
 2012-07-17 12:55:37 +00:00
Pascal Quantin 777bbfb20d Use same capitalization for Service request message as for other messages 
svn path=/trunk/; revision=43761
 2012-07-17 10:35:21 +00:00
Pascal Quantin 3a682212f5 Remove extra space after message name 
svn path=/trunk/; revision=43760
 2012-07-17 10:13:22 +00:00
Pascal Quantin ec17920a3e From Wayne Brassem via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7485 : 
Add support for IPv6 over PPP in Jmirror dissector

svn path=/trunk/; revision=43759
 2012-07-17 07:33:20 +00:00
Anders Broman 77dc607ed9 Add Jacob Nordgren and Rishie Sharma to the list. 
svn path=/trunk/; revision=43758
 2012-07-17 07:32:10 +00:00
Gerald Combs 0f0b5efcc1 Pass the correct widget to gtk_open_file. If we're filling in a display 
filter make sure we check its syntax. Return a boolean.  --This line,
and those below, will be ignored--

M    ui/gtk/capture_file_dlg.c

svn path=/trunk/; revision=43757
 2012-07-16 21:01:16 +00:00
Gerald Combs 281e18d636 Move most of file_open_cmd to gtk_open_file. Make gtk_open_file 
and win32_open_file behave similarly. _snwprintf is "banned". Use
StringCchPrintf instead. Tested on Windows. I'll test on OS X shortly.

svn path=/trunk/; revision=43756
 2012-07-16 20:46:13 +00:00
Stephen Fisher a3d1900fbd Fix compilation error seen with gcc on Unix: 
pinfo_stats_tree.c:234:2: error: no newline at end of file


svn path=/trunk/; revision=43755
 2012-07-16 18:07:08 +00:00
Pascal Quantin a76f4990b8 Comment a few unused variables / functions 
svn path=/trunk/; revision=43754
 2012-07-16 15:54:53 +00:00
Jakub Zawadzki b0e44929a3 Gadu-Gadu: dissect more packets. 
svn path=/trunk/; revision=43753
 2012-07-16 14:34:35 +00:00
Alexis La Goutte c9690704be From Zdravko Velinov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7483 
Enhancements to the HP ERM protocol dissector 

I have done some reverse engineering of the HP ERM protocol. I had injected
some 802.1Q frames on a network that contained a HP ProCurve 5406zl switch,
then I examined the resulting encapsulated traffic. It was quite easy to spot
the VLAN identifier and the priority field because part of the header closely
resembled the 802.1Q header. There were just some minor differences in the
priority numbering between 802.1Q and HP ERM.


From me :
Add Modeline info
Fix Clang warning

svn path=/trunk/; revision=43752
 2012-07-16 14:23:28 +00:00
Anders Broman d8be496cd5 From Jacob Nordgren and Rishie Sharma: 
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43751
 2012-07-16 14:06:36 +00:00
Anders Broman 37fdb21ec2 From Jacob Nordgren and Rishie Sharma: 
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43750
 2012-07-16 13:54:20 +00:00
Anders Broman fe630ec1df From Jacob Nordgren and Rishie Sharma: 
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43749
 2012-07-16 13:11:20 +00:00
Bill Meier f41a04b7ab Minor cleanup, including: 
- Remove unneeded #includes;
- Simplify code slightly;
- Remove unused ett variable and related;
- Remove empty proto_reg_handoff...() functions;
- Fix a few cases of "set but unused".
- Do some whitespace changes.

svn path=/trunk/; revision=43748
 2012-07-16 12:34:33 +00:00
Jakub Zawadzki 1e95104860 proto_tree_add_boolean() takes value not ENC_ flag. 
svn path=/trunk/; revision=43747
 2012-07-16 12:09:19 +00:00
Bill Meier 66f163af90 (trivial) Explicitly initialize a static variable to NULL. 
svn path=/trunk/; revision=43746
 2012-07-16 11:47:55 +00:00
Jakub Zawadzki 42f423fcce - Restore optimization of drawing only lines in clipping area 
- Fix compilation for < gtk-2.14

svn path=/trunk/; revision=43745
 2012-07-16 09:56:53 +00:00
Jakub Zawadzki 009a1a3614 Compilation fixes for gtk-3.x + for gtk-2.x use clipping region not area. 
svn path=/trunk/; revision=43744
 2012-07-16 09:18:33 +00:00
Jakub Zawadzki 7a2ba09d14 - Make it compile gtk-2.24 with GSEAL_ENABLE enabled 
- ->draw for gtk-3.x (NOT TESTED!!!)

svn path=/trunk/; revision=43743
 2012-07-16 08:35:04 +00:00
Jakub Zawadzki aaa4688e3a Some gtk-3.0 fixes. 
svn path=/trunk/; revision=43742
 2012-07-16 07:26:00 +00:00
Anders Broman ac335fc5f4 From Jacob Nordgren and Rishie Sharma: 
Handle RRC_MESSAGE_TYPE_BCCH_FACH.

svn path=/trunk/; revision=43741
 2012-07-16 07:02:29 +00:00
Martin Mathieson 2d38d90b3e Don't create and destroy a cairo context for each line and ellipse when 
redrawing the graph.

Don't mess around with a static pointer when allocating segments. This
seems unecessary and can result in the last one being leaked.

These changes were already made to rlc_lte_graph.c, which is based upon
the tcp graph code.

svn path=/trunk/; revision=43740
 2012-07-16 03:05:35 +00:00
Guy Harris 7736e72e1d <gtk/gtkmarshal.h> doesn't appear to be necessary, at least with GTK+ 
2.24.5.  Remove the include of it.

Get rid of duplicate #undefs of GTK_DISABLE_DEPRECATED and GSEAL_ENABLE
- nothing in config.h should depend on them.

Make at least some of the changes that

	http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459694

and

	http://developer.gnome.org/gtk3/stable/ch24s02.html#id1459754

seem to indicate we need to make for GTK+ 3.

svn path=/trunk/; revision=43739
 2012-07-16 02:42:44 +00:00
Martin Mathieson 3019949943 Fix a copy+paste error ('capinfos' appearing in error string). 
svn path=/trunk/; revision=43738
 2012-07-16 02:37:42 +00:00
Guy Harris 95060ffa5d The CMake builds in the Ubuntu buildbot appear to be building with GTK+ 
3; if so, that might indicate that GTK+ 3 doesn't have gtkmarshal.h. 
Try not attempting to include it with GTK+ 3.x - if that causes other
failures, well, I guess that means that, when building the BytesView
widget under GTK+ 3, we can't use the gtk_marshal_ functions....

svn path=/trunk/; revision=43737
 2012-07-16 01:54:32 +00:00
Guy Harris 268520b707 For the encoding and format, use the enum types. 
Add some comments.

svn path=/trunk/; revision=43736
 2012-07-16 01:49:01 +00:00
Guy Harris 6469a1d606 Get rid of probably-unnecessary parentheses around the expansion of 
gtk_widget_get_allocation() (gtk_widget_set_window() doesn't have them),
but *do* put parentheses around its "x" argument.

Fix gtk_widget_set_allocation() to set the allocation.

svn path=/trunk/; revision=43735
 2012-07-15 23:20:34 +00:00
Jakub Zawadzki 19c7ee7ae2 Fix some gseal warnings. 
svn path=/trunk/; revision=43734
 2012-07-15 21:57:08 +00:00
Guy Harris 3408bf4038 Get rid of unnecessary include. 
svn path=/trunk/; revision=43733
 2012-07-15 21:53:50 +00:00
Guy Harris 205165dfb8 Squelch some more warnings with explicit casts. 
svn path=/trunk/; revision=43732
 2012-07-15 21:22:09 +00:00
Guy Harris 6bf7a66b29 Try gdouble here, to see if it removes "gdouble to gfloat" warnings with 
MSVC.

svn path=/trunk/; revision=43731
 2012-07-15 21:19:42 +00:00
Jakub Zawadzki 951fd55af3 Fix win* buildbot warnings: 
packet_panes.c(304) : error C2220: warning treated as error - no 'object' file generated
packet_panes.c(304) : warning C4244: 'function' : conversion from 'gdouble' to 'int', possible loss of data
packet_panes.c(304) : warning C4244: 'function' : conversion from 'gdouble' to 'int', possible loss of data

Add casts, old code did the same casts so this should be OK.

svn path=/trunk/; revision=43730
 2012-07-15 20:48:40 +00:00
Jakub Zawadzki 1279b87345 user_font_get_bold() is no longer needed, remove it. 
svn path=/trunk/; revision=43729
 2012-07-15 20:29:22 +00:00
Jakub Zawadzki b69c48df5a Fix bug #6690: Wireshark quite slow displaying frames with many detail pane nodes and large byteviews 
Add custom widget to render hexdump or bitsdump.

svn path=/trunk/; revision=43728
 2012-07-15 20:24:48 +00:00
Anders Broman 14ba8d892e From Network Instruments by Tom Brezinski When a Network Instruments wireless capture is decrypted a flag is set on the packet in the BFR file indicating that the packet is decrypted instead of modifying the protected flag in the frame control flags of the packet header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7478 
svn path=/trunk/; revision=43727
 2012-07-15 16:37:25 +00:00
Anders Broman 5d9d9b8221 From Wonil Kim: Enable statistics menu register for the tap plug-in. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7466 
svn path=/trunk/; revision=43726
 2012-07-15 16:24:35 +00:00
Pascal Quantin 7deecbf36b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7479 : 
Provide an empty string when data pointer is not NULL (regression introduced in r43703)

svn path=/trunk/; revision=43724
 2012-07-15 15:26:57 +00:00
Chris Maynard 83c83a0c05 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7356: 
Print only visible columns.

svn path=/trunk/; revision=43722
 2012-07-15 14:56:40 +00:00
Chris Maynard e173f01c5c Be sure to assign the return value of tvb_length_remaining() to a signed integer and not an unsigned integer, and then check that value is > 0. 
svn path=/trunk/; revision=43720
 2012-07-15 14:31:40 +00:00
Chris Maynard 0d41b6edad tvb_length_remaining() can return -1, so check that it's > 0, and not != 0. If tvb_length_remaining() is > 0, then tvb_reported_length_remaining() should also be > 0, so I don't think there's a need for further checks there. 
svn path=/trunk/; revision=43719
 2012-07-15 14:29:06 +00:00
Gerald Combs c788e585a9 [Automatic manuf, services and enterprise-numbers update for 2012-07-15] 
svn path=/trunk/; revision=43718
 2012-07-15 14:03:28 +00:00
Pascal Quantin 5ca89cfed3 Sanity checks to avoid a crash if no file is open 
svn path=/trunk/; revision=43717
 2012-07-14 19:59:13 +00:00