Gerald Combs
7e30804155
Automake's "dummy.cpp" trick is all-or-nothing. Instead of forcing
...
everyone to use a c++ compiler conditionally link with -lstdc++
and hope for the best.
svn path=/trunk/; revision=46879
2012-12-31 22:57:44 +00:00
Gerald Combs
4ecf61b0df
If we're linking with Qt pass a hint to automake that it needs to use c++
...
linking.
svn path=/trunk/; revision=46878
2012-12-31 21:29:47 +00:00
Michael Mann
37d19a1202
Add heuristic for USB MassStorage dissector to be dissected by USB. Bug 8131 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8131 )
...
svn path=/trunk/; revision=46877
2012-12-31 20:12:45 +00:00
Gerald Combs
b03e7cec00
Make sure moc can find config.h.
...
svn path=/trunk/; revision=46876
2012-12-31 19:15:33 +00:00
Gerald Combs
b6382033e1
It might help for the Qt version of Wireshark to link against the Qt
...
libraries and to have a main() function. Replace some manual Makefile
rules with an implicit rule.
svn path=/trunk/; revision=46875
2012-12-31 19:07:38 +00:00
Alexis La Goutte
c2a63d4c36
Update Makefile to add packet_comment_dialog files
...
svn path=/trunk/; revision=46874
2012-12-31 15:08:45 +00:00
Alexis La Goutte
8aae1e58bf
Add new images to Makefile.am
...
svn path=/trunk/; revision=46873
2012-12-31 15:08:36 +00:00
Alexis La Goutte
40a9c3a6bc
TS Files is also XML Files
...
svn path=/trunk/; revision=46872
2012-12-31 14:10:07 +00:00
Pascal Quantin
58575f394f
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148 :
...
Fix dissection of HomePlug AV 1.1 frames with fragmentation information
From me: indentation fixes
svn path=/trunk/; revision=46871
2012-12-31 13:39:04 +00:00
Pascal Quantin
f7d2f14799
Add reordercap and text2pcap -D option to User Guide
...
svn path=/trunk/; revision=46870
2012-12-31 13:31:53 +00:00
Gerald Combs
7256f90069
Make sure we link Wireshark with the right UI library.
...
svn path=/trunk/; revision=46869
2012-12-31 06:09:19 +00:00
Gerald Combs
1a5ac2e68d
Add a .cpp target for each ui_*.h prerequisite.
...
svn path=/trunk/; revision=46868
2012-12-31 05:22:47 +00:00
Gerald Combs
6c68031d7e
Keep PKG_CHECK_MODULES from returning an error if it doesn't find
...
QtWidgets or QtPrintSupport.
svn path=/trunk/; revision=46867
2012-12-31 04:56:11 +00:00
Guy Harris
d67586ccc4
Fix description of -p input - show the packet data the same way it's
...
shown for the previous input format (showing "data" as a pointer is a
bit confusing, as it's just in-line data in the input), and give a more
detailed description of the issues with that file format (the size of
the seconds field of the time stamp is platform-dependent).
svn path=/trunk/; revision=46864
2012-12-30 20:39:45 +00:00
Gerald Combs
4ca47864db
Move profile deletion code from profile_dlg.c to profile.c. Add left
...
mouse and context (right mouse) signals to label stacks and use them to
pop up profile menus in the status bar. Add profile actions (manage,
new, edit, delete) to the profile dialog.
svn path=/trunk/; revision=46863
2012-12-30 19:33:05 +00:00
Gerald Combs
af2b925604
[Automatic manuf, services and enterprise-numbers update for 2012-12-30]
...
svn path=/trunk/; revision=46860
2012-12-30 15:03:22 +00:00
Bill Meier
114a40ae09
'-Wno-error=unused-but-set-variable' no longer required;
...
svn path=/trunk/; revision=46859
2012-12-30 14:34:29 +00:00
Anders Broman
54cb9e70ab
Use tvb_bcd_dig_to_ep_str
...
svn path=/trunk/; revision=46858
2012-12-30 11:10:35 +00:00
Anders Broman
be1ff84f48
From Katrina Zhang:Pretify dissection if a dissector exists for the private extension
...
svn path=/trunk/; revision=46857
2012-12-30 09:35:27 +00:00
Jeff Morriss
3ad2d4961d
Treat *.ui files as *.xml: also set svn:keywords property.
...
svn path=/trunk/; revision=46856
2012-12-30 04:16:44 +00:00
Bill Meier
8b7f8d4c08
Move 3 ASN1 dissectors to 'clean' group; move 1 PIDL dissector to 'dirty' group.
...
svn path=/trunk/; revision=46855
2012-12-30 00:53:47 +00:00
Guy Harris
e0b3a943f7
Move the PIE checks after the warning checks, to keep the warning checks
...
together, and add a comment explaining what's being done.
svn path=/trunk/; revision=46854
2012-12-29 22:50:48 +00:00
Guy Harris
592a0fcf04
OK, try including <net/if.h> iff IFF_UP isn't already defined; see if
...
that includes it if we need it, but doesn't include it if we don't,
regardless of what versions (plural!) of libnetlink are present.
svn path=/trunk/; revision=46853
2012-12-29 22:25:46 +00:00
Guy Harris
8be92d6af2
Give some more details, as per the Web page cited as a reference.
...
svn path=/trunk/; revision=46852
2012-12-29 21:59:27 +00:00
Guy Harris
b2f58e4e4d
Oops, one instance of "airopeekv9" that wasn't supposed to have been
...
changed was changed.
svn path=/trunk/; revision=46851
2012-12-29 21:46:59 +00:00
Evan Huus
8331c0e495
Add a cast to pacify MSVC.
...
svn path=/trunk/; revision=46850
2012-12-29 21:34:57 +00:00
Bill Meier
7dfa337910
Add a few consts to fix some compiler (GCC) errors.
...
svn path=/trunk/; revision=46849
2012-12-29 20:56:11 +00:00
Bill Meier
1a97d3395a
Cosmetic: Add two blank lines for readability.
...
svn path=/trunk/; revision=46848
2012-12-29 20:53:44 +00:00
Evan Huus
a19980c23d
Replace another instance of emem in README.developer with wmem.
...
svn path=/trunk/; revision=46847
2012-12-29 20:41:12 +00:00
Evan Huus
563d64862a
Implement wmem_strbuf_append_printf.
...
svn path=/trunk/; revision=46846
2012-12-29 20:37:53 +00:00
Bill Meier
22447e47e7
Add a vertical scrollbar to the summary dialog window.
...
(The window has gotten pretty tall;
Creating a multiline 'Capture File Comments'" entry
may make the buttons inaccessible w/o a scrollbar).
##backport 1.8
svn path=/trunk/; revision=46844
2012-12-29 19:07:48 +00:00
Evan Huus
45a77360ea
Rename tcp.data -> tcp.segment_data and add a description field.
...
Should clear up the confusion from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8084
svn path=/trunk/; revision=46843
2012-12-29 18:08:11 +00:00
Pascal Quantin
0b20f855f0
Upgrade NAS disssectors to v11.5.0
...
svn path=/trunk/; revision=46842
2012-12-29 17:10:04 +00:00
Gerald Combs
f3e41f1b72
Show the current profile name. Fix the packet status.
...
svn path=/trunk/; revision=46839
2012-12-29 03:56:29 +00:00
Gerald Combs
07571afb77
Fix distcheck.
...
svn path=/trunk/; revision=46838
2012-12-29 03:31:49 +00:00
Gerald Combs
cce0d8451c
Add profile_dialog.
...
svn path=/trunk/; revision=46837
2012-12-29 02:58:56 +00:00
Gerald Combs
94d8ae945b
Try to fix compilation on Windows.
...
svn path=/trunk/; revision=46836
2012-12-29 02:55:16 +00:00
Gerald Combs
a562691080
Profile switching works when we have a capture file open so go ahead and
...
enable it.
svn path=/trunk/; revision=46835
2012-12-29 01:42:01 +00:00
Gerald Combs
5bd252c44f
Remove some duplicate code from ui/profile.c and move in more code from
...
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.
Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.
svn path=/trunk/; revision=46834
2012-12-29 01:39:02 +00:00
Bill Meier
c7dd6480e4
Minor fix when building with VS2012 (VC11):
...
Prevents warning:
cl : Command line warning D9002 : ignoring unknown option '/Zd'
svn path=/trunk/; revision=46832
2012-12-28 22:13:05 +00:00
Bill Meier
e3b03c9c25
Remove redundant SUBSYSTEM link option from link commands.
...
[ $(guiflags) or $(conflags) specified as part of the link options
includes the SUBSYSTEM option ].
svn path=/trunk/; revision=46831
2012-12-28 21:21:34 +00:00
Bill Meier
b6bd189390
Fixes & comments for building Wireshark with VS2012 (VC11)
...
1. Define 'APPVER' appropriately;
Prevents warning message:
LINK : warning LNK4010: invalid subsystem version number 5.0; default subsystem version assumed.
2. Add comment (& ToDo) re using VS2012 to build .exe which will also run on WIndows XP.
svn path=/trunk/; revision=46830
2012-12-28 21:18:19 +00:00
Evan Huus
5eacf33f1f
Update wmem documentation for the new allocator.
...
Use the strict allocator when fuzzing (at least until the fuzz-bot starts
running everything under valgrind).
svn path=/trunk/; revision=46829
2012-12-28 17:09:07 +00:00
Evan Huus
0c66691b92
Add a strict allocator that does canaries and various other things, for
...
platforms which don't have Valgrind.
Valgrind is still the better choice on platforms which support it.
svn path=/trunk/; revision=46828
2012-12-28 17:04:23 +00:00
Alexis La Goutte
5588d07faa
Add missing new dissectors to CMake
...
* Media Independent handover (MIH) (Add in Revison 46802)
* RTCWeb Data Channel Protocol (Add in Revision 46809)
svn path=/trunk/; revision=46827
2012-12-28 14:38:27 +00:00
Alexis La Goutte
fee2b8b2b9
Tab => Spaces
...
svn path=/trunk/; revision=46826
2012-12-28 14:38:19 +00:00
Alexis La Goutte
bbe198de5e
Fix [ 77%] Building C object CMakeFiles/qtshark.dir/iface_monitor.c.o iface_monitor.c: In function ‘iface_mon_handler2’: iface_monitor.c:101:19: error: ‘IFF_UP’ undeclared (first use in this function) iface_monitor.c:101:19: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [CMakeFiles/qtshark.dir/iface_monitor.c.o] Erreur 1
...
svn path=/trunk/; revision=46825
2012-12-28 14:38:10 +00:00
Alexis La Goutte
cdc79cd5e9
Fix [ 76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:194:20: error: variable ‘fl_entry’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
...
svn path=/trunk/; revision=46824
2012-12-28 14:38:02 +00:00
Alexis La Goutte
c4650d85c6
Fix [76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:195:20: error: variable ‘profile’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
...
svn path=/trunk/; revision=46823
2012-12-28 14:37:53 +00:00
Guy Harris
c6ede6cf55
Use the "if (file_gets(...) == NULL) { fail }" style, as used elsewhere.
...
svn path=/trunk/; revision=46822
2012-12-28 09:10:59 +00:00