osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
44599 commits 26 branches 0 tags 795 MiB
Commit graph

44599 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pascal Quantin
e7d64a962f From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8215 : 
Several ERF types are incorrectly calling downstream dissectors under the erf_tree instead of under the top level tree

svn path=/trunk/; revision=47122
 2013-01-16 21:47:28 +00:00
Bill Meier
128f123d7f Use gdk_cairo_set_source_rgba() and GdkRGBA. 
svn path=/trunk/; revision=47121
 2013-01-16 21:07:52 +00:00
Evan Huus
72a00dc259 Add a cast to shut up MSVC. 
svn path=/trunk/; revision=47120
 2013-01-16 18:33:34 +00:00
Evan Huus
3a64f93a00 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8185 
Support for Underwater Acoustic PDUs in packet-dis.c

svn path=/trunk/; revision=47119
 2013-01-16 17:27:03 +00:00
Bill Meier
aed95072b4 Replace gtk_table...() with ws_gtk_grid...(); 
Also; do some whitespace cleanuyp.

svn path=/trunk/; revision=47118
 2013-01-16 17:09:22 +00:00
Bill Meier
185f323231 Replace gtk_table...() with ws_gtk_grid...(); 
Use gtk_box_pack_start() instead of
 gtk_container_add() in a few places so that
 window resize behavior is the same for
 Gtk2 and Gtk3.

Also: do some whitespace cleanup.

svn path=/trunk/; revision=47117
 2013-01-16 16:52:32 +00:00
Bill Meier
03101e015e (Trivial) whitespace cleanup; 
svn path=/trunk/; revision=47116
 2013-01-16 16:24:32 +00:00
Bill Meier
8d385b0b75 Fix a Gtk2 vs Gtk3 issue; 
Specifically: use gtk_box_pack_start()
 instead of gtk_container_add() in one case
 so that (for Gtk3) a window component properly
  expands when the window is resized vertically.

svn path=/trunk/; revision=47115
 2013-01-16 16:19:05 +00:00
Evan Huus
e49285b9e4 Null the finfo pointer after we free it. Reduces (but does not completely fix) 
the errors from bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197

svn path=/trunk/; revision=47114
 2013-01-16 14:14:05 +00:00
Evan Huus
d8967afa61 Add -v for verbose valgrind output. 
svn path=/trunk/; revision=47113
 2013-01-16 14:02:30 +00:00
Michael Mann
52699bd342 Bugfix version number in EtherIP dissector + general cleanup. Bug 8211 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8211) 
#BACKPORT

svn path=/trunk/; revision=47112
 2013-01-16 13:27:23 +00:00
Guy Harris
e787c3434e Get rid of C++ comments from the CUPS code. 
svn path=/trunk/; revision=47111
 2013-01-16 03:56:36 +00:00
Jeff Morriss
99ce4232cb As suggested in comments in sl_alloc() and sl_free(): add a new environment 
variable (WIRESHARK_DEBUG_USE_SLICES) which turns off the slab allocator and uses
g_slices instead (which can themselves be turned off by setting
G_SLICE=always-malloc).

This makes debugging problems in slab-allocated memory easier to find
(hopefully including https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197 ).


Set WIRESHARK_DEBUG_USE_SLICES when running Valgrind on *shark.


Remove unused structure member: emem_chunk_t.org.

svn path=/trunk/; revision=47110
 2013-01-16 03:34:29 +00:00
Guy Harris
09a4761179 Add some routines to wsutil to, at least on some platforms, add 
information to crash dumps and the like.  (Currently, we only handle OS
X's CrashReporter, but we should do this on other platforms where this
information can be added and would be helpful.)

svn path=/trunk/; revision=47109
 2013-01-16 00:13:33 +00:00
Guy Harris
a694ccd013 Set the crash info as early as possible in main(), so that it shows up 
in crashes that happen early in the process.

Clean up white space.

svn path=/trunk/; revision=47108
 2013-01-16 00:12:27 +00:00
Guy Harris
9936b9764a Add crash_info.c 
svn path=/trunk/; revision=47107
 2013-01-15 23:37:47 +00:00
