Commit Graph

41616 Commits

Author SHA1 Message Date
Michael Mann e298722f5b svn path=/trunk/; revision=43789 2012-07-18 19:40:56 +00:00
Guy Harris bbe3a78d3a That comment might have confused the API checker into thinking we were
calling abort(); try changing it.

svn path=/trunk/; revision=43788
2012-07-18 18:50:29 +00:00
Jörg Mayer ebccbb0829 Get rid of the problems described in bug7377
Bissecting shows, that the problem was introduced by commit

r43009 | etxrab | 2012-06-03 01:53:04 +0200 (So, 03 Jun 2012) | 1 line

From Evan Huus Convert a bunch more GTK-2 calls to their cross-version ws_ equivalent

To get the problems back, compile with -DBREAK_GTK3


svn path=/trunk/; revision=43787
2012-07-18 17:38:19 +00:00
Gerald Combs 2643a5b02d Update qtshark to match the recent file dialog changes.
svn path=/trunk/; revision=43786
2012-07-18 16:40:34 +00:00
Gerald Combs e1bf3c011e Fill in our display filter after we open a file.
svn path=/trunk/; revision=43785
2012-07-18 15:29:13 +00:00
Balint Reczey 1f37a8cf14 Fix crash in PPP dissector
Make sure that there is enough space allocated for PPP encapsulated CRTP
packet's header.
The bug can be triggered on an x86_64 system using the cpature file attached to
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056

svn path=/trunk/; revision=43784
2012-07-18 15:14:45 +00:00
Pascal Quantin 2350d1aecf Put back r43768 that got removed by error in r43781
svn path=/trunk/; revision=43783
2012-07-18 08:37:46 +00:00
Anders Broman 0649041b1c Merge the rest of Jacob Nordgren and Rishie Sharmas work on
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43782
2012-07-18 07:47:05 +00:00
Anders Broman fccbea6702 Merge the rest of Jacob Nordgren and Rishie Sharmas work on
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43781
2012-07-18 07:45:19 +00:00
Guy Harris 9d470cceb9 Clean up indentation.
svn path=/trunk/; revision=43780
2012-07-18 04:45:41 +00:00
Evan Huus a234b68ff0 Fix some system header files that were #included with "" instead of <>.
They made cppcheck unhappy.

svn path=/trunk/; revision=43779
2012-07-18 02:47:56 +00:00
Evan Huus 6e8258be9a Add basic CppCheck configuration and runner.
Probably subject to change as it gets integrated into the build-bot.

svn path=/trunk/; revision=43778
2012-07-18 02:30:35 +00:00
Martin Mathieson c0a913afda Match R9 versions of some more LTE protocols to registered dissector names.
svn path=/trunk/; revision=43777
2012-07-18 01:19:48 +00:00
Guy Harris 3074044f77 Set the folder to the containing directory of the file name in question,
not to the file itself (the file itself will be a plain file, so that
will fail).

svn path=/trunk/; revision=43776
2012-07-17 21:44:41 +00:00
Pascal Quantin c0a5bc9aa8 Fix copy/paste error
svn path=/trunk/; revision=43775
2012-07-17 21:36:34 +00:00
Jörg Mayer c8579ac82c - Make dns srv elemnts filterable (were: text only)
- Don't suppress first character in srv service and protocol
  as some services don't use _ as first character

svn path=/trunk/; revision=43774
2012-07-17 21:10:02 +00:00
Jakub Zawadzki b4ec6ba914 Fix comments, from r43729 we don't load bold font.
svn path=/trunk/; revision=43773
2012-07-17 20:52:16 +00:00
Pascal Quantin 574f57d5ba From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7491 :
DNP3 protocol dissector does not fully decode application layer object 50 variation 3

svn path=/trunk/; revision=43772
2012-07-17 19:54:35 +00:00
Pascal Quantin e9de91f53e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7470 :
Add support for OID 1.3.6.1.5.2.2

svn path=/trunk/; revision=43771
2012-07-17 19:43:17 +00:00
Chris Maynard ae8d9d4461 Fix Coverity CID 709722: Logically dead code.
svn path=/trunk/; revision=43770
2012-07-17 19:43:08 +00:00
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