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

42167 commits

This branch
This branch
All branches
Author SHA1 Message Date
Irene Rüngeler
ff80e34de5 Fix bug when compiling several filters. 
svn path=/trunk/; revision=44301
 2012-08-07 14:38:27 +00:00
Anders Broman
52cb35b85a It should now compile with GDK_DISABLE_DEPRECATED 
svn path=/trunk/; revision=44300
 2012-08-07 13:58:23 +00:00
Jörg Mayer
bb57fa3ec2 Fix 
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/capture_dlg.c:209:19: error: ‘compile_bpf_w’ defined but not used [-Werror=unused-variable]


svn path=/trunk/; revision=44299
 2012-08-07 13:51:10 +00:00
Irene Rüngeler
02648076ee Add window with notebooks to display bpf compile results. 
svn path=/trunk/; revision=44298
 2012-08-07 13:25:42 +00:00
Jeff Morriss
fe7e9760fa Remove a set-but-not-used variable. 
svn path=/trunk/; revision=44297
 2012-08-07 13:18:01 +00:00
Anders Broman
7623b9bae7 From Rishie Sharma: 
compile error fix

svn path=/trunk/; revision=44296
 2012-08-07 11:49:06 +00:00
Anders Broman
1c20e4da84 error: variable ‘hsdsch_physical_layer_category’ set but not used 
svn path=/trunk/; revision=44295
 2012-08-07 10:54:24 +00:00
Irene Rüngeler
0d40bf21fc Make Windows buildbot happy. 
-This line, and those below, will be ignored--

M    ui/gtk/capture_dlg.c

svn path=/trunk/; revision=44294
 2012-08-07 10:30:30 +00:00
Irene Rüngeler
ed26851415 Make macos buildbot happy 
svn path=/trunk/; revision=44293
 2012-08-07 10:25:01 +00:00
Anders Broman
b2caee1d75 From Jacob Nordgren and Rishie Sharma: 
- umts_fp: fixed so CS content is not malformed content
- RLC: added channel tree so you can filter on rbid etc
- umts_fp,rlc,mac: added some hdsch-common code

svn path=/trunk/; revision=44292
 2012-08-07 09:44:16 +00:00
Jörg Mayer
1899edcb46 Fix for 
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/capture_dlg.c:4016:18: error: unused variable ‘all_compile_bt’ [-Werror=unused-variable]


svn path=/trunk/; revision=44291
 2012-08-07 09:15:22 +00:00
Irene Rüngeler
b092c105ed Add a filter for all selected interfaces to the capture options dialog. 
svn path=/trunk/; revision=44290
 2012-08-07 07:58:05 +00:00
Gerald Combs
68920ce95a Add a maximum span length check to XTP. Fixes a crash discovered by Ben 
Schmidt.

Just use proto_tree_add_item() instead of allocating a
big-ol-honkin'-block of guint64s and adding their values to the tree via
proto_tree_add_uint64().

Dissection *should* still work correctly but I can't find any XTP
captures for testing.

svn path=/trunk/; revision=44289
 2012-08-06 23:12:13 +00:00
Gerald Combs
5a47e80ffe Check for a too-short BSON document length. Fixes a DoS reported by Ben 
Schmidt in bug 7572.

Also check for a too-long BSON document length and too many nested BSON
documents.

svn path=/trunk/; revision=44288
 2012-08-06 22:04:09 +00:00
Jaap Keuter
3a14c113bc Fix for bug 7555: 
Add an expert item on the AD bit in a DNS query.
Also add some type values.

svn path=/trunk/; revision=44287
 2012-08-06 21:45:43 +00:00
Jörg Mayer
5bf74638a3 Set svn properties 
svn path=/trunk/; revision=44286
 2012-08-06 20:58:19 +00:00
Jörg Mayer
78be49a3d0 Add Id header (and the standard copyright headers) to some files. 
svn path=/trunk/; revision=44285
 2012-08-06 20:50:30 +00:00
