aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-01-02Try a simpler and hopefully more reliable method of linking.Gerald Combs1-14/+4
svn path=/trunk/; revision=46890
2013-01-02Fix "file.h:56:21: warning: comma at end of enumerator list".Gerald Combs1-1/+1
svn path=/trunk/; revision=46889
2013-01-02Make sure we don't try to distribute nonexistent files.Gerald Combs1-1/+5
svn path=/trunk/; revision=46888
2013-01-01Play Three-card^WTwo-link-target Monte with Autotools.Gerald Combs2-8/+18
svn path=/trunk/; revision=46887
2013-01-01Use scrolled-windows to enclose "custom" prefs pages (User Interface, ↵Bill Meier1-2/+11
Layout, etc) in the same manner as to "protocol prefs" pages. This ensures that the bottom row buttons won't disappear off the bottom of the prefs window if one (or more) of the custom prefs pages is too large to fit vertically within the available screen space. In Wireshark 1.8, more items were added to the "User Interface" prefs page thus leading to an increased possibility of this issue occurring. I believe this fixes Bug #8078. #Backport Wireshark 1.8 svn path=/trunk/; revision=46885
2013-01-01Welcome in 2013Pascal Quantin1-1/+1
svn path=/trunk/; revision=46882
2013-01-01Add detection of Windows 8 and Windows Server 2012Pascal Quantin1-0/+3
svn path=/trunk/; revision=46881
2012-12-31Automake's "dummy.cpp" trick is all-or-nothing. Instead of forcingGerald Combs1-1/+5
everyone to use a c++ compiler conditionally link with -lstdc++ and hope for the best. svn path=/trunk/; revision=46879
2012-12-31If we're linking with Qt pass a hint to automake that it needs to use c++Gerald Combs2-1/+9
linking. svn path=/trunk/; revision=46878
2012-12-31Add heuristic for USB MassStorage dissector to be dissected by USB. Bug ↵Michael Mann1-0/+19
8131 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8131) svn path=/trunk/; revision=46877
2012-12-31Make sure moc can find config.h.Gerald Combs1-1/+1
svn path=/trunk/; revision=46876
2012-12-31It might help for the Qt version of Wireshark to link against the QtGerald Combs3-31/+37
libraries and to have a main() function. Replace some manual Makefile rules with an implicit rule. svn path=/trunk/; revision=46875
2012-12-31Update Makefile to add packet_comment_dialog filesAlexis La Goutte2-0/+3
svn path=/trunk/; revision=46874
2012-12-31Add new images to Makefile.amAlexis La Goutte1-0/+3
svn path=/trunk/; revision=46873
2012-12-31TS Files is also XML FilesAlexis La Goutte1-1/+1
svn path=/trunk/; revision=46872
2012-12-31From Florian Fainelli via ↵Pascal Quantin1-310/+322
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-31Add reordercap and text2pcap -D option to User GuidePascal Quantin1-8/+31
svn path=/trunk/; revision=46870
2012-12-31Make sure we link Wireshark with the right UI library.Gerald Combs2-1/+5
svn path=/trunk/; revision=46869
2012-12-31Add a .cpp target for each ui_*.h prerequisite.Gerald Combs1-13/+13
svn path=/trunk/; revision=46868
2012-12-31Keep PKG_CHECK_MODULES from returning an error if it doesn't findGerald Combs1-2/+2
QtWidgets or QtPrintSupport. svn path=/trunk/; revision=46867
2012-12-30Fix description of -p input - show the packet data the same way it'sGuy Harris1-4/+10
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-30Move profile deletion code from profile_dlg.c to profile.c. Add leftGerald Combs11-44/+216
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[Automatic manuf, services and enterprise-numbers update for 2012-12-30]Gerald Combs2-1/+35
svn path=/trunk/; revision=46860
2012-12-30'-Wno-error=unused-but-set-variable' no longer required;Bill Meier1-1/+1
svn path=/trunk/; revision=46859
2012-12-30Use tvb_bcd_dig_to_ep_strAnders Broman1-27/+15
svn path=/trunk/; revision=46858
2012-12-30From Katrina Zhang:Pretify dissection if a dissector exists for the private ↵Anders Broman1-6/+3
extension svn path=/trunk/; revision=46857
2012-12-30Treat *.ui files as *.xml: also set svn:keywords property.Jeff Morriss1-5/+1
svn path=/trunk/; revision=46856
2012-12-30Move 3 ASN1 dissectors to 'clean' group; move 1 PIDL dissector to 'dirty' group.Bill Meier1-4/+4
svn path=/trunk/; revision=46855
2012-12-29Move the PIE checks after the warning checks, to keep the warning checksGuy Harris1-23/+29
together, and add a comment explaining what's being done. svn path=/trunk/; revision=46854
2012-12-29OK, try including <net/if.h> iff IFF_UP isn't already defined; see ifGuy Harris1-4/+11
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-29Give some more details, as per the Web page cited as a reference.Guy Harris1-4/+27
svn path=/trunk/; revision=46852
2012-12-29Oops, one instance of "airopeekv9" that wasn't supposed to have beenGuy Harris1-1/+1
changed was changed. svn path=/trunk/; revision=46851
2012-12-29Add a cast to pacify MSVC.Evan Huus1-1/+2
svn path=/trunk/; revision=46850
2012-12-29Add a few consts to fix some compiler (GCC) errors.Bill Meier5-6/+7
svn path=/trunk/; revision=46849
2012-12-29Cosmetic: Add two blank lines for readability.Bill Meier1-0/+2
svn path=/trunk/; revision=46848
2012-12-29Replace another instance of emem in README.developer with wmem.Evan Huus2-3/+4
svn path=/trunk/; revision=46847
2012-12-29Implement wmem_strbuf_append_printf.Evan Huus2-7/+39
svn path=/trunk/; revision=46846
2012-12-29Add a vertical scrollbar to the summary dialog window.Bill Meier1-2/+8
(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-29Rename tcp.data -> tcp.segment_data and add a description field.Evan Huus1-7/+7
Should clear up the confusion from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8084 svn path=/trunk/; revision=46843
2012-12-29Upgrade NAS disssectors to v11.5.0Pascal Quantin4-40/+45
svn path=/trunk/; revision=46842
2012-12-29Show the current profile name. Fix the packet status.Gerald Combs3-5/+16
svn path=/trunk/; revision=46839
2012-12-29Fix distcheck.Gerald Combs1-0/+1
svn path=/trunk/; revision=46838
2012-12-29Add profile_dialog.Gerald Combs3-0/+11
svn path=/trunk/; revision=46837
2012-12-29Try to fix compilation on Windows.Gerald Combs1-0/+4
svn path=/trunk/; revision=46836
2012-12-29Profile switching works when we have a capture file open so go ahead andGerald Combs1-12/+12
enable it. svn path=/trunk/; revision=46835
2012-12-29Remove some duplicate code from ui/profile.c and move in more code fromGerald Combs20-284/+995
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-28Minor fix when building with VS2012 (VC11):Bill Meier1-1/+3
Prevents warning: cl : Command line warning D9002 : ignoring unknown option '/Zd' svn path=/trunk/; revision=46832
2012-12-28Remove redundant SUBSYSTEM link option from link commands.Bill Meier1-11/+14
[ $(guiflags) or $(conflags) specified as part of the link options includes the SUBSYSTEM option ]. svn path=/trunk/; revision=46831
2012-12-28Fixes & comments for building Wireshark with VS2012 (VC11)Bill Meier1-4/+21
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-28Update wmem documentation for the new allocator.Evan Huus2-1/+6
Use the strict allocator when fuzzing (at least until the fuzz-bot starts running everything under valgrind). svn path=/trunk/; revision=46829