aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-04-25autotools: use AM_CONDITIONAL for rpm build ruleJoão Valverde3-36/+30
Change-Id: Ia97966e28cf7d061694336fb00b9a0790f0d57bb Reviewed-on: https://code.wireshark.org/review/15067 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-25Qt: Speed up the Display Filter Expression dialog appearance.Gerald Combs3-34/+60
Copy over and adapt SupportedProtocolsDialog::fillTree, which fills in the protocol tree after the dialog is shown processes display events while the tree is being built. Change-Id: I25082fd94c511db6a94aaed1c463ba1c1e64855c Reviewed-on: https://code.wireshark.org/review/15079 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-25Fix nmake build after statically linking version codeMichael Mann5-5/+6
Change-Id: I86a01bdd778f2242aa534a687275a85a2f329c02 Reviewed-on: https://code.wireshark.org/review/15071 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-25gpef: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I6a302ce6dc18850e6ccc0995c60c4a010e46ad30 Reviewed-on: https://code.wireshark.org/review/15104 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-04-25gmr1_bcch: fix 'tree' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I9a1950e3719927178221999c33f41920e1e4065a Reviewed-on: https://code.wireshark.org/review/15103 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25gmhdr: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: Ib86b2665ad8000b6c4a4ce69b3284a7f0e235115 Reviewed-on: https://code.wireshark.org/review/15102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25glusterfs (hndsk): fix 'pinfo/data' was marked unused but was used ↵Alexis La Goutte1-6/+6
[-Werror,-Wused-but-marked-unused] Change-Id: I5177c0bfdfb010a76ee2763030a32eafb9a6d1f2 Reviewed-on: https://code.wireshark.org/review/15101 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25glusterfs: fix 'pinfo/data' was marked unused but was used ↵Alexis La Goutte1-27/+27
[-Werror,-Wused-but-marked-unused] Change-Id: I5694867029d5d40de6dbe5c617aee70ac62d7139 Reviewed-on: https://code.wireshark.org/review/15100 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25glusterd: fix 'data' was marked unused but was used ↵Alexis La Goutte1-14/+14
[-Werror,-Wused-but-marked-unused] Change-Id: Id3aa0972503ffcd238148ab0283ec4ea1a0a478c Reviewed-on: https://code.wireshark.org/review/15099 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25gluster_pmap: fix 'data' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: Idaa9515c8b9a74de3fdeba5cb2dbda195adbe3bf Reviewed-on: https://code.wireshark.org/review/15098 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25gluster_cli: fix 'data' was marked unused but was used ↵Alexis La Goutte1-6/+6
[-Werror,-Wused-but-marked-unused] Change-Id: I969403ac48dbec1ad765e799fcf0cb5b76cd83c7 Reviewed-on: https://code.wireshark.org/review/15097 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25gdsdb: fix 'tvb/pinfo' was marked unused but was used ↵Alexis La Goutte1-3/+3
[-Werror,-Wused-but-marked-unused] Change-Id: I53e99b2fc2a0549984d39a9f1fb1de610d4e645c Reviewed-on: https://code.wireshark.org/review/15096 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25gdb: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I8d990808fcfa29494e392721185e987709340c30 Reviewed-on: https://code.wireshark.org/review/15095 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25gadu-gadu: fix 'tvb/tree' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I0f7a4f06b5274f00d0f2ff4a0002fb694a6e3e9b Reviewed-on: https://code.wireshark.org/review/15094 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fr: fix 'pseudo_header' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I06ceb2d54d1c3dfeaf3f5e80980687e5f68bc4bc Reviewed-on: https://code.wireshark.org/review/15093 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fp (hint): fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I68a8a79ab27a6469512d4a3f26695a37ad307b11 Reviewed-on: https://code.wireshark.org/review/15092 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fmp (notify): fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: Ib993d34e0def7c4f0c604357910635dfc4b41795 Reviewed-on: https://code.wireshark.org/review/15091 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fmp: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I0231224daf4754a7b7869e6f25fc3840772a6a3e Reviewed-on: https://code.wireshark.org/review/15090 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fddi: fix 'pseudo_header' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I678ff2c87895bd46ba0df21464b730f54d77af6b Reviewed-on: https://code.wireshark.org/review/15089 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fcswils: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I74cd8bace880abb944a81adc6342b6f9608c789d Reviewed-on: https://code.wireshark.org/review/15088 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fcp: fix 'conversation' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I7ae05ed186cfd1df639c9c453e4b5fa5c02972d7 Reviewed-on: https://code.wireshark.org/review/15087 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25fcels: fix 'pinfo' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: I172b089c65db5cc5289cb1a09edbaaaa760dbf31 Reviewed-on: https://code.wireshark.org/review/15086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25extreme: fix 'length' was marked unused but was used ↵Alexis La Goutte1-2/+2
[-Werror,-Wused-but-marked-unused] Change-Id: Ibcf68c1172cc8080ec59da51b2c6765a6efcd4fa Reviewed-on: https://code.wireshark.org/review/15085 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25eth: fix 'pseudo_header' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I81910fc457afcc1b07a27aea986e1a0c2257b45b Reviewed-on: https://code.wireshark.org/review/15084 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25enc: fix 'pseudo_header' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I6c2c07ba23be60c3f335cd08c282784b8e5822c4 Reviewed-on: https://code.wireshark.org/review/15081 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25mplog: fix 'err_info' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: Ifbbd9d264c7d75b6df754ca9834de5e415b97796 Reviewed-on: https://code.wireshark.org/review/15080 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25ENRP: fix 'flags_tree' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I28020e50212f32703b8c0126a5e880769f950cea Reviewed-on: https://code.wireshark.org/review/15082 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25EPL: fix 'segmented' was marked unused but was used ↵Alexis La Goutte1-1/+1
[-Werror,-Wused-but-marked-unused] Change-Id: I90109f724c47684a2413fe3eca9fa73d2f637cbe Reviewed-on: https://code.wireshark.org/review/15083 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-04-25Compile sshdump and ciscodump for WindowsPascal Quantin18-34/+81
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-24[Automatic update for 2016-04-24]Gerald Combs18-1520/+906
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id3a7e3cf248df0c1c0159b4bf1d1a01e3f83efb9 Reviewed-on: https://code.wireshark.org/review/15074 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-24Delay registration of Diameter fields until they're needed.Jeff Morriss1-20/+35
... Like the RADIUS and wimaxasncp dissectors do. Change-Id: Ifab019a0040d3938e52918a282a3beba9dfcfc70 Reviewed-on: https://code.wireshark.org/review/14900 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-24Qt UAT: call the UAT update callback after each field is updated.Jeff Morriss1-3/+15
This fixes a crash when changing the SCCP dissector's users table when finishing the edit of a string column by clicking elsewhere (rather than pressing Enter/Return) or when changing an enum column. (The SCCP dissector depends on that update callback being called before the copy callback.) To do this: 1) Use the editingFinished signal rather than looking for Enter/Return key presses (so that a focus change is processed as the end of an edit). 2) Call the update callback when an enum field changes. Bug: 12364 Change-Id: I1884c67b6e873b46afe33703581d0b3dccbbdaf1 Reviewed-on: https://code.wireshark.org/review/15059 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-23Bounds check the use of ett_zbee_zcl_pwr_prof_enphases array.Michael Mann1-2/+2
Bug: 12358 Change-Id: Iec5dcba388f06e1fd1ef26f0679b06c3dda6a7bf Reviewed-on: https://code.wireshark.org/review/15072 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: Anders Broman <a.broman58@gmail.com>
2016-04-23ETSI CAT: add dissection of Information Elements coded as EFadnPascal Quantin2-11/+199
While we are at it, fix decoding of STK packed SMS Change-Id: I2de757f1720381c75f23f3ee6043ac56813db658 Reviewed-on: https://code.wireshark.org/review/15054 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-04-23autotools: Fix rpm-package targetJoão Valverde2-4/+7
Change-Id: I6012199370a17d534ba7633509cd95c8a81aaebd Reviewed-on: https://code.wireshark.org/review/15062 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-23iso14443: use the array_length() macroMartin Kaiser1-2/+1
Change-Id: Id4431885fb78d8d8679e98111d9f007491c3f13e Reviewed-on: https://code.wireshark.org/review/15069 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-23addr_resolv: don't free the same wmem_list entry twiceMartin Kaiser1-0/+2
fetch the list head each time we iterate through the list if we don't, we crash when the same entry is removed a second time #0 wmem_block_remove_from_block_list (block=0x7fffecd7b1c0, allocator=<optimized out>) at wmem_allocator_block.c:738 #1 wmem_block_free_jumbo (chunk=0x7fffecd7b1d0, allocator=0x65c060) at wmem_allocator_block.c:822 #2 wmem_block_free (private_data=0x65c060, ptr=0x7fffecd7b1e0) at wmem_allocator_block.c:913 #3 0x00007ffff452eac1 in host_name_lookup_process () at addr_resolv.c:2466 #4 0x000000000041733d in process_packet (cf=cf@entry=0x63fe20, edt=edt@entry=0xce08f0, offset=<optimized out>, whdr=0xc97c70, pd=pd@entry=0xc9f550 "", tap_flags=tap_flags@entry=0) at tshark.c:3699 #5 0x000000000040f199 in load_cap_file (max_byte_count=13197776, max_packet_count=<optimized out>, out_file_name_res=0, out_file_type=2, save_file=0x0, cf=<optimized out>) at tshark.c:3483 #6 main (argc=<optimized out>, argv=<optimized out>) at tshark.c:2192 Change-Id: I1ac813242188842130f4070ef326b12fe23b782f Reviewed-on: https://code.wireshark.org/review/15068 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-23Get rid of unnecessary method override.Guy Harris2-6/+0
The conversation dialog doesn't do anything different with the name resolution checkbox than any other subclasses of the traffic table dialog do, so leave it up to the parent class. Change-Id: I07f6c09b931ed10655f5921c0a4ab5d439dd6bcd Reviewed-on: https://code.wireshark.org/review/15065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-23Forcibly update all items if name resolution is turned on or off.Guy Harris6-23/+39
This makes the display change if you turn the name resolution checkbox on or off. Change-Id: I873832b103b61e1e566523a1ae1c4211937c7bae Reviewed-on: https://code.wireshark.org/review/15063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-22Don't fail in host_name_lookup_init() if manually resolved lists exist.Guy Harris1-4/+4
Those lists aren't destroyed by host_name_lookup_cleanup(), so don't assume in host_name_lookup_init() that they don't exist; just create them if they don't exist and leave them alone if they do. (GSLists and GLists are different from wmem_lists - a pointer to a GLib list is just a pointer to a list element, so an empty list is represented by a null pointer, but a wmem_list has a structure containing other information, so an empty list has null list pointers in that structure, and a null wmem_list * means the list doesn't exist at all.) Change-Id: I88c00cc9ac0812ab71adc70e3300ab3829fee8ab Reviewed-on: https://code.wireshark.org/review/15061 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-22There's no version.h.in file.Guy Harris1-1/+0
Change-Id: Ia9c956d5b1f653f111e012fccc892246fcaa8b4b Reviewed-on: https://code.wireshark.org/review/15060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-22Add CMake version.h dependencyJoão Valverde4-8/+24
Remove the need for version.h.in and bring CMake up to par with autotools. Change-Id: I701b56c475f5fdec1f9a028536fff6992ce8eaca Reviewed-on: https://code.wireshark.org/review/15031 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-04-22extcap_parser: remove const warning.Dario Lombardo1-1/+1
Change-Id: I94c3ec81c2b88c987bc07352c6b1909d2226ee54 Reviewed-on: https://code.wireshark.org/review/14828 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22netlogon (DCERPC): fix build error unused parameter when don't have KERBEROS libAlexis La Goutte1-8/+9
Reported by Uli https://www.wireshark.org/lists/wireshark-dev/201604/msg00172.html and Benjamin https://code.wireshark.org/review/#/c/14971/ Use fix proposed by Guy https://www.wireshark.org/lists/wireshark-dev/201604/msg00176.html Change-Id: I4ca4fc3b9a9b52217f2675cb968125d97d94ed2e Reviewed-on: https://code.wireshark.org/review/15036 Reviewed-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Uli Heilmeier <openid@heilmeier.eu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22tvbuff_composite.c: do not recompute abs_lengthPascal Quantin1-5/+0
abs_length is already computed by the caller of composite_get_ptr (ensure_contiguous_no_exception). No need to do the work another time Change-Id: I93edd6d405b2d5afe99dc7c781ecea4b395ef7bd Reviewed-on: https://code.wireshark.org/review/15053 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: Anders Broman <a.broman58@gmail.com>
2016-04-22addr_resolv: change g_slist to wmem_list.Dario Lombardo1-27/+26
Change-Id: Ifde09174e50bc2a9d695ac0a823e63f645284a10 Reviewed-on: https://code.wireshark.org/review/15050 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-04-22[SGsAP] IMSI is a TLV type IE in SGsAP-MO-CSFB-INDICATION messageCathy Yang1-2/+2
Change-Id: I4abee8bbf160771f88693dadd7f4658e7229c4dd Reviewed-on: https://code.wireshark.org/review/15052 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22Add mplog to the list of file extensions understood by Wireshark.Jeff Morriss1-0/+1
By putting it in this list the File->Open dialog will include an option for *.mplog files. Change-Id: Icf6480f7be1023650262fc1f3996a390e137cb88 Reviewed-on: https://code.wireshark.org/review/15048 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22ansi: make ett array static.Dario Lombardo1-14/+2
Change-Id: I1ba044feb581cd00c928269c02555d31970e9a42 Reviewed-on: https://code.wireshark.org/review/14891 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-22epl: change g_malloc to wmem_alloc.Dario Lombardo1-2/+2
Change-Id: I3d099047be2a4ef0e104f5f54b6b458387e7a1f0 Reviewed-on: https://code.wireshark.org/review/14928 Reviewed-by: Christoph Schlosser <christoph@schlosser.xyz> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 13:25:26 +0000