Guy Harris
111f8ea2bb Use GLib "return an allocated string generated by printf-style 
formatting" routines and the corresponding deallocate routines.

svn path=/trunk/; revision=47106
 2013-01-15 23:36:48 +00:00
Guy Harris
92b524bb1c I must haz config.h (to define _U_, if nothing else). 
svn path=/trunk/; revision=47105
 2013-01-15 22:22:44 +00:00
Guy Harris
05825b02cd Add some routines to wsutil to, at least on some platforms, add 
information to crash dumps and the like.  (Currently, we only handle OS
X's CrashReporter, but we should do this on other platforms where this
information can be added and would be helpful.)

White space tweaks.

svn path=/trunk/; revision=47104
 2013-01-15 21:54:41 +00:00
Bill Meier
f4e862fb1a Cleanup: 
- "localize" some variables; remove some unneeded initializers;
- indentation, whitespace, long lines & etc.

svn path=/trunk/; revision=47103
 2013-01-15 21:52:23 +00:00
Bill Meier
026c798c98 Fix several window resize behavior differences between Gtk2 & Gtk3. 
Specifically: replace several gtk_container_add() calls by
              gtk_box_pack_start() calls.

svn path=/trunk/; revision=47102
 2013-01-15 21:09:12 +00:00
Evan Huus
d0b774d0ea Minor documentation tweaks. Add a hash table to the wishlist. 
svn path=/trunk/; revision=47101
 2013-01-15 18:29:27 +00:00
Bill Meier
786d870f1f Cleanup: 
- localize some vars; remove some unneeded initializers;
- indentation & white space & etc.

svn path=/trunk/; revision=47100
 2013-01-15 17:54:47 +00:00
Bill Meier
e0b350aafb Fix Gtk2 vs Gtk3 issue: 
Set a default size for the window so that the
initial size of the window in Gtk3 is similar to
that in Gtk2. That is: so that all the columns
(and a number of rows) show.

svn path=/trunk/; revision=47099
 2013-01-15 17:10:32 +00:00
Evan Huus
b1ac6585bc Don't run past the end of a fragment array, either in the loop or by putting a 
useless sentinel in.

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

svn path=/trunk/; revision=47098
 2013-01-15 16:51:55 +00:00
