aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-30nfs: Standardize on FileHandle vs filehandleTom Haynes1-5/+5
Change-Id: Ib945ddee4a35bf984a9411e56ed3801cde70c6c4 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17398 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30Support Decode As for {SSL,TLS}-over-TCP.Guy Harris1-0/+41
We register dissectors for "Decode As" for {SSL,TLS}-over-TCP, so we should actually set up the "Decode As" stuff for it. Change-Id: I2a738667efdec1007069df74885a4fe8fc3fcbab Reviewed-on: https://code.wireshark.org/review/17400 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30[Diameter] Improve dissection of malformed packets by continnuingAndersBroman1-1/+11
dissection and display the problem more prominetly. Change-Id: Ia1a32667a18e1e5b60b5c167da9b6dd945ba3dfc Reviewed-on: https://code.wireshark.org/review/17385 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30time_util: fix -Wshadow issuePeter Wu1-3/+3
time_util.c was already fixed, but the header was missing the change, breaking the build on a very old compiler. Change-Id: I95685c9a3e25dcb7567f2551b92f20c8792a6e47 Reviewed-on: https://code.wireshark.org/review/17384 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-30ssl: fix wrong detection of non-resumed renegotiated sessionPeter Wu1-0/+2
If the heuristics fail to detect a resumed session, then it must mark the session as a normal session. This will also prevent from applying secrets that do not apply to this renegotiated session. Bug: 12793 Change-Id: I90f794a7bbaf7f1839e39656ac318183ecf48887 Reviewed-on: https://code.wireshark.org/review/17376 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30GTP: add new RAT Type valuesBinh Trinh1-0/+3
Change-Id: Ia3d8956197faff9366de2635a9bd29f2bfc40f0d Reviewed-on: https://code.wireshark.org/review/17381 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30Don't use a no-longer-extant variable.Guy Harris1-1/+1
Change-Id: I41c1a37248335d983da58b0b657a28ec521be290 Reviewed-on: https://code.wireshark.org/review/17378 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-29xml: fix some memleaksPeter Wu1-10/+8
No more memleaks reported for the attachment in bug 12790 :-) Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17365 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: Peter Wu <peter@lekensteyn.nl>
2016-08-29diameter: fix 400kb leaked memory on exitPeter Wu2-9/+38
Before: SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s). After addressing to-do by calling ddict_free: SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s). After fixing all remaining leaks cases in the flex file for diameter: SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s). Not bad huh :-) Ping-Bug: 12790 Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771 Reviewed-on: https://code.wireshark.org/review/17364 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-29pcapng: do not leak blocksPeter Wu1-8/+8
pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if they return, they do not have to set wblock.block to NULL. pcapng_read_block always sets wblock->block to NULL and may initialize it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and ISB. It is better to have more wtap_block_free calls on a NULL value than missing them as this would be a memleak (on the other hand, do not release memory that is stored elsewhere such as SHB and NRB). Ping-Bug: 12790 Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5 Reviewed-on: https://code.wireshark.org/review/17362 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-08-29MAUSB: Add Status value defined in v1.0a SpecSean O. Stalley1-0/+1
Change-Id: Ie8e77fffd54eb9b1918d90999a4419a80de8bc5e Reviewed-on: https://code.wireshark.org/review/17374 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-29tap-iostat.c: ensure that interval is set to its maximum value when using 0Pascal Quantin1-5/+5
Otherwise the statistics will be wrong if the capture duration is greater than G_MAXINT32 and it the user specifies an interval of 0 Bug: 12778 Change-Id: I83a0f627ec0bb7c535446c17afa486835091ab8b Reviewed-on: https://code.wireshark.org/review/17367 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-08-29telnet: remove meaningless line (CID 1372125).Dario Lombardo1-1/+0
Change-Id: I3b9bc01a4f72e2e0de3f83426a9b8e7060d0c89a Reviewed-on: https://code.wireshark.org/review/17366 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-29tproxy: fix memleak in is_banner_exchange_forPeter Wu1-1/+1
strdup and strcmp is a recipe for leaking. Change-Id: I522c71964e39f671a4101df9b2b432433fc1c12e Reviewed-on: https://code.wireshark.org/review/17363 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-28tvbparse: fix memleakPeter Wu1-0/+10
Use same wmem_epan_scope() as "w" (tvbparse_wanted_t). Change-Id: I73fdb1fb3b55a91b7bb0fc36e435024c6f0b3d73 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17361 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-28UAT gtk-ui, Qt-ui: Fixed copying records when no cp callback is definedMichał Skalski2-2/+11
According to documentation of uat_copy_cb_t, if uat->copy_cb is NULL, memcpy() should be used. This affected IKEv1 and IKEv2 UAT tables (possibly others). Change-Id: I27ebdc08385d260945699f101e714d3abb288b22 Reviewed-on: https://code.wireshark.org/review/17245 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>
2016-08-28[Automatic update for 2016-08-28]Gerald Combs12-101/+439
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic4d32253800cb94d52c817f1cd40179d878323cb Reviewed-on: https://code.wireshark.org/review/17358 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-28ISAKMP: fix # of SPIs field name in Delete payloadMirko Parthey1-1/+1
Fix the "Number of SPIs" field name in the Delete payload. References: RFC 2408, RFC 7296 Change-Id: I205fb830275fc011e6605fdae53c6b9141e1628b Reviewed-on: https://code.wireshark.org/review/17353 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>
2016-08-28xmpp: Improve stanza reassembly.Stig Bjørlykke1-5/+7
A XMPP stanza may be fragmented inside a conversation, so don't check for this only when starting a new conversation. Change-Id: I63b987184f52645e6c72c3c4155b39b7948de828 Reviewed-on: https://code.wireshark.org/review/17344 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-27Qt: Support "Resolve Names" with multiple custom column fieldsStig Bjørlykke1-6/+11
Make "Resolve Names" enabled if at least one of the custom column fields can be resolved. Change-Id: I702471be5d90c91f71209923e6abcc6921dca850 Reviewed-on: https://code.wireshark.org/review/17350 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-08-26extcap: improve interface print in help.Dario Lombardo4-13/+30
Change-Id: Ife8e73b6cb1756623e937452fc042d8b31e2554f Reviewed-on: https://code.wireshark.org/review/17321 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-26wsutil: add enumeration of local ip addresses in Windows.Dario Lombardo2-3/+72
Routine used by ssh-based extcaps. Change-Id: I06d8e1e1444cd03a0508dc0c7cb91d340a451c58 Reviewed-on: https://code.wireshark.org/review/17308 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-26Properly end address type search by name (CID-1362742)Jaap Keuter1-3/+3
Search address type by name iterates over an array, but fails to find its end. Therefore it may dereference invalid pointers, or NULL. Add the proper check in the for loop and make sure an end condition is always there in the array searched. Change-Id: I60ade9d438dc394340b6483b4fcb23e5ce432000 Reviewed-on: https://code.wireshark.org/review/17337 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-08-26SDP: Restore usability of conversation debug feature.Jaap Keuter1-4/+4
Some type changes were not carried forwared into the conversation debugging code. These changes allow compilation again. Change-Id: I90dde7cc94496828cf8931d74225773c2cea42a1 Reviewed-on: https://code.wireshark.org/review/17336 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-08-26RTPS: Added missing parametersJuanjo Martin2-0/+72
Added the dissection of three parameters. Change-Id: I07e7b655ad7fd3462625c2fb565e41593c62f897 Reviewed-on: https://code.wireshark.org/review/17346 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26QUIC: Update COL_INFO when packet is RST Stream and use rst stream code errorAlexis La Goutte1-2/+62
Issue reported by Lucas Pardue Change-Id: Ic3c53fce9751a556c5f1aa30d55687a60c9c6a4d Reviewed-on: https://code.wireshark.org/review/17345 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26QUIC: Update COL_INFO when packet is GOAWAYAlexis La Goutte1-0/+1
Issue reported by Lucas Perdue Change-Id: I4852f6bad7a4c98b345ff198b33ab560eacb5ed0 Reviewed-on: https://code.wireshark.org/review/17341 Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26QUIC: Fix some typo (copy/paste error) on GOAWAY/CONNECTION_CLOSE FrameAlexis La Goutte1-5/+5
Issue reported by Lucas Perdue Change-Id: I9c4ede6ba2fb0303aab05f1d59835e5a8b386a3e Reviewed-on: https://code.wireshark.org/review/17340 Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26qt: fix crash on Search Packet while redissectingPeter Wu1-2/+2
Before redissection, PacketList::freeze() is called which clears the model. This results in a NULL-deref when pressing Ctrl-F (Packet Search) or Ctrl-G (Go To Packet). Reproducer: in a large capture file, enter some display filter (e.g. "udp") and immediately press Ctrl-F. Thanks to Github user SNAPESNATCH for the initial report via IRC that included a helpful stack trace on Windows. Change-Id: If7334d6df4e9591fb1f2a52e3e2f837285b2959f Reviewed-on: https://code.wireshark.org/review/17326 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-08-25Handle ETH_P_CANFD as well as ETH_P_CAN.Guy Harris1-1/+7
Both of them need to have the CAN ID/flags field of the header byte-swapped as necessary to make sure it's in the *reading* host's byte order, not the *writing* host's byte order, if the two are different. Change-Id: Iac1589fdd9fe4d9ee6fbac8d821b48694d68919b Reviewed-on: https://code.wireshark.org/review/17333 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-25One more change for the removal of LINKTYPE_SOCKETCAN_HOSTENDIAN.Guy Harris1-5/+2
Change-Id: If1615e23efa30119fff5eb2935335c2cde34b89e Reviewed-on: https://code.wireshark.org/review/17330 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-25Go back to having only one SocketCAN LINKTYPE_ value.Guy Harris4-48/+5
Libpcap just backed out the "host-endian" SocketCAN LINKTYPE_ value; we don't need it any more. Change-Id: I33a7dc21207a0009e20b4abaefe1119eb649c39a Reviewed-on: https://code.wireshark.org/review/17327 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-25xmpp/xml: Store item length in xml_frame.Stig Bjørlykke3-14/+11
The created XML proto_item can be faked (if not visible and not referenced), so ensure we store the correct item length to be used in XMPP. This will avoid an invalid "Malformed Packet" for some XMPP packets. Change-Id: I79d805b725dbeb93f26a38b72bdcc84187aee16f Reviewed-on: https://code.wireshark.org/review/17324 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-08-25extcap: add binary name and version to help message.Dario Lombardo6-7/+16
Change-Id: I8f8083c817065cf66fd006a1caeb309d26209509 Reviewed-on: https://code.wireshark.org/review/17305 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-25xmpp: Add whitespace keepalive indicationStig Bjørlykke1-3/+8
RFC 6120 section 4.6.1 defines the use of a single whitespace as "whitespace keepalive", so indicate this in the Info column. Change-Id: I685431d91be2a37fbd66f8d1cdabe53f33092e93 Reviewed-on: https://code.wireshark.org/review/17323 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-08-25Expand comments.Guy Harris1-3/+11
Change-Id: I4e3de542d24c567434f4554917e826ccbd64cb6c Reviewed-on: https://code.wireshark.org/review/17319 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-25debian: Fix libwscodecs' symbols fileBalint Reczey1-1/+1
Change-Id: I842fd2339788c2cbe5ca88294aaf74bf9adc5ae2 Reviewed-on: https://code.wireshark.org/review/17285 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-25wsutil: fix indentation of interface.cDario Lombardo1-42/+42
Change-Id: Icf0c0c4ce1e3763eb385de24dc608a120e0f4af2 Reviewed-on: https://code.wireshark.org/review/17307 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-24dtls: remove unneeded checks (CID 1158712 & 1158716).Dario Lombardo1-13/+11
Change-Id: Id463f7746880f71f317bb52b40dc8b298965b4ec Reviewed-on: https://code.wireshark.org/review/17300 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-24HTTP2: Display PUSH_PROMISE Header in bytesAlexis La Goutte1-4/+4
and also use the name of spec for field (Header BLock Fragment Change-Id: I5a3884186258dac1f243f991a3392c875403eb97 Reviewed-on: https://code.wireshark.org/review/17310 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-08-24zbee-nwk-gp: don't THROW() an exception from a dissectorMartin Kaiser1-2/+21
show expert infos and return the number of bytes we dissected Change-Id: Ibb12372e8670380137f4fc3d012d0b0afa4cd638 Reviewed-on: https://code.wireshark.org/review/17313 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-24extcap: remove unused #define from ssh-base.Dario Lombardo1-2/+0
Change-Id: I52d26cb1e60452f8fa4d79f988fde2268486fc1c Reviewed-on: https://code.wireshark.org/review/17306 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-08-24IEEE 1722: Fixup ranges.Gerald Combs1-16/+16
Use RVALS + BASE_RANGE_STRING for range_strings. This should fix the "-G values" failure on the Win32 buildbot. Change-Id: I9a42b66a22b615d3de9c04b485adc7b9aa2cc154 Reviewed-on: https://code.wireshark.org/review/17309 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-24Fuzz test: Make Valgrind error detection more verbose.Gerald Combs1-0/+3
When we set VG_ERR_CNT=1 print the reason. Change-Id: Icb8f2a1e7074044521873b116fc891cc4be4b204 Reviewed-on: https://code.wireshark.org/review/17287 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-24Qt: add initializer (CID 1328485).Dario Lombardo1-0/+1
Change-Id: I1ce4ddc8bfb66522d4e472c258de2f928d5c776f Reviewed-on: https://code.wireshark.org/review/17298 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-24extcap: make extcaps use the version registered in config.Dario Lombardo5-5/+4
Change-Id: I12d0d0bec06e02af0a9d0877c0f0f1d86261d752 Reviewed-on: https://code.wireshark.org/review/17296 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-24call_heur_dissector_direct: do not trigger an assert if heuristic dissector ↵Pascal Quantin1-3/+3
rejects packet This can happen for example is the heuristics changed between the Wireshark version used to export PDUs, and the one used to open the file. Instead, call data dissector. Change-Id: I29f7754f883fd710c3557a610583ef988ca13e43 Reviewed-on: https://code.wireshark.org/review/17280 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-24SCSI: Mode Sense 10: Wrong block descriptor lengthAlexis La Goutte1-3/+3
Issue reported by Sharon Samuel Enoch Bug:12780 Change-Id: I94ad5355cdfa4d8cd3915c9e261931ff56dc765b Reviewed-on: https://code.wireshark.org/review/17272 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-08-24IPMI: do not use col_set_str with non const stringsPascal Quantin1-1/+1
Bug: 12782 Change-Id: Ia082ccf5355d7f8dd6073861c59c804fecc96266 Reviewed-on: https://code.wireshark.org/review/17289 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-24ISAKMP: remove useless callbackPascal Quantin1-9/+1
isakmp_cleanup_protocol() and isakmp_init_protocol() are already registered as cleanup and init routines Change-Id: I4fd2348dc507c8bc933aebd5abfb2522b57da0b4 Reviewed-on: https://code.wireshark.org/review/17284 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>