Gerald Combs
704c2e0355 Apparently QPointFs draw on center. Offset them in order to avoid 
gratuitous antialiasing.

svn path=/trunk/; revision=44284
 2012-08-06 20:44:33 +00:00
Gerald Combs
a6d0c55a41 Don't call main_window_update() from capture_input_new_packets() 
on Windows. Otherwise we end up looping forever on a NULL event in
main_window_update().

svn path=/trunk/; revision=44283
 2012-08-06 18:24:21 +00:00
Alexis La Goutte
16821fe43c Fix Unknown test function: packagesExist when launch qmake QtShark.pro 
packagesExist is only present in Qt >= 4.8 ( https://bugreports.qt-project.org/browse/QTBUG-11418 )
Add packagesExist function if Qt < 4.8 ( from http://qt.gitorious.org/qt/qt/merge_requests/1022 )

svn path=/trunk/; revision=44282
 2012-08-06 16:17:16 +00:00
Anders Broman
056c44a13e Create (fake)interface information when loading a libpcap file it might be needed when wrinting the file if the format is converted to pcapng. 
Should we do this for other file formats as well?

A pcapng file with per packet encapsulation will need an IDB per encapsulation as the EPB does not have a linktype indicator only a interface index.

svn path=/trunk/; revision=44281
 2012-08-06 11:53:26 +00:00
Jörg Mayer
74a3a6e405 Don't call "Q_OBJECT" if there are no signals or slots defined. 
Fix cmake (and possibly autotools) build for:

lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'

This would not show up using qtcreator due to the magic of qmake.

I must admit that I don't fully understand what I am doing here, but
I read the following thread to the bottom and one of the last posts
contained the solution:
http://stackoverflow.com/questions/1095298/gcc-c-linker-errors-undefined-reference-to-vtable-for-xxx-undefined-refere


svn path=/trunk/; revision=44280
 2012-08-06 10:59:00 +00:00
Martin Mathieson
463917942d Add right mouse button grab/moving feature (from tcp_graph.c). 
svn path=/trunk/; revision=44276
 2012-08-05 14:20:23 +00:00
Gerald Combs
29771084e1 [Automatic manuf, services and enterprise-numbers update for 2012-08-05] 
svn path=/trunk/; revision=44275
 2012-08-05 14:03:35 +00:00
Martin Kaiser
7bef3391cf make mpeg_pmt a new-style dissector 
register it by name so that other protocols can call it more easily
highlight only the bytes that actually belong to the pmt

(the same changes as already applied to dvb-nit)


svn path=/trunk/; revision=44274
 2012-08-05 12:57:29 +00:00
Martin Mathieson
a0a35a9c49 Reset a flag when restore to original view, again to avoid leaving a 
cross on the screen.

svn path=/trunk/; revision=44273
 2012-08-05 01:04:41 +00:00
Martin Mathieson
a67e77adea Add cross-hairs here too. Draw lines, but don't change mouse cursor. 
svn path=/trunk/; revision=44272
 2012-08-05 01:03:33 +00:00
Martin Mathieson
eab4e35254 When the graph has been redrawn (after resize or move), set the 
redraw_needed flag to FALSE to avoid leaving crosses behind.

svn path=/trunk/; revision=44271
 2012-08-05 00:27:48 +00:00
Martin Mathieson
d89adc3f3b GTK3 still failing. Fix a typo. 
svn path=/trunk/; revision=44270
 2012-08-04 22:38:03 +00:00
Martin Mathieson
ebc7cf7d41 GTK 3 is broken. This time, pass in GtkWidget* to get_mouse_position(). 
svn path=/trunk/; revision=44269
 2012-08-04 22:07:54 +00:00
Martin Mathieson
e6c095048d Try to enable the line crosshairs again. 
This time, use a wrapper function get_mouse_position() that will call
the correct APIs whether GTK 3 or not.

svn path=/trunk/; revision=44268
 2012-08-04 20:53:56 +00:00
Chris Maynard
3a95aea153 Fix Coverity CID 714130: Dereference after null check. 
svn path=/trunk/; revision=44267
 2012-08-04 19:06:16 +00:00
Chris Maynard
6b733f55bc Plug a memory leak introduced with r44239. Resolves Coverity CID 714243: Unused pointer value. (Previous commit actually resolved Coverity CID 714242.) 
svn path=/trunk/; revision=44266
 2012-08-04 19:01:09 +00:00
Chris Maynard
230c57e6ec Plug a memory leak introduced with r44239. Resolves Coverity CID 714243: Unused pointer value. 
svn path=/trunk/; revision=44265
 2012-08-04 18:57:16 +00:00
Chris Maynard
c7b5c1eabb Add a fall-through comment to appease Coverity and resolve CID 714131: Missing break in switch. 
svn path=/trunk/; revision=44264
 2012-08-04 18:45:57 +00:00
Martin Mathieson
00c8b9f2ab Oops, seems that the cross-hair code uses the deprecated 
gdk_window_get_pointer().  Turn it off again for now...

svn path=/trunk/; revision=44263
 2012-08-04 18:37:34 +00:00
Martin Mathieson
8e4bd34d98 Add the cross-hairs back, can switch off again if doesn't work on all 
supported platforms / library versions.

svn path=/trunk/; revision=44262
 2012-08-04 17:51:34 +00:00
Martin Kaiser
02bb7124f9 dissect multiple nit sections in the CI+ operator_nit apdu 
fetch handles for dvb_nit and data dissectors only once

svn path=/trunk/; revision=44261
 2012-08-04 06:25:11 +00:00
Gerald Combs
6766420142 Take out a debugging statement. 
svn path=/trunk/; revision=44260
 2012-08-04 04:35:34 +00:00
Gerald Combs
215d89c890 Draw selected items properly. 
svn path=/trunk/; revision=44259
 2012-08-04 02:02:40 +00:00
Gerald Combs
1500f3bd42 Fix sparlines on Windows. Unfortunately this means listing device IDs 
(for now at least).

svn path=/trunk/; revision=44258
 2012-08-04 00:37:04 +00:00
Jörg Mayer
ed6e29eac6 Try to copy over the changes to QtShark.pro to automake and cmake. 
Note: It still fails with
Linking CXX executable qtshark
lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'
collect2: error: ld returned 1 exit status


svn path=/trunk/; revision=44257
 2012-08-04 00:31:31 +00:00
Gerald Combs
51e75f3bb3 Qt Creator put sparkline_delegate.{cpp,h} in their own special sections. 
Don't do that.

svn path=/trunk/; revision=44256
 2012-08-04 00:21:21 +00:00
Gerald Combs
450965360c Another capture_globals.h fix. 
svn path=/trunk/; revision=44255
 2012-08-04 00:10:27 +00:00
Gerald Combs
b82eedf94a Make sure global_capture_opts is properly declared. 
svn path=/trunk/; revision=44254
 2012-08-04 00:01:59 +00:00
Gerald Combs
a234d1215c Move capture_globals.h from ui/gtk/ to ui/. Show interface activity 
using sparklines in the qtshark main window.

svn path=/trunk/; revision=44253
 2012-08-03 23:30:47 +00:00
Jeff Morriss
0114eca349 Remove another set-but-not-used variable. 
svn path=/trunk/; revision=44252
 2012-08-03 22:04:09 +00:00
Jeff Morriss
76150c9a20 Fix a typo. 
svn path=/trunk/; revision=44251
 2012-08-03 18:11:26 +00:00
Jeff Morriss
78c4677cfb (Attempt to) avoid using capture_page uninitialized when we don't HAVE_LIBPCAP. 
svn path=/trunk/; revision=44250
 2012-08-03 17:41:06 +00:00
Jeff Morriss
91b3e8e24a Remove set-but-unused variable. 
svn path=/trunk/; revision=44249
 2012-08-03 17:33:01 +00:00