Jeff Morriss
1a93ee3345 Based on http://ask.wireshark.org/questions/17661/tcap-decoding-bug : 
Register the Camel dissector for SSN 146 instead of (GSM MAP's) SSN 6-9.
Looks like the 6-9 list was a carryover from when this dissector was created
based on the GSM MAP dissector.

svn path=/trunk/; revision=47097
 2013-01-15 16:44:02 +00:00
Martin Kaiser
e00af44a36 extend the iso7816 dissector 
link request apdus to response apdus
dissect parameters p1 and p2 for some messages

svn path=/trunk/; revision=47096
 2013-01-15 16:41:03 +00:00
Evan Huus
5a74d61822 Add modelines. 
svn path=/trunk/; revision=47095
 2013-01-15 16:37:29 +00:00
Evan Huus
e963cec25c Add missing header #include as the slab is part of the API even if nobody 
outside wmem itself uses it yet.

svn path=/trunk/; revision=47094
 2013-01-15 16:27:17 +00:00
Evan Huus
b0a0372cff Use the block allocator for wmem's file-scope by default. 
svn path=/trunk/; revision=47093
 2013-01-15 16:25:24 +00:00
Bill Meier
3adfacfea6 Cleanup: indentation, whitespace, long-lines, formatting & etc. 
svn path=/trunk/; revision=47092
 2013-01-15 15:16:53 +00:00
Jeff Morriss
5e543a3e28 From Hadriel Kaplan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 : 
AM_CONFIG_HEADER() is obsolete (and removed from automake 1.13 and later); use
AC_CONFIG_HEADERS instead.

svn path=/trunk/; revision=47091
 2013-01-15 14:07:53 +00:00
Jeff Morriss
2233b34cf1 Add boilerplate GPLv2+ license as per email response from Scott Renfro: 
https://www.wireshark.org/lists/wireshark-dev/201301/msg00062.html

svn path=/trunk/; revision=47088
 2013-01-15 02:17:16 +00:00
Bill Meier
ef4749d4e2 Minor cleanup: 
- remove severl gtk_box_set_child_packing() statements which "do nothing";
 - replace several gtk_container_add()/gtk_box_set_child_packing() sequences
    by gtk_box_pack_start().

svn path=/trunk/; revision=47087
 2013-01-15 01:42:09 +00:00
Bill Meier
8c2127b946 Replace gtk_table...() with ws_gtk_grid...() 
(with some finagling so that the layout is about the same
for both Gtk2 & Gtk3).

svn path=/trunk/; revision=47086
 2013-01-14 23:54:08 +00:00
Gerald Combs
b0ef1a67ed strcmp → g_strcmp0. Fixes a crash on Windows. 
svn path=/trunk/; revision=47085
 2013-01-14 23:23:50 +00:00
Evan Huus
e4f46ce55f Take a wild guess at what might be causing 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197

It can't hurt, in any case.

svn path=/trunk/; revision=47084
 2013-01-14 22:29:23 +00:00
Gerald Combs
b82f42d8cf When the user is editing text or selecting from a combo box, don't 
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.

Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.

svn path=/trunk/; revision=47083
 2013-01-14 22:21:11 +00:00
Jaap Keuter
21f9ab573d Add missing files to package. 
Allow more recent automake.

svn path=/trunk/; revision=47082
 2013-01-14 21:39:10 +00:00
Gerald Combs
aafa77c6f4 Try to show what condition triggered a failure. 
svn path=/trunk/; revision=47079
 2013-01-14 20:17:20 +00:00
Gerald Combs
6be760c512 Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior. 
svn path=/trunk/; revision=47078
 2013-01-14 20:05:24 +00:00
Chris Maynard
ad78db491a Fix Coverity CID 732304: Missing break in switch. 
svn path=/trunk/; revision=47077
 2013-01-14 19:23:26 +00:00
Chris Maynard
f2dd9bc0d2 Avoid any possibility of an infinte loop. Fixes Coverity CID 739883: Infinite loop. (Minor whitespace cleanup also.) 
svn path=/trunk/; revision=47076
 2013-01-14 19:14:51 +00:00
Chris Maynard
afdc2a9a12 Fix Coverity CID 741081: Logically dead code. (Minor whitespace cleanup also.) 
svn path=/trunk/; revision=47075
 2013-01-14 19:00:44 +00:00
Chris Maynard
c6c41ee09b Fix Coverity CID 741991: Wrong sizeof argument. 
svn path=/trunk/; revision=47074
 2013-01-14 18:41:25 +00:00
Chris Maynard
b3bc6cf28f Fix Coverity CID 741992: Unused pointer value. 
svn path=/trunk/; revision=47073
 2013-01-14 18:31:04 +00:00
Gerald Combs
57c3d011b3 Make sure we have epan/wmem/*.h. 
svn path=/trunk/; revision=47072
 2013-01-14 18:29:50 +00:00
Pascal Quantin
1891adc28e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8208 : 
Display ECI and LAC in decimal and fix highlighting of CGI, SAI, RAI, TAI, ECGI and LAI fields

svn path=/trunk/; revision=47071
 2013-01-14 18:29:27 +00:00
Chris Maynard
fc9663740e Use SET_ADDRESS() to initialize src and dst as both src.hf and dst.hf were uninitialized. Fixes Coverity CID's 752013-752014: Uninitialized scalar variable. 
svn path=/trunk/; revision=47070
 2013-01-14 16:55:07 +00:00
Chris Maynard
de91f3638b Declare count as ssize_t instead of size_t, since read(), and thus ws_read(), can return a negative number. If that were to happen, then assigning the return value to an unsigned variable and then comparing that variable against 0 will yield incorrect/unintended results. Fixes Coverity CID 761910: Negative array index write. 
svn path=/trunk/; revision=47069
 2013-01-14 16:34:19 +00:00