aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-12-12Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT's ↵Chris Maynard5-57/+110
since both get_rose_ctx() and get_asn1_ctx() also check signatures. svn path=/trunk/; revision=53965
2013-12-12Reject the packet if data is NULL. Remove _U_ where data is actually used. ↵Chris Maynard5-45/+86
For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures. (Arguably it's the responsibility of the dissector passing this information to set the signature correctly so if there's an invalid signature, the bug is with the calling dissector and not with the one receiving the invalid signature.) svn path=/trunk/; revision=53964
2013-12-12- Forward declaration of register functions.Anders Broman18-0/+50
svn path=/trunk/; revision=53963
2013-12-12Try to fix "initializer element is not computable at load time"Anders Broman3-33/+91
svn path=/trunk/; revision=53962
2013-12-12Remove some TODOs that have now been addressedMartin Mathieson1-3/+0
svn path=/trunk/; revision=53961
2013-12-12Missing from last commit - copy hfn into stored result for PDUMartin Mathieson1-0/+1
svn path=/trunk/; revision=53960
2013-12-12Show other security inputs (apart from keys)Martin Mathieson1-12/+89
svn path=/trunk/; revision=53959
2013-12-12- Make local functions static.Anders Broman32-5/+87
- Forward declaration of register functions. svn path=/trunk/; revision=53958
2013-12-12Fix the path to dumpcap.Gerald Combs1-1/+1
svn path=/trunk/; revision=53957
2013-12-12Remove the checks for ../../lib. If it still exists it likely means thatGerald Combs1-10/+1
there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt. svn path=/trunk/; revision=53956
2013-12-12Update library searches to reflect r53780.Gerald Combs1-1/+10
svn path=/trunk/; revision=53955
2013-12-11Reject the packet if data is NULL.Chris Maynard1-0/+8
svn path=/trunk/; revision=53954
2013-12-11Reject the packet if data is NULL. Leave the DISSECTOR_ASSERT(actx != NULL) ↵Chris Maynard1-1/+6
since get_asn1_ctx() also checks the signature. svn path=/trunk/; revision=53953
2013-12-11Be more consistent with the name "Wireshark" and its two UIGerald Combs1-13/+42
flavors. Upgrade the Qt flavor from "experimental" to "alpha". I also apologize in advance to all of the people who installed previous versions of the 1.11.x packages and who will now have extra shortcuts lying around. svn path=/trunk/; revision=53952
2013-12-11Fix Jörg Mayer1-4/+0
svn/trunk/epan/dissectors/packet-netlink-netfilter.c:164:11: error: variable ‘is_req’ set but not used [-Werror=unused-but-set-variable] gboolean is_req; ^ cc1: all warnings being treated as errors svn path=/trunk/; revision=53951
2013-12-11Fix buildbot:Jakub Zawadzki1-5/+9
packet-netlink-netfilter.c:94: warning: 'dissect_netlink_netfilter_queue' defined but not used svn path=/trunk/; revision=53950
2013-12-11Trivial: tabs -> spaces.Chris Maynard1-1/+1
svn path=/trunk/; revision=53949
2013-12-11New-style dissectors return the number of bytes dissected, not TRUE/FALSE.Chris Maynard1-6/+6
svn path=/trunk/; revision=53948
2013-12-11fix buildbot:Jakub Zawadzki1-1/+1
packet-netlink-netfilter.c:93: warning: unused parameter 'tvb' svn path=/trunk/; revision=53947
2013-12-11Reject the packet if data is NULL.Chris Maynard1-1/+7
svn path=/trunk/; revision=53946
2013-12-11Be sure tcpinfo is not NULL before dereferencing it.Chris Maynard1-2/+2
svn path=/trunk/; revision=53945
2013-12-11Revert part of r53874Jakub Zawadzki1-1/+2
svn path=/trunk/; revision=53944
2013-12-11Add new & update netlink dissectors.Jakub Zawadzki7-87/+904
svn path=/trunk/; revision=53943
2013-12-11- Make local functions static.Anders Broman17-6/+47
- Forward declaration of register functions. svn path=/trunk/; revision=53942
2013-12-11- Make local functions static.Anders Broman23-10/+69
- Forward declaration of register functions. svn path=/trunk/; revision=53941
2013-12-11From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9550 :Pascal Quantin1-14/+21
GSM SMS UDH EMS control expects 4 octets instead of 3 with OPTIONAL 4th svn path=/trunk/; revision=53940
2013-12-11Remove _U_ from dissect_openwire_tcp()'s data parameter; technically it is ↵Chris Maynard1-1/+1
used since it is passed to tcp_dissect_pdus(), even though dissect_openwire() doesn't actually use it. svn path=/trunk/; revision=53939
2013-12-11Improve tshark command-line error help. Fixes ↵Chris Maynard2-37/+64
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9548 and adds addtional help, better formatting, sorting and some minimal documentation of the -u option to the tshark man page. svn path=/trunk/; revision=53938
2013-12-11Trivial: Fix typo.Chris Maynard1-1/+1
svn path=/trunk/; revision=53937
2013-12-11Update .gitignoreAlexis La Goutte1-3/+2
wireshark-tap-register* is used by gtk and Qt svn path=/trunk/; revision=53936
2013-12-11Fix (-W)unused-const-variable error found by ClangAlexis La Goutte2-4/+4
svn path=/trunk/; revision=53935
2013-12-11Fix an out of bounds access found by ASAN and reported by Alexis:Pascal Quantin1-1/+1
==21553==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffbc0b2a5e at pc 0x7fe8684147a3 bp 0x7fffbc0b2950 sp 0x7fffbc0b2948 READ of size 2 at 0x7fffbc0b2a5e thread T0 #0 0x7fe8684147a2 in dissect_schedule_message /home/alagoutte/wireshark-clang/epan/dissectors/packet-gsm_cbch.c:309 #1 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 #2 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139 #3 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 #4 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 #5 0x7fe868a3ebd4 in decode_udp_ports /home/alagoutte/wireshark-clang/epan/dissectors/packet-udp.c:411 #6 0x7fe868a41886 in dissect /home/alagoutte/wireshark-clang/epan/dissectors/packet-udp.c:747 #7 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 #8 0x7fe867ed6d03 in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 #9 0x7fe8684eaa1f in dissect_ip /home/alagoutte/wireshark-clang/epan/dissectors/packet-ip.c:2401 #10 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 #11 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 #12 0x7fe868333e98 in dissect_ethertype /home/alagoutte/wireshark-clang/epan/dissectors/packet-ethertype.c:305 #13 0x7fe867ed707d in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:508 #14 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139 #15 0x7fe8683328ad in dissect_eth_common /home/alagoutte/wireshark-clang/epan/dissectors/packet-eth.c:472 #16 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 #17 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 #18 0x7fe868382460 in dissect_frame /home/alagoutte/wireshark-clang/epan/dissectors/packet-frame.c:485 #19 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 #20 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139 #21 0x7fe867ed5baf in call_dissector /home/alagoutte/wireshark-clang/epan/packet.c:2169 #22 0x7fe867eb6388 in epan_dissect_run_with_taps /home/alagoutte/wireshark-clang/epan/epan.c:329 #23 0x4a0ef9 in process_packet /home/alagoutte/wireshark-clang/tshark.c:3434 #24 0x49c985 in load_cap_file /home/alagoutte/wireshark-clang/tshark.c:3237 #25 0x7fe860e8ede4 in __libc_start_main /build/buildd/eglibc-2.17/csu/libc-start.c:260 #26 0x48586c in _start ??:? Address 0x7fffbc0b2a5e is located in stack of thread T0 at offset 126 in frame #0 0x7fe86841353f in dissect_cbch /home/alagoutte/wireshark-clang/epan/dissectors/packet-gsm_cbch.c:345 This frame has 2 object(s): [32, 80) 'new_slots.i' [128, 224) 'other_slots.i' <== Memory access at offset 126 underflows this variable HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-buffer-overflow ??:0 ?? svn path=/trunk/; revision=53934
2013-12-11Remove an unused variableMartin Mathieson1-2/+0
svn path=/trunk/; revision=53933
2013-12-11Convert to new-style dissector, change crcStatusValid to a gboolean, and ↵Martin Mathieson2-111/+141
rework DRX timers (again) svn path=/trunk/; revision=53932
2013-12-11#if 0 unused function.Anders Broman1-2/+2
svn path=/trunk/; revision=53931
2013-12-11- Forward declaration of register functions.Anders Broman14-14/+28
svn path=/trunk/; revision=53930
2013-12-10Pass the correct uuid when recursing (the other one is a temporary var that mayEvan Huus1-1/+1
not be initialized). Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9535 svn path=/trunk/; revision=53929
2013-12-10From Deon van der Westhuysen via bug 9537:Gerald Combs1-3/+10
---- The qt version of wireshark (stats_tree_dialog.cpp) by default expands all nodes within a stats_tree (see for example the "Statistics" > "IP Statistics" > "IP Destinations" stats_tree; you need this patch installed before the item is added to the stats menu: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9528). This behaviour is fine for small trees but becomes counter productive in trees with many items or levels. This patch changes the qt ui to act like the gtk ui: the first level of nodes are expanded by default while deeper levels are collapsed. ---- From me: "Expand all" makes sense for a small number of items. Do so if we have less than 100. svn path=/trunk/; revision=53928
2013-12-10use large positve values for illegal DVB-SI string encodingsMartin Kaiser3-11/+12
interpret encoding fields as UINT32 so that the displayed value matches the actual bytes in the packet svn path=/trunk/; revision=53927
2013-12-10Trivial: The file name is prefs_capture.c, not capture_prefs.cChris Maynard1-1/+1
svn path=/trunk/; revision=53926
2013-12-10use the new SI string routines in DVB-CIMartin Kaiser1-126/+66
svn path=/trunk/; revision=53925
2013-12-10Reject the packet if data is NULL.Chris Maynard1-5/+10
svn path=/trunk/; revision=53924
2013-12-10Where appropriate, reject the packet entirely or at least protect against ↵Chris Maynard1-4/+13
data being NULL. svn path=/trunk/; revision=53923
2013-12-10Reject packets if data (and usb_trans_info) are NULL. Also, new-syle ↵Chris Maynard3-22/+38
dissectors return the number of bytes dissected, not TRUE/FALSE. svn path=/trunk/; revision=53922
2013-12-10Trival: spaces -> tab.Chris Maynard1-1/+1
svn path=/trunk/; revision=53921
2013-12-10QComboBox::setCurrentText() exits in Qt3 and Qt5 but not Qt4.Gerald Combs1-3/+3
svn path=/trunk/; revision=53920
2013-12-10Add a missing semicolon.Gerald Combs1-1/+1
svn path=/trunk/; revision=53919
2013-12-10- Forward declaration of register functions.Anders Broman58-7/+162
svn path=/trunk/; revision=53918
2013-12-10Fix prototypes.Gerald Combs2-4/+4
svn path=/trunk/; revision=53917
2013-12-10Remove _U_ from dissect_usb_com_bulk()'s data parameter; it is used.Chris Maynard1-1/+1
svn path=/trunk/; revision=53916