aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-10-22Fix warning: file.c(776) : warning C4028: formal parameter 2 different from ↵Jakub Zawadzki1-1/+1
declaration svn path=/trunk/; revision=45725
2012-10-22Move some variables inside TRY { } block.Jakub Zawadzki1-89/+95
svn path=/trunk/; revision=45724
2012-10-22Make progbar_quantum volatile to suppress setjmp/longjmp warnings.Guy Harris1-1/+1
svn path=/trunk/; revision=45723
2012-10-22Move TRY CATCH outside reading packet loops.Jakub Zawadzki1-49/+45
svn path=/trunk/; revision=45722
2012-10-22Comment more cases where static allocation is used with SET_ADDRESS.Jakub Zawadzki4-4/+4
svn path=/trunk/; revision=45721
2012-10-22Memory for address->data store in pinfo can no longer be ep_ allocated.Jakub Zawadzki1-2/+1
svn path=/trunk/; revision=45720
2012-10-22Wireshark Filter Expression dialog does not sort list of named fields. ↵Chris Maynard1-2/+7
Patch from Jakub Zawadzki. Resolves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7743 svn path=/trunk/; revision=45719
2012-10-22Fix bug #7892: Buildbot crash output: fuzz-2012-10-21-27120.pcapJakub Zawadzki1-14/+10
Memory for address->data store in pinfo can no longer be ep_ allocated. svn path=/trunk/; revision=45718
2012-10-22Avoid potential infinite loops. Fixes ↵Chris Maynard1-6/+8
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7879 #BACKPORT (1.8, 1.6) svn path=/trunk/; revision=45717
2012-10-22Add missing newline at end of filePascal Quantin1-1/+1
svn path=/trunk/; revision=45716
2012-10-221) Allow for the possibility for both packet summary and packet details to beChris Maynard3-70/+97
printed when either -T is not specified or "-T text" or "-T ps" is selected. 2) Allow for packet hex/ascii to be printed without necessarily requiring that either packet summary or packet details also be printed. This just means that if you want packet summary information, use "-Px" instead of just "-x". 3) Fix bug with order of evaluation of -V and "-T psml". 4) If a packet separator is specified, always use it regardless of the -PVx options chosen. 5) Don't print 2 lines of separation between packets when only printing hex/ascii. Print 1 line of separation as in all other cases. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7782 plus other misc. enhancements. svn path=/trunk/; revision=45715
2012-10-22Try reverting r45351 again. It looks like the recent changes areGerald Combs2-0/+0
confusing SVN: http://www.wireshark.org/lists/wireshark-dev/201210/msg00190.html svn path=/trunk/; revision=45714
2012-10-22Extend value_strings with entries from IANA.Anders Broman1-48/+65
svn path=/trunk/; revision=45713
2012-10-22Add a link to IANA.Anders Broman1-0/+1
svn path=/trunk/; revision=45712
2012-10-22FixJörg Mayer1-2/+2
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2611:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format] wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2617:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format] svn path=/trunk/; revision=45711
2012-10-22FixAnders Broman1-2/+1
../../../epan/dissectors/packet-btatt.c:299:25: error: too many arguments for format [-Werror=format-extra-args] ../../../epan/dissectors/packet-btatt.c:254:12: error: unused variable 'col_info' [-Werror=unused-variable] svn path=/trunk/; revision=45710
2012-10-22from Allan M. Madsen:Anders Broman10-158/+3911
Add support for HCI 3.0+HS and v4.0, Bluetooth Low Energy. This includes dissection of additional HCI commands and events, Attribute Protocol and Security Manager Protocol. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7872 svn path=/trunk/; revision=45709
2012-10-22From Matthias St. Pierre:Anders Broman2-11/+34
Add full rfc4868 support to both dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873 svn path=/trunk/; revision=45708
2012-10-22g_strcmp0 first occures in GLIB 2.16 define it localy if it does not existAnders Broman3-0/+38
to make builds on Fedora 8 with GTK 2.12 work. svn path=/trunk/; revision=45707
2012-10-22Have separate seek-read routines for V1.0 and V2.0.Guy Harris1-161/+211
Set the subtype_read and subtype_seek_read routines for the file type, rather than having a common read routine that checks the file type each time. Make the macros used in the read and seek-read routines more similar, and use them more similarly in both. svn path=/trunk/; revision=45706
2012-10-22Pull the length-and-caplen setting operations in the read routines intoGuy Harris1-33/+47
the macros. Note why we don't pull the time setting operations into the macros (it's because that would mean the macros can't be used in the seek-read routines, as calculating time stamps requires accumulating the time stamps in a sequential pass through the packets, given that the records have time stamps relative to the previous packet). Fix what is probably a typo in the definitions of some macros (which happen to work without the fix because "fp" and "pp" are both local variable names as well as macro arguments). svn path=/trunk/; revision=45705
2012-10-22Pass a pointer to a struct wtap_pkthdr to a bunch of macros; this allowsGuy Harris1-143/+117
us to avoid one redefinition of those macros that, in the one definition, for the read routines, refer to the pseudo-header as wth->phdr.pseudo_header and, in the next definition, for the seek-read routine, refer to it as *pseudo_header - instead, we pass &wth->phdr in the read routine and phdr in the seek-read routine. svn path=/trunk/; revision=45704
2012-10-22Bug 7884 - replace proto_tree_add_text with expert_info for ↵Michael Mann3-109/+132
packet-mpls-echo.c (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7884) svn path=/trunk/; revision=45703
2012-10-21More white-space cleanups.Guy Harris1-23/+23
svn path=/trunk/; revision=45702
2012-10-21Use phdr->pseudo_header in the seek-read routine, rather than puttingGuy Harris1-4/+3
its address into a pseudo_header pointer and using that. svn path=/trunk/; revision=45701
2012-10-21Tabs -> spaces, and other whitespace cleanups.Guy Harris1-952/+952
svn path=/trunk/; revision=45700
2012-10-21From Michal Labedzki via ↵Pascal Quantin1-15/+17
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7675 : Fix improper use of negative value in AVCTP svn path=/trunk/; revision=45699
2012-10-21Fix a few errors found by checkhf.pl and fix-encoding-args.plPascal Quantin1-15/+8
svn path=/trunk/; revision=45698
2012-10-21From Michal Labedzki via ↵Pascal Quantin1-35/+22
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740 : Fix deadcode areas and improper use of negative value in AVRCP svn path=/trunk/; revision=45697
2012-10-21From Sho Amano via ↵Pascal Quantin1-4/+4
https://www.wireshark.org/lists/wireshark-dev/201210/msg00186.html: Fix WLAN decryption when using a WPA PSK key svn path=/trunk/; revision=45696
2012-10-21Include ui/win32/console_win32.c.Guy Harris1-0/+1
svn path=/trunk/; revision=45695
2012-10-21Simplify #ifdef blocksPascal Quantin1-6/+5
svn path=/trunk/; revision=45694
2012-10-21Revert r45692 and try to fix link failure another way: console_win32.[ch] ↵Pascal Quantin7-8/+9
definitely belong to ui/win32 Add console_win32.[ch] to Makefile.am svn path=/trunk/; revision=45693
2012-10-21Try to fix LINK : fatal error LNK1181: cannot open input file ↵Alexis La Goutte5-6/+6
'win32/console_win32.obj' move ui/win32/console_win32.[ch] to ui/console_win32.[ch] svn path=/trunk/; revision=45692
2012-10-21Make Windows Buildbot happyAlexis La Goutte2-2/+2
svn path=/trunk/; revision=45691
2012-10-21Make buildbot happy and add modelines infoAlexis La Goutte2-12/+39
svn path=/trunk/; revision=45690
2012-10-21Add svn:keyworks and svn:eol-style to ui/win32/console_win32.[ch] (not found ↵Alexis La Goutte0-0/+0
how to add with git-svn...) svn path=/trunk/; revision=45689
2012-10-21AddressString can have a size of 1, fixes Bug 7882 -GSM_MAP show malformed ↵Anders Broman2-6/+12
Packets when two IMSI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7882 svn path=/trunk/; revision=45687
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=45686
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=45685
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=45684
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-6/+6
svn path=/trunk/; revision=45683
2012-10-21Fix Passed-by-value struct argument contains uninitialized data Warning ↵Alexis La Goutte1-0/+3
found by Clang svn path=/trunk/; revision=45682
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=45681
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-10/+9
svn path=/trunk/; revision=45680
2012-10-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-6/+6
svn path=/trunk/; revision=45679
2012-10-21Add MSWindows console to QtSharkAlexis La Goutte1-17/+6
svn path=/trunk/; revision=45678
2012-10-21Move MSWindows console "windows" to ui/win32/console_win32.[ch]Alexis La Goutte4-82/+246
svn path=/trunk/; revision=45677
2012-10-21[Automatic manuf, services and enterprise-numbers update for 2012-10-21]Gerald Combs3-7/+176
svn path=/trunk/; revision=45675
2012-10-20Make r45511 work also without HAVE_C_ARES.Jakub Zawadzki1-27/+32
svn path=/trunk/; revision=45674