summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-15[docsis->type29ucd] Remove Type 4 Burst from Type 29 UCDAdrianSimionov1-154/+2
Most probably this was a copy/paste from packet-ucd.c Type 4 and Type 5 bursts exist only in Type 2 UCD message. Type 29, 35 and 51 UCD messages have only type 5 bursts. Change-Id: I016e6b47c28f2cf69befa495848058c038603b46 Reviewed-on: https://code.wireshark.org/review/11841 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-15Lua: Fixed some argument # in argument errors.Stig Bjørlykke1-4/+4
Change-Id: I1dba41c9f129d368096dd69a0f40fa2164311124 Reviewed-on: https://code.wireshark.org/review/11852 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-15Try retroactively applying the Qt folks' fix for QTBUG-47942.Guy Harris1-43/+27
The current version of the fix only adds -fPIC under certain circumstances; we check whether it was added and, if it was, and those circumstances are *not* in effect, we remove it. Bug: 11643 Change-Id: I75d0ff9b4781d7d4cd884a29bbce7d392939315c Reviewed-on: https://code.wireshark.org/review/11849 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-15FindLUA.cmake: reject version 5.3Peter Wu1-14/+22
Lua 5.3 could still be used when located at /usr/include/lua.h. Detect and reject it in that case. Rename LUA_VERSION to LUA_VERSION_NUM to avoid a conflict with pkg-config (which uses a different version format). Ensure that the regex matches a number only. Bug: 11706 Change-Id: Idb7e3e1a8d9c6e4ab9ab1816c4dedea7de9dde8e Reviewed-on: https://code.wireshark.org/review/11836 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-11-15Lua: Check for nil valuestring for integer fields.Stig Bjørlykke1-1/+1
Added a check for nil valuestring for all ProtoField integer types to avoid lookup when argument is not set. Change-Id: Ib4c016b69ee77dbea4bb83ac93c0d9ae9f48f236 Reviewed-on: https://code.wireshark.org/review/11845 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-15gtk: Fixed out-of-source autotools build.Stig Bjørlykke1-1/+1
Change-Id: Ic9b93aee15b015d51d666a1c6f4f358f689e8843 Ping-Bug: 10750 Reviewed-on: https://code.wireshark.org/review/11842 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>
2015-11-15Lua: Added support for ProtoField framenum type.Stig Bjørlykke5-7/+46
Change-Id: I1d4cddd4026f08416005f2b3212536b3984d1a8d Reviewed-on: https://code.wireshark.org/review/11834 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>
2015-11-15udp: Don't mark zero checksum illegal when in_error_pkt.Stig Bjørlykke1-1/+1
A zero checksum is not illegal in IPv6/UDP when in a ICMPv6 packet. Change-Id: I07acc874d2385992089ef3ebc7a82e853904ecfc Ping-Bug: 6232 Reviewed-on: https://code.wireshark.org/review/11808 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-15[Automatic update for 2015-11-15]Gerald Combs17-5926/+6602
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7a2eaecb6f24992cb3023919c8bd8af2c15192c3 Reviewed-on: https://code.wireshark.org/review/11838 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-15[docsis->ucd] Add support for 6 new TLVsAdrianSimionov1-5/+244
Change-Id: I65a40b1765f8433c47acbc34452d5336d7df84c1 Reviewed-on: https://code.wireshark.org/review/11788 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-15[docsis->packet-tlv.c] Updated Confirmation Code list per MULPIv3.1-I07 ↵AdrianSimionov1-5/+62
Annex C.4 Change-Id: Id6ec9776545c79a4f8e21fd212b87ddcd9fd376f Reviewed-on: https://code.wireshark.org/review/11829 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14register_dissector -> new_register_dissector for plugins.Michael Mann60-183/+246
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie98e071a7cb568c13c8958de56b1fc25a4ce2ce9 Reviewed-on: https://code.wireshark.org/review/11831 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14register_dissector -> new_register_dissectorMichael Mann70-549/+586
Picking off "easy" dissectors that only have one or two exit points at most. This concludes a "first pass" over the dissector directory. Change-Id: If5ce5484214be50fe541cba478da1de62e354297 Reviewed-on: https://code.wireshark.org/review/11830 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14Lua: Disallow ProtoField FRAMENUM to fetch from Tvb.Stig Bjørlykke1-0/+4
A ProtField type FRAMENUM cannot fetch value from a Tvb. Change-Id: Iff0f6df8b00445855c9030dcfa753daa62262171 Reviewed-on: https://code.wireshark.org/review/11832 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-14Qt: Fixed use-of-deallocated-memory when removing a profile.Stig Bjørlykke1-1/+2
The memory used for profile item data is accessed in updateWidgets() which is called when setting the Default profile as selected. Ensure we free this memory after this has happened. Bug: 11705 Change-Id: I79e12d918289e1fcf25331c39439e9c6f3b774d5 Reviewed-on: https://code.wireshark.org/review/11827 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-14register_dissector -> new_register_dissectorMichael Mann49-317/+330
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14UDP Multicast Stats: Fixed typoUli Heilmeier1-2/+2
Change-Id: I98d6ef48448b32f57349facb2bbef538319c5da4 Reviewed-on: https://code.wireshark.org/review/11825 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-14p_mul: Fixed ack framenum links.Stig Bjørlykke1-3/+11
The ack symbol is for the Address PDU beeing acked. Also use the DUP_ACK symbol for P_Mul's Ack-Ack. Change-Id: I3da616e95e9c2cf889b1e4e4c0570ab0c276a2d2 Reviewed-on: https://code.wireshark.org/review/11819 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>
2015-11-14dmp: Fixed ack framenum links.Stig Bjørlykke1-4/+16
The ack symbol is for the Message, Report or Notification beeing acked. Change-Id: I5ef99b9e7830f437278af18e681f8200fab6c3d4 Reviewed-on: https://code.wireshark.org/review/11818 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>
2015-11-14airpdcap_system.(h) fix parameter 'mngHandshake/mngDecrypt' not found in the ↵Alexis La Goutte1-4/+3
function declaration [-Wdocumentation] Change-Id: I0d0c1a3dde14d9817aef28352081dfbfbac6c9fb Reviewed-on: https://code.wireshark.org/review/11774 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: Michael Mann <mmann78@netscape.net>
2015-11-13Makefile.nmake: add randpkt-core.obj to the list of cleaned objectsPascal Quantin1-1/+1
Change-Id: I36ecc9830ead2a0f6a470b4e62440fe9555df363 Reviewed-on: https://code.wireshark.org/review/11813 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-13register_dissector -> new_register_dissectorMichael Mann48-264/+310
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8 Reviewed-on: https://code.wireshark.org/review/11805 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-13Diameter: fix typo in dictionaryPascal Quantin1-1/+1
Change-Id: I164ce634536ec1a3de650d815e23cdd6102e2fde Reviewed-on: https://code.wireshark.org/review/11809 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-13CMake: add our own FindCygwin modulePascal Quantin2-0/+72
The one from official CMake (3.3.2) does not look for the default 64bits installation path. Let's add it. Also add a WIRESHARK_CYGWIN_INSTALL_PATH environment variable allowing to force it. For reference, registry based detection fails to detect a 64bits installation because it gets redirected to the Wow6432 node. Change-Id: If3172494e3ab232e094389b493e6b67023662ae5 Reviewed-on: https://code.wireshark.org/review/11769 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-13epan: Free cf->edt before free cf->epan when redissecting.Stig Bjørlykke1-0/+2
This because cf->edt->pi is pointing to data allocated in wmem_file_scope and epan_free() will free all data in wmem_file_scope. In Qt packet_list_clear() we check and use cf->edt, which will give a heap-use-after-free error. Change-Id: I97d532ba976b7bc5fe2995a224ca168edf3da38b Reviewed-on: https://code.wireshark.org/review/11803 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-13Diameter dictionary updated.Branislav Makan1-9/+30
Added values for diameter AVP codes: 1085 Redirect-Information Grouped 1086 Redirect- Support Enumerated 1087 TDF-Information Grouped 1088 TDF-Application-Identifier OctetString 1089 TDF-Destination-Host DiameterIdentity 1090 TDF-Destination-Realm DiameterIdentity Change-Id: I8ba7a56a5a51b32a21a602751275e9ab254adbae Reviewed-on: https://code.wireshark.org/review/11801 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13Qt: Add go to next + previous packet in conversation.Gerald Combs4-1/+92
Add "Go→Next Packet in Conversation" and "Go→Previous Packet in Conversation" menu items. Make sure the shortucts ("Ctrl+." and "Ctrl+,") don't get switched to "Cmd+." and "Cmd+," on OS X. "Cmd+," is already taken by the preferences dialog. Change-Id: Iab9c7f60fdcf55f12c055b4d0948019bf667ebc9 Reviewed-on: https://code.wireshark.org/review/11771 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13p_mul: Enhance ack framenum links.Stig Bjørlykke1-1/+1
Change-Id: I084b43fcd8419741c2de007bd03fc04532346813 Reviewed-on: https://code.wireshark.org/review/11797 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-13dmp: Enhance ack framenum links.Stig Bjørlykke1-1/+1
Change-Id: Iade2d06512bacbeff3e7446487a03d4f73dba721 Reviewed-on: https://code.wireshark.org/review/11796 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-13Fix compilation when _DEBUG is defined.Gerald Combs2-3/+10
CMake's Visual C++ generator creates projects that compile with the Debug configuration by default, which defines _DEBUG. Fix DEBUG_DUMP's declaration so that we compile in that case. While we're here note that the "airpd" prefix isn't limited to AirPcap, so we might want to change it accordingly. Change-Id: I5476f28c63020f0f66ee9128731bc4b3dc720765 Reviewed-on: https://code.wireshark.org/review/11787 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13[docsis] Support for Queue Depth-based Request FrameAdrianSimionov1-6/+37
Change-Id: Ieeb79e4e248bdd8ee239c003e41ede0955e1cf86 Reviewed-on: https://code.wireshark.org/review/11766 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13Diameter: Expand an error message.Gerald Combs1-2/+2
If we encounter the wrong ftype, print its name. Change-Id: I7405ccdd3e099f533c6a8aaf81b60faf4093741a Reviewed-on: https://code.wireshark.org/review/11790 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-13Qt: fix creation of a new profile broken by g328fbc0Pascal Quantin1-1/+3
Change-Id: Icbe8dbf6f0c4267d7ed4704f78e589a1a48e1424 Reviewed-on: https://code.wireshark.org/review/11783 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>
2015-11-13Qt: Fixed signal name to avoid a warning.Stig Bjørlykke2-16/+16
Also terminate stream lines with endl. Change-Id: Icbbe5b47695506888c03607ff0af66c59306faae Reviewed-on: https://code.wireshark.org/review/11778 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>
2015-11-13MEGACO: fix indent (remove tab)Alexis La Goutte1-1/+1
Change-Id: I58c5ffc377d268cfb3d245e5bd2165a38dda0457 Reviewed-on: https://code.wireshark.org/review/11779 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-13Qt: Coloring Rules dialog fixups.Gerald Combs4-9/+22
Insert new rules at the top. This matches the GTK+ UI behavior. Recolor the packet list when we press "OK". Add a "to do" item about setting the filter column width. Change-Id: I2a9e58fe8642a89f12e1c34622b96613f3ec4c05 Reviewed-on: https://code.wireshark.org/review/11781 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-13Qt: fix UI artifacts seen in UAT window on Linux or OSXPascal Quantin1-0/+3
The QLabel::clear() method call does not seem to repaint the area on those platforms. Let's force an update of the widget. Bug: 11695 Change-Id: I9c708c8537140b26582e4365ceee3271eac23259 Reviewed-on: https://code.wireshark.org/review/11782 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-12Developer guide: add docbook-xml45 to the list of required Cygwin packagesPascal Quantin1-1/+3
Change-Id: Id0a241361160b03c16a6a9152c8f1a86f87b9db1 Reviewed-on: https://code.wireshark.org/review/11784 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-12Fix installation of desktop files.Guy Harris1-1/+1
Change-Id: I33ed9741db9a50098b8c7c85409f3e6a0c2e2f15 Reviewed-on: https://code.wireshark.org/review/11772 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12[configure.ac] Update gtk+ and glib release date listsBill Meier1-0/+2
Change-Id: I79f063fece531ae5e75b0c2a96682827f74489bf Reviewed-on: https://code.wireshark.org/review/11770 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-11-12Qt: initialize all remote interface optionsPascal Quantin1-0/+8
Bug: 11699 Bug: 11701 Change-Id: Ib470e69bba015a006f9360cfdb429a816b80e37c Reviewed-on: https://code.wireshark.org/review/11767 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>
2015-11-12[IMF] Add bounds checks to avoid buffer overruns,DiablosOffens1-4/+13
also sets the last_field flag to true if it's the end of the buffer. Change-Id: I135d052fce04807ce61b5feb9af121ff4528f595 Reviewed-on: https://code.wireshark.org/review/11731 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>
2015-11-12Put back ' in user guide namePascal Quantin1-1/+1
CMake generated CHM supports it properly, contrary to NMake. As this is the future, let's put it back! Change-Id: Ifc5ea84942043c04808546df75ae956effa16747 Reviewed-on: https://code.wireshark.org/review/11763 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-12Squelch a compiler warning.Guy Harris1-1/+1
Change-Id: I9e9746dc5f17daea7830ddc37f5df0ba16def397 Reviewed-on: https://code.wireshark.org/review/11762 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde33-11052/+11389
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@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>
2015-11-12Fix up documentation of RPM packages.Jeff Morriss3-12/+43
Specify which ./configure options are passed into the RPM. Describe the 3 package RPM package names and their contents. Describe how to enable parallel builds when making RPMs. RPM now stands for "RPM Package Manager." Fix some markup problems. Change-Id: I1664aa0956719e872d302a4af2c092318f5eea6d Reviewed-on: https://code.wireshark.org/review/11737 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12Qt: save preferences after creating a filter from expression framePascal Quantin1-0/+2
Bug: 11690 Change-Id: Ice6a2341d3f39c107a3c9d6a0e23fd98312b48a8 Reviewed-on: https://code.wireshark.org/review/11748 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>
2015-11-12Qt: Added IO Graph save to clipboard button.Stig Bjørlykke2-5/+72
Also added save as CSV file. Do not add double quotes for values as we do in GTK. Change-Id: I8576a73e10b71cdba0c8c80db8b21927d19528da Reviewed-on: https://code.wireshark.org/review/11732 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12dissector for ISO14443 protocolsMartin Kaiser4-0/+596
This is a dissector for the ISO14443 protocols between a contactless smartcard and a card reader. The overall approach is similar to DVB-CI. We have a pseudo-header in front of the captured data that has information about the type of the captured data and the direction. For now, the dissector registers itself by name so it can be linked to a user-DLT. I am applying for an official DLT. Change-Id: I9c4a28ef5b220f205baf58381bf1962996887a9d Reviewed-on: https://code.wireshark.org/review/11663 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> 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>
2015-11-12Use format_text() when displaying, not when handing to AirPDcap.Guy Harris1-16/+56
format_text() is specifically intended to handle strings when displaying them to the user; code such as AirPDCap, which doesn't display strings to the user, should be handed the raw SSID. Put in a comment indicating what we probably *should* be doing here. Bug: 11685 Change-Id: Ic30114c35d1d8f3d791ae904e33a4d81ddc215ec Reviewed-on: https://code.wireshark.org/review/11757 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-12 07:08:28 +0000