aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-21autotools: Cleanup some installation directory stuffJoão Valverde4-28/+8
Replace hacky code to set install dirs in config.h and use path definitions only where required. Change-Id: I78735f730725382c1b3aca876705e5e6e1872d78 Reviewed-on: https://code.wireshark.org/review/14033 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Fix multiple repetitions of -L build flagsJoão Valverde3-2/+74
Before: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib' After: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib' Bumps autoconf required version to 2.64. Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a Reviewed-on: https://code.wireshark.org/review/14041 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21No need to export the 48-byte-header Linux USB dissector.Guy Harris1-3/+2
Nobody looks it up, so just register it in the wtap_encap table, as we do with the 64-byte-header Linux USB dissector, the USBPCAP dissector, and the FreeBSD USB dissector. Change-Id: I5da098d799a63449f17a26924b3ba2de36536896 Reviewed-on: https://code.wireshark.org/review/14046 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-21Disssect the flags fields in the FreeBSD USB headers.Guy Harris1-4/+245
Change-Id: I6f59028b1134378762691c35897cfcdc04e6dbfe Reviewed-on: https://code.wireshark.org/review/14045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20ieee80211: handle reserved grouping valuePeter Wu1-0/+8
Prevents a buffer overrun (read). Show expert info such that it can be detected (in case the value is non-reserved in the future). Bug: 11818 Change-Id: I6cd2f4c9deb5cb515a53743aa83193521b2331e8 Reviewed-on: https://code.wireshark.org/review/14040 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20MIP6: fix mip6.lri.reserved exists multiple times with NOT compatible types: ↵Alexis La Goutte1-3/+3
FT_BOOLEAN and FT_UINT16 It is a typo on display field and fix also wrong comment... Change-Id: Idb93641d6e4197b59e453e4ad629af4c0454c8d3 Reviewed-on: https://code.wireshark.org/review/14038 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20DLM3: Remove macro for declare header field (hf)Alexis La Goutte1-241/+506
checkhf don't like macro and for avoid warning/error, remove macro for declare hf Change-Id: I5521b3176027ddc673e8f6c793ab4eb0d01cd8fd Reviewed-on: https://code.wireshark.org/review/14018 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20MIH: fix exists multiple times with NOT compatible typesAlexis La Goutte1-4/+4
'mih.tlv_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8 'mih.mihf_id' exists multiple times with NOT compatible types: FT_ETHER and FT_STRING 'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv4 and FT_ETHER 'mih.mihf_id' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Ib4be551920c7389100ece668e1af288a7d712725 Reviewed-on: https://code.wireshark.org/review/14027 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-20Fix various off-by-one in buffer sizesPeter Wu5-14/+14
Some only allow buffer overruns (read), others also buffer overflows (write). Found by looking for '\[ *N *\]' where N is 255, 0xff, 15 and 0xf (case insensitive). Change-Id: I250687e2fdeb8fbd5eaf0bbb8251c3dab9640760 Reviewed-on: https://code.wireshark.org/review/14034 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-20ber: fix buffer overrun when handling empty setsPeter Wu1-0/+4
When a set is empty, only a terminator (ber_sequence_t with NULL func) is present. In that case, do not try to find more values as that will never succeed. Bug: 12106 Change-Id: I26cd4ba84a9580e92d5921592a27c2af17c0bebf Reviewed-on: https://code.wireshark.org/review/14028 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-20gsm_abis_oml: fix buffer overrunPeter Wu1-1/+1
Do not read outside boundaries when tag is exactly 0xff. tag = tvb_get_guint8(tvb, offset); tdef = find_tlv_tag(tag); ... return &nm_att_tlvdef_base.def[tag]; Bug: 11825 Change-Id: I42e624185abb2166aa0f8d0dbd71a2a86fc0b18e Reviewed-on: https://code.wireshark.org/review/14030 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-20sober: fix cannot optimize loops warning [-Wunsafe-loop-optimizations]João Valverde1-4/+4
Change-Id: I180b1ef53f9adcf4625d0cf9ee35066aa21ee59b Reviewed-on: https://code.wireshark.org/review/13934 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Use Qt flags only for building Qt GUIJoão Valverde4-5/+4
Change-Id: I041e2fab6de948c803cc059e78358077000efee8 Reviewed-on: https://code.wireshark.org/review/14006 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20Qt: only "Comment" column should be editable in Local Interfaces management tabPascal Quantin2-1/+12
Bug: 12146 Change-Id: Ife481b7c0b201a54749e212416571aa3dcaf7542 Reviewed-on: https://code.wireshark.org/review/14017 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-20autotools: Move common automake code for plugins to an include fileJoão Valverde16-804/+109
Change-Id: Icac1eb17ff78ae5ae54b61820618bf3c5733bd96 Reviewed-on: https://code.wireshark.org/review/14003 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20Fix indentation.Guy Harris1-1/+1
Change-Id: I4737a3410cde2d8ead79b42d9734b4412cb5ca77 Reviewed-on: https://code.wireshark.org/review/14026 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20Initial support for FreeBSD USB captures.Guy Harris4-27/+327
(There's also work needed in libpcap; that's also in progress.) Change-Id: Iff5a34c139a000865e2d78cc17a4af5ff24fb44b Reviewed-on: https://code.wireshark.org/review/14025 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-20Qt: Set maximumSize on AccordionFrame widget buttonsStig Bjørlykke2-0/+24
After switching to QPushButton for buttons in SearchFrame and GoToFrame the widgets needs a maximum size to reduce the height of the frame. Change-Id: I504e65add446c4262e9b1e02ff3e41c08d1cfdfd Reviewed-on: https://code.wireshark.org/review/14019 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-20Couchbase: Dissect optional expiry in subdoc mutation requestsDave Rigby1-13/+38
Add support for dissecting the optional 4-byte expiry field in sub-document API request packets. This is permitted for any single-path mutation request; increasing the length of the extras section from 3 to 7 bytes. Change-Id: I0609dbc6f6a8e62028cd20a28609fc3016e44910 Reviewed-on: https://code.wireshark.org/review/14004 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-20Put back a define to make the Lua build happy.Guy Harris1-1/+7
DO NOT USE THIS FOR ANYTHING NEW. Change-Id: Iee2ddaa2eeb735b33aef9e81b32bb4a3535e3451 Reviewed-on: https://code.wireshark.org/review/14023 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19Get rid of PCAP_ENCAP_USB.Guy Harris3-11/+1
It doesn't correspond to anything we support - and the old Linux USB LINKTYPE_ value of 186 doesn't give enough information to dissect the packets (it discards the event type, for example), so we drop the rest of our support for it as well. Change-Id: I6f537d9263174aba4320edf5140e1d1540e979c8 Reviewed-on: https://code.wireshark.org/review/14020 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19Fix implicit conversion from 64 to 32 bitsJoão Valverde4-5/+9
Change size_t to something that is guaranteed to fit in a socklen_t. Fix incorrect AC_DEFINE too. Change-Id: I710f32fb1e5bd4f51843d380aa8ed8b6acd98c02 Reviewed-on: https://code.wireshark.org/review/14009 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-19Qt: Fix Open protocol preferences button.Stig Bjørlykke1-1/+1
Do showProtocolPreferences before removing the variable which this depends on. The button does not work without at module. Change-Id: I7d31aa5ab19340a4102523b13de961e799cae5e4 Reviewed-on: https://code.wireshark.org/review/14015 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-19rsl: avoid buffer overreadPeter Wu1-1/+1
Fixes a buffer overrun in dissct_rsl_ipaccess_msg when the tag is exactly 0xff: tag = tvb_get_guint8(tvb, offset); tdef = &rsl_att_tlvdef.def[tag]; Bug: 11829 Change-Id: I25a3c6948242a52f59431ce84c108b2e52008930 Reviewed-on: https://code.wireshark.org/review/14011 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-19Add inet_pton/inet_ntop interface to libwsutilJoão Valverde20-273/+219
Change-Id: Ifc344ed33f2f7ca09a6912a5adb49dc35f07c81f Reviewed-on: https://code.wireshark.org/review/13881 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-19BER/PER: Add dissector assertions to squelch scan-build bugsJoão Valverde2-0/+4
packet-per.c:959:6: warning: Access to field 'aligned' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:1606:29: warning: Access to field 'pinfo' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:1612:24: warning: Access to field 'created_item' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:3156:41: warning: Access to field 'pinfo' results in a dereference of a null pointer (loaded from variable 'actx') packet-ber.c:3182:24: warning: Access to field 'created_item' results in a dereference of a null pointer (loaded from variable 'actx') Change-Id: Ibae00dc29a869701fe903a5b0c9944279aaa3df7 Reviewed-on: https://code.wireshark.org/review/13936 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-19DLM3: Add support for the Need Slots Recovery Command Status FlagAndreas Gruenbacher1-5/+68
DLM3 minor version 1, introduced in mainline kernel commit 757a4271 from October 2011, added some fields and a Need Slots flag to Recovery Command Status packets. Change-Id: Ib994223afeae6b8d6ddb75404ab2031c5a63185b Reviewed-on: https://code.wireshark.org/review/13983 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-19Qt: Update AccordionFrame widgets to use common layoutStig Bjørlykke11-23/+67
- Use QPushButton for buttons and set the "Find" button as default in SearchFrame. - Use QPushButton for buttons, added a "Packet:" label, and set the "Go to packet" button as default in GoToFrame. - Set Qt::WA_MacSmallSize in OS X for FilterExpressionFrame and PreferenceEditorFrame. - Removed QFrame::StyledPanel and QFrame::Raised from ColumnEditorFrame. - Update ui files to reflect that AccordionFrame is used for AddressEditorFrame, FilterExpressionFrame and PreferenceEditorFrame. Change-Id: Icfbfff973535317997109a1020dfe24ba932e098 Reviewed-on: https://code.wireshark.org/review/13995 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-19Don't call the hci_usb dissector through a dissector table.Guy Harris2-10/+20
It works the same regardless of what flavor of USB metadata there is, and there's no good reason for any Bluetooth code to know, or care, about particular flavors of USB metadata. Add some comments while we're at it. Change-Id: I6ea2063a015e424fc84a407231e80ef3e2a79c98 Reviewed-on: https://code.wireshark.org/review/14001 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19ssl: fix decryption when session ticket is not usedPeter Wu2-7/+15
Do not use the client-supplied session ticket for decryption when the session is not resumed as the cached key (associated with that ticket) is invalid for this new session. SSL Session IDs are unaffected by this issue as only the server-issued Session ID is considered. This fixes decryption of a SSL capture which uses the keylog file for decryption, but where the session tickets are invalid because the server was restarted. Additionally, the session and session tickets stores are split to avoid exporting session tickets via File -> Export SSL Session keys. Session tickets should only be used internally, the CLIENT_RANDOM identifier is shorter and is the preferred method to link secrets. Change-Id: If96d7a4e89389825478e67e9a65401ce0607aa66 Reviewed-on: https://code.wireshark.org/review/13994 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-19Prevent inproper use of negative valueJaap Keuter1-2/+2
Coverity rightfully complains about inproper use of negative value. maxlength special value '-1' should be handled appropriately. Change-Id: Ie1818121e39fa668094d012980016444ca868e6e Reviewed-on: https://code.wireshark.org/review/13978 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-19dcerpc: fix Called function pointer is null (null dereference) found by ↵Alexis La Goutte1-1/+1
Clang Analyzer Change-Id: Idf98bcf617d4d6343aa233e42898cf5f26b08e33 Reviewed-on: https://code.wireshark.org/review/13974 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-19Added support for Payload IE Vendor OUI.Chris Brandson2-1/+22
IEEE has run out of Payload IE IDs so ZigBee and future IEs must use Vendor OUIs. Change-Id: I6eed4382d099364605649eb7577a5e2691e97dd3 Reviewed-on: https://code.wireshark.org/review/13971 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-19Don't bother setting phdr->pkt_encap to wth->file_encap.Guy Harris4-8/+3
wtap_read() and wtap_seek_read() now do so before calling the read or seek-read routine, so there's no need to do so in those routines. Rename hcidump_process_packet() to hcidump_read_packet() while we're at it, as it doesn't just process an already-read packet, it does the reading as well as the processing. Change-Id: Ic13da6a2096e68550d80f2eff31f03d0edb58147 Reviewed-on: https://code.wireshark.org/review/13998 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19PPP: remove obsolete Van Jacobson decompression preferencePascal Quantin2-9/+1
As discussed in https://www.wireshark.org/lists/wireshark-dev/201309/msg00182.html VJ decompressor was removed from Wireshark 1.12 due to license incompatibility Let's mark the corresponding preference as obsolete so that people do not think it is still supported Change-Id: I7030ef5f402a0c7e242e77a52baf18f450a95024 Ping-Bug: 12138 Reviewed-on: https://code.wireshark.org/review/13993 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18Have ETT variable names all begin with ett_.Guy Harris1-13/+13
Change-Id: I2f6b3e569206e443291f7473ed77b2acde636748 Reviewed-on: https://code.wireshark.org/review/13997 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18802.15.4 fixed processing of PAN ID compression bitChris Brandson1-6/+28
This the result of updated 'PAN ID Compression field value for frame version 0b10' table in IEEE spec which clarifies the interpretaion of the PAN ID Compression bits for different combinations of Src and Dst Addresses. Change-Id: Ia70836b8571beae80a3f507be4f39736e13eb110 Reviewed-on: https://code.wireshark.org/review/13984 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-18Remove some {-I,/I} flags.Guy Harris5-18/+5
They should not be necessary. Change-Id: I9246d86862392c65839c18d13d8634bcf510d55e Reviewed-on: https://code.wireshark.org/review/13992 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18Another include that needs fixing.Guy Harris1-1/+1
Change-Id: If06ba1bd887e0e47d74c9b75cbabedcfd7b84130 Reviewed-on: https://code.wireshark.org/review/13991 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris51-72/+61
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18EIGRP: Add missing CD (Candidate Default) flag on Legacy MetricAlexis La Goutte1-0/+9
According to the EIGRP draft RFC (https://tools.ietf.org/html/draft-savage-eigrp-04#section-6.8.1), 2nd bit (0x2) in EIGRP classic bit field should be interpreted as Candidate Default (CD) Reported by Garri Bug:12136 Change-Id: I56dcbbc7db480e67962e2edfbd8d9c6b117f30ef Reviewed-on: https://code.wireshark.org/review/13987 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-18Qt: Add regex support in Find PacketStig Bjørlykke7-39/+146
Add support for using regular expressions in the Search Frame when searching in packet list, packet details and packet bytes. This search is in many cases faster than plain string search. Change-Id: I2d8a709046f90d7b278fb39547fc4e2e420623bc Reviewed-on: https://code.wireshark.org/review/13981 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-18GTPv2 command messages conversationglores1-0/+14
Change-Id: I2faa01b3c461269e5c8ed88ef44157fbc33758b9 Reviewed-on: https://code.wireshark.org/review/13980 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-18Fix compilation of extcap programs with NMakePascal Quantin2-7/+19
Change-Id: I80e17aeeab5bf747c6ba06168245d38d6d78efa9 Reviewed-on: https://code.wireshark.org/review/13986 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-17cip: fix a leakDario Lombardo1-6/+8
Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-17usb: cleanup idProduct dissectionChristian Lamparter1-18/+7
The current code which dissects the idProduct (and to some extend the idVendor) item for USB devices is overly complicated. A better method to format the product string in the right way is using: proto_tree_add_uint_format_value. This gets rid of the additinal string and item manipulation altogether. Change-Id: Iadd69b7dc284e62039402de53418f41460d88a5d Reviewed-on: https://code.wireshark.org/review/13973 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-17Qt: Validate FindLineEdit regexpStig Bjørlykke2-1/+33
Check if regexp is valid and set valid/invalid background color. Change-Id: Ibf4d3fa84463afbd7c68631cfaddec8261807b8f Reviewed-on: https://code.wireshark.org/review/13962 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-17autotools: Remove extra space from outputJoão Valverde1-1/+1
Change-Id: If50c6b5d15d44ed3d99a82bd0ca08f93ee059ce3 Reviewed-on: https://code.wireshark.org/review/13979 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-16Cast away a warning.Guy Harris1-1/+1
The argument to the resize method for QByteArray is an int, not a size_t. Change-Id: Id30bc03daec6d6ead8669794b5cb0247718be66b Reviewed-on: https://code.wireshark.org/review/13977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-16iso14443: fix the NAK/ACK bit of an R-blockMartin Kaiser1-7/+7
if the bit is set, it's an R(NAK) block Change-Id: I0e44bd72d1c2a69a582792d08bf450e6ef2d163b Reviewed-on: https://code.wireshark.org/review/13976 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 00:42:49 +0000