aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss13-49/+49
svn path=/trunk/; revision=50656
2013-07-16This should fix warning: to be safe all intermediate pointers in cast from ↵Chris Maynard2-35/+35
'gchar **' to 'const char **' must be 'const' qualified. svn path=/trunk/; revision=50655
2013-07-16Move u3.{h,c} and g711.{h,c} into wsutil.Jeff Morriss14-39/+53
Project g711.h against multiple inclusion and add C++ compatibility wrapper. svn path=/trunk/; revision=50654
2013-07-16Fix warning: ISO C90 forbids specifying subobject to initialize.Chris Maynard1-6/+7
svn path=/trunk/; revision=50653
2013-07-16Replace glib memory with wmem. Fixes a substantial memory leak in the TCPEvan Huus1-2/+3
dissector (potentially several megabytes for a large capture). Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8459 svn path=/trunk/; revision=50652
2013-07-16Bail in the profinet heuristics if we don't have source and destination macEvan Huus1-1/+7
addresses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8904 svn path=/trunk/; revision=50651
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss10-11/+8
there and moving it avoids having to recompile the file for use in editcap and mergecap (which don't link against libwireshark). svn path=/trunk/; revision=50650
2013-07-16A better method of avoiding the "ISO C restricts enumerator values to range ↵Chris Maynard1-1/+3
of 'int'" warning. svn path=/trunk/; revision=50649
2013-07-16Explain that we don't have to worry about fixed-length buffers whoseGuy Harris1-1/+6
size is based on the snapshot length. svn path=/trunk/; revision=50647
2013-07-15On the suggestion of Cal Turney, viaEvan Huus1-0/+6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8937 Don't warn if a file has packets larger than the global snapshot length. svn path=/trunk/; revision=50646
2013-07-15Use PIE_CFLAGS when building qt-shark, since otherwise I get errors like:Evan Huus1-1/+1
/usr/include/qt5/QtCore/qglobal.h:1079:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE." There is almost certainly a better way to do this: I'm cheating here because I don't know enough about autofoo, and it seems to work. I suspect we should be checking PIE for the C++ compiler separately (since presumably they're not guaranteed to be related like gcc/g++ are). I also suspect we should only be building with it in the first place if Qt really needs it, though I have no idea how to check that. The qt docs I've found suggest that qt5's cmake module has a flag for it, but autofoo is never mentioned... svn path=/trunk/; revision=50645
2013-07-15Revert r50150. I suspect the problem was Ubuntu's transition to qt5 as default,Evan Huus1-4/+4
since now the defaults work as they should. svn path=/trunk/; revision=50644
2013-07-15Don't compare a guint32 against -1, compare it against 0xFFFFFFFFU.Guy Harris1-1/+1
svn path=/trunk/; revision=50643
2013-07-15Get rid of "win-setup.sh: line 24: $'\r': command not found" warningPascal Quantin1-1/+0
svn path=/trunk/; revision=50642
2013-07-15Fix warning: ISO C restricts enumerator values to range of 'int'Chris Maynard5-10/+10
svn path=/trunk/; revision=50641
2013-07-15Fix warnings: comma at end of enumerator list.Chris Maynard12-36/+36
svn path=/trunk/; revision=50640
2013-07-15Fix warnings: format '%blah' expects argument of type 'foo', but argument ↵Chris Maynard4-12/+14
'i' has type 'bar' [-Wformat]. svn path=/trunk/; revision=50639
2013-07-15Fix warning: ISO C does not allow extra ';' outside of a function.Chris Maynard5-31/+31
svn path=/trunk/; revision=50638
2013-07-15Fix warning: ISO C does not support %n$ operand number formats.Chris Maynard1-1/+1
svn path=/trunk/; revision=50637
2013-07-15Set the menuRole for actionCaptureOptions to NoRole similar toGerald Combs4-9/+20
actionEditConfigurationProfiles. This keeps it from being converted to the default preferences item on OS X. Remove a hack where we stored the text for actionEditConfigurationProfiles in its iconText in order to keep it from clobbering actionEditPreferences. It doesn't seem to be necessary. svn path=/trunk/; revision=50636
2013-07-15Expand the big comment about launching browsers.Guy Harris1-0/+39
svn path=/trunk/; revision=50635
2013-07-15Fix bug #8934: Fuzz failure: seg-fault in tvb_new_proxy()Jakub Zawadzki1-1/+6
It is possible to have NULL reassembly data, support this case in tvb_new_proxy(). svn path=/trunk/; revision=50634
2013-07-15Fix bug #8936: Fuzz failure: attempt to allocate -1 bytes from ↵Jakub Zawadzki1-4/+33
packet-bacapp.c and/or tvb_generic_clone_offset_len() Revert r50556: Add new function: validate_offset() which checks if offset is within bounds of tvb. svn path=/trunk/; revision=50633
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+1
svn path=/trunk/; revision=50632
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
svn path=/trunk/; revision=50631
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-8/+8
svn path=/trunk/; revision=50630
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+2
svn path=/trunk/; revision=50629
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-9/+9
svn path=/trunk/; revision=50628
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=50627
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
svn path=/trunk/; revision=50626
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-6/+6
svn path=/trunk/; revision=50625
2013-07-15Use 2 Spaces indent and add modelines infoAlexis La Goutte1-50/+61
svn path=/trunk/; revision=50624
2013-07-15Fix warnings found by fix-encoding-args tools.(and remove some tabs also)Alexis La Goutte1-32/+32
svn path=/trunk/; revision=50623
2013-07-15Use 4 Spaces indent and add modelines infoAlexis La Goutte1-2326/+2340
svn path=/trunk/; revision=50622
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=50621
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=50620
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte2-4/+4
svn path=/trunk/; revision=50619
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+0
svn path=/trunk/; revision=50618
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+3
svn path=/trunk/; revision=50617
2013-07-15Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+2
svn path=/trunk/; revision=50616
2013-07-15Use "generic" tfs (tfs_set_notset)Alexis La Goutte1-70/+15
svn path=/trunk/; revision=50615
2013-07-15Make Debian package build depend on xdg-utils to let configure detect xdg-openBalint Reczey1-1/+1
svn path=/trunk/; revision=50614
2013-07-15C++ style comments are not allowed in ISO C90. (Fixes the rest of them now ↵Chris Maynard1-13/+13
that I noticed, "this will be reported only once per input file") svn path=/trunk/; revision=50613
2013-07-15Trivial: C++ style comments are not allowed in ISO C90.Chris Maynard1-1/+1
svn path=/trunk/; revision=50612
2013-07-15As suggest by Balint:Jeff Morriss4-22/+2
Remove the 03-preferences patch: there's an ongoing discussion over at Debian about using xdg-open to open URLs[1] (instead of sensible-browser as this patch was doing) and anyway xdg-open behaves better for Balint. Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested by Balint). Both changes are untested. [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436 svn path=/trunk/; revision=50611
2013-07-15Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :Jeff Morriss1-6/+6
As per http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script the portable way to find out if a particular command is available is with "command -v" not "which". svn path=/trunk/; revision=50610
2013-07-15Do not hide the interface name in capture options.Irene Rüngeler2-21/+5
Fix for bug 8932 reported by tdarnell5. svn path=/trunk/; revision=50609
2013-07-15Fix error from checkAPI.plAlexis La Goutte1-1/+1
Error: Found non-ASCII characters on line 871 of packet-scsi-osd.c svn path=/trunk/; revision=50608
2013-07-15Set convert_proto_tree_add_text has executableAlexis La Goutte1-0/+0
svn path=/trunk/; revision=50607
2013-07-15Fix misassembly problems in CAP-LINK_ETH-20030618-150138.5VWJakub Zawadzki1-2/+2
When reading packet we need to read whole one including tvb_frame->offset, not only tvb->length svn path=/trunk/; revision=50606