aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-30Add editor modelines; Adjust whitespace as needed.Bill Meier99-1755/+3044
Change-Id: I434da226c842298f4fb2a4335d06d51e164af2af Reviewed-on: https://code.wireshark.org/review/4394 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30Note why strlen(args) could be < linelen.Guy Harris1-0/+5
Change-Id: I8fb3c35be0aa80895b8a917af8a9fd2542fbd9d6 Reviewed-on: https://code.wireshark.org/review/4393 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-30correct the line length if it was longer than the actual string suppliedMartin Kaiser1-0/+2
by the caller Bug: 10516 Change-Id: Ib2c9ab449b95da92cc889d0992fad30f432a2836 Reviewed-on: https://code.wireshark.org/review/4386 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-30Add editor modelines; Adjust whitespace; Remove boilerplate commentsBill Meier75-2374/+3242
Change-Id: I1f5f83ed441f6009125cf2cbe5023af04986898a Reviewed-on: https://code.wireshark.org/review/4392 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-fp_umts_fp.c: variousBill Meier1-129/+147
- Use #if 0/#endif to comment out code instead of /* ... */ = Add editor modelines and adjust whitespace as needed. Change-Id: I6f7e18a7955cd17d6d727090de802374a7cae0c4 Reviewed-on: https://code.wireshark.org/review/4391 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-ses.[hc], packet-pres.c: various:Bill Meier4-324/+352
- Create/use extended value-strings; - Move proto-register...() to (near) the end of the file; - Add editor modelines and adjust whitespace as needed. Change-Id: I7ebe6dfd62b3fb190aa1cefc9b35d40f156f11ea Reviewed-on: https://code.wireshark.org/review/4390 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-simulcrypt.c: variousBill Meier1-25/+51
- Add/use several extended value strings; - Add (what appear to be) 3 missing entries to a value-string array; - Add editor mode-lines and adjust whitespace as needed. Change-Id: Ia3bea3c52130ae07d1f0c271659fb010abecb179 Reviewed-on: https://code.wireshark.org/review/4389 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-sscop.c: various:Bill Meier1-136/+151
- Add/use extended value-string; - Add editor-modelines and adjust whitespace as needed. Change-Id: I5e03d6bcaeb2f4beee37ad4778a87657ae82128d Reviewed-on: https://code.wireshark.org/review/4388 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-mgcp.[hc]: Various changes:Bill Meier2-382/+409
- Add/use extended value-string; - Move proto_register...() and proto_reg_handoff...() to the end of the file; - Add editor modelines and adjust whitespace as appropriate. Change-Id: Iede67c418d9f2b4e263113bb14e77d6a56a16225 Reviewed-on: https://code.wireshark.org/review/4387 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30Add more HAVE_LIBPCAP checks.Gerald Combs2-1/+5
Change-Id: I82e62f6be03a2ae1617cd5b8e430b73ca8fbe7f8 Reviewed-on: https://code.wireshark.org/review/4385 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-30Qt: Finish implementing -gGerald Combs1-4/+8
Should fix the current dist failure. Change-Id: Ib1b8d92f6267040c9eef2e4c27ca78c6dd0631be Reviewed-on: https://code.wireshark.org/review/4384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-30Qt: Try to fix libpcap-less builds.Gerald Combs1-1/+2
Change-Id: I64f4d6490388858306180445b58863d57217986a Reviewed-on: https://code.wireshark.org/review/4383 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-30Qt: Start capture from the command line.Gerald Combs5-28/+205
Fill in the capture-related mise en place so that -k and -i work. Get rid of global_capture_session in ui/qt and make it a member of MainWindow. Copy over privilege checking from GTK+. Move the global capture session struct to MainWindow. Change-Id: Iab5ec683860a40255a7e1d82e3872ced24fd55cb Reviewed-on: https://code.wireshark.org/review/4382 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-29GTK+: Revert back to 2.24.14-1.1 on Win64.Gerald Combs3-7/+13
As Pascal discovered in https://www.wireshark.org/lists/wireshark-dev/201409/msg00045.html Wireshark-gtk.exe crashes at startup on Windows 8.1 x64 when compiled with the GTK+ 2.24.23-1.1 bundle and Visual C++ 2013. Revert to the Win64 build to the prior GTK+ bundle, which works on my test system. Update the release notes. Make sure we use a libintl-8.dll that's compatible with GnuTLS. Ideally we'd just upgrade or rebuild the GTK+ bundle but so far that hasn't worked. Prior to this I tried: Updating the gtk2 package at build.opensuse.org to 2.24.24. This fails with [ 187s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/gtk+-2.24.24/gtk' [ 187s] /usr/bin/gtk-update-icon-cache --force --ignore-theme-index \ [ 187s] --include-image-data \ [ 187s] --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ [ 187s] mv gtkbuiltincache.h.tmp gtkbuiltincache.h [ 187s] gtk-update-icon-cache: No theme index file. [ 187s] make[2]: *** [gtkbuiltincache.h] Error 1 Switching to the OBS GTK+ 3.14 package. It looks like a lot of our GTK+ code is deprecated, including GtkAction and GtkAttachOptions. Change-Id: I1548c84022f02895e5d424cd61e0fed7b57b2e75 Ping-Bug: 9914 Reviewed-on: https://code.wireshark.org/review/4379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-29Improve filterability of GTP dissector.Michael Mann1-161/+255
Eliminated many, but not all proto_tree_add_text calls (mostly thanks to convert_proto_tree_add_text.pl) Change-Id: I37d22ca9816ae1a3a42d911abeb73f7ba49f77d3 Reviewed-on: https://code.wireshark.org/review/4378 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>
2014-09-29Improve filterability of RSVP dissector.Michael Mann1-409/+453
Eliminated many, but not all proto_tree_add_text calls. Change-Id: Ic904a0019a9d5d64d47b562bd282f1e6fad617cb Reviewed-on: https://code.wireshark.org/review/4366 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-29High Throughput is 11n, not 11g or 11a.Guy Harris1-6/+6
Change-Id: I86b6dac9cf3f1f524c1168d675bff4a04e361cee Reviewed-on: https://code.wireshark.org/review/4374 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-29Add editor modelines and adjust indentation as needed.Bill Meier39-4397/+4904
Change-Id: I857700d685354b0bc9e0ca647c57faba981b520f Reviewed-on: https://code.wireshark.org/review/4373 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29Add editor modelines and adjust indentation as needed.Bill Meier71-255/+1145
Change-Id: Id57d264299f2026d703c5b08bace4b24b32f184c Reviewed-on: https://code.wireshark.org/review/4371 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29Add KNXnetIP and DSR to the list of new-to-1.99 protocols. Add the former'sJeff Morriss3-13/+20
author to AUTHORS. Also mention support of nanosecond timestamps in PCAP-NG files. Change-Id: I31666de845240a311a8332cff42120d78d2d1474 Reviewed-on: https://code.wireshark.org/review/4367 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29Fix lua bindings for timestamp precisionHadriel Kaplan1-0/+2
The changes to the timestamp define names broke the init.lua file generation. Change-id Id0c27b31c5 tried to fix this, but would break backwards compatibility of exisitng Lua scripts. This commit fixes that change by adding the timestamp variables in both a new Lua table as well as the old filetypes table. Change-Id: I74749acb51dc85094e8c63b240a1951bd4cc0330 Reviewed-on: https://code.wireshark.org/review/4370 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29Dissect more of the Presence Reporting Area Action IE.AndersBroman1-3/+71
Change-Id: I4bf0c7890fff4162e1cf5faad8dd0ca008e0dbe6 Reviewed-on: https://code.wireshark.org/review/4368 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29Add missing use of a value_string definitionEvan Huus1-1/+1
Change-Id: I865256633dbcc378b53eeabb62fcf84c617ea1b9 Reviewed-on: https://code.wireshark.org/review/4365 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29Fix a broken commentAndersBroman1-1/+1
Change-Id: I4358c118ec890456468d7aa8eda00fb0ddbaea20 Reviewed-on: https://code.wireshark.org/review/4364 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29Add editor modelines; fix indentation as needed.Bill Meier105-410/+1760
Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29Remove duplicate packet-dcerpc-mapi.c.Guy Harris1-4/+1
Change-Id: If2ffd01c29777840db8e305bee9565efaa58d253 Reviewed-on: https://code.wireshark.org/review/4362 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-29PIDL (DCERPC mapi): enhance dissectorAlexis La Goutte4-937/+431
Correctly regenerate mapi dissector (launch via make in pidl/mapi folder) * Fix -Wunused-variable (fix in request/response.cnf files) * Fix trailing whitespace Not yet ready to remove from DIRTY list (there is always some warning about unused tree) Change-Id: I9759202e320e90f0cb91db5c7dd9650ff62bbadd Reviewed-on: https://code.wireshark.org/review/4347 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29PIDL (DCERPC mdssvc): enhance dissectorAlexis La Goutte4-21/+7
* Fix -Wunused-function (Add functions to mdssvc.cnf with NOEMIT) * Remove dissector DCERPC mdssvc from DIRTY list Change-Id: Ic097b0067a44fcfd9298ace1abeb7ca8f0daf00b Reviewed-on: https://code.wireshark.org/review/4346 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29PIDL: fix indent (use 4 tabs) and remove trailing whitespaceAlexis La Goutte4-80/+80
Change-Id: I0ee63a040867b44ac9915704f5e581483ed6f7e2 Reviewed-on: https://code.wireshark.org/review/4310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29Remove proto_tree_add_text_valist from dissectors.Michael Mann4-254/+135
The only remaining call to proto_tree_add_text_valist is in expert.c. Suggestions welcome on how to make it "private" enough so dissectors can't use it. Change-Id: I1b70789bd01a857c3ac06d198667aeb59c4d1be9 Reviewed-on: https://code.wireshark.org/review/4333 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>
2014-09-29Fix lua bindings to handle timestamp precision changesEvan Huus3-3/+12
The recent wiretap changes broke the generation of init.lua among other things, though it did coincidentally fix one of the "yuck" comments in the generator regex. (Note that this is entirely untested, because out-of-tree init.lua is and always has been broken, but it should work) Change-Id: Id0c27b31c596613997de4ba2f6088eb9d6c8fc53 Reviewed-on: https://code.wireshark.org/review/4361 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29Update debian symbol files to satisfy the buildbotEvan Huus2-1/+3
Why is this necessary again? Change-Id: Idf8981a00636b16ac06b5af5962131d29d88dfad Reviewed-on: https://code.wireshark.org/review/4360 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29mrcpv2: don't use an uninitialized buffer as a stringEvan Huus1-4/+2
I have no idea what the original intent was with this magical otherwise-totally-unused buffer, but it clearly serves no purpose now. Stop reading garbage from it, and just read the data in the packet which is what the field name suggests. Bug: 10510 Change-Id: I05d0b98c04e59ea70247811168c4c8a64861f43d Reviewed-on: https://code.wireshark.org/review/4352 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29Pass the global capture options to open_capture_device().Guy Harris1-3/+8
If we support setting the time stamp precision, we need it to determine whether we're writing a pcap-ng file so we know whether to request nanosecond precision or not. Change-Id: I7df19c1afbe1ba90c40c49aef79f6f88ce5df29b Reviewed-on: https://code.wireshark.org/review/4359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-28Support nanosecond-resolution time stamps when writing pcap-ng files.Guy Harris1-23/+27
Pcap-ng files have supported variable time stamp resolutions since Day One, and any code that reads those files but can't handle nanosecond-resolution time stamps is broken. Pcap files got a separate magic number for nanosecond-resolution files relatively recently, and not all code that reads pcap files handles that magic number, so we don't support it for pcap files. Based on https://code.wireshark.org/review/#/c/4304/ from Peter Hatina. Change-Id: I4f4e3b5ca0ba4fe9394765edb54bb77a4a776237 Reviewed-on: https://code.wireshark.org/review/4358 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-28Support nanosecond-resolution time stamp adjustment.Guy Harris1-36/+35
Based on https://code.wireshark.org/review/#/c/4304/ from Peter Hatina. Change-Id: Ibc5e230b0682990fd4ca1f29597a9a045cb73928 Reviewed-on: https://code.wireshark.org/review/4356 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-28Add support for getting nanosecond time stamp resolution when capturing.Guy Harris4-2/+37
If we have pcap_set_tstamp_precision(), use it to request nanosecond time stamp resolution *if* we're writing a pcap-ng file; any code that reads those files and can't handle nanosecond time stamp resolution is broken and needs to be fixed. If we're writing a pcap file, don't ask for nanosecond resolution time stamps, as that requires a different magic number for pcap files, and not all code that reads pcap files can handle that. (Unlike pcap-ng, where the ability to have non-microsecond time stamp resolution was present from Day One, it's a relatively recent addition to pcap.) We could add a command-line option/GUI option for that, like the option recent versions of tcpdump have, if it matters. Change-Id: I8fa464eb929feecb9a70be70712502c9f0cc5270 Reviewed-on: https://code.wireshark.org/review/4355 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-28PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte3-10/+6
Change-Id: Ibae478771b30d6e9ae07315985f1e71bc6b65423 Reviewed-on: https://code.wireshark.org/review/4350 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28Stanag 4607: rename protocol abbreviation from 4607 to s4607 to avoid any ↵Pascal Quantin1-108/+108
collision with a frame number Bug: 10509 Change-Id: I6b97c979ed05378a7d3495fe455bc36b82b19cc9 Reviewed-on: https://code.wireshark.org/review/4338 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-28Make the time stamp resolution per-packet.Guy Harris65-344/+390
Pcap-ng files don't have a per-file time stamp resolution, they have a per-interface time stamp resolution. Add new time stamp resolution types of "unknown" and "per-packet", add the time stamp resolution to struct wtap_pkthdr, have the libwiretap core initialize it to the per-file time stamp resolution, and have pcap-ng do the same thing with the resolution that it does with the packet encapsulation. Get rid of the TS_PREC_AUTO_XXX values; just have TS_PREC_AUTO, which means "use the packet's resolution to determine how many significant digits to display". Rename all the WTAP_FILE_TSPREC_XXX values to WTAP_TSPREC_XXX, as they're also used for per-packet values. Change-Id: If9fd8f799b19836a5104aaa0870a951498886c69 Reviewed-on: https://code.wireshark.org/review/4349 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-28CMake: Conditional build fixes and updates.Gerald Combs2-4/+10
HAVE_PORTAUDIO_H didn't work for Stig. Use PORTAUDIO_FOUND instead, which is the correct name to use according to the FIND_PACKAGE_HANDLE_STANDARD_ARGS documentation. Use xxx_FOUND in a couple of other places. Conditionally build caputils/airpcap_loader.c. Change-Id: I6a134192902229a446dccf43bfb7bbfe2a55d1e2 Reviewed-on: https://code.wireshark.org/review/4291 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-09-28packet-netflow.c: Do various fixes and changesBill Meier1-992/+696
- Allow integer & float fields to have "reduced size encoding"; Fixes Bug #8846; - Add a missing cflow field-type; - Update the names of a few cflow field-types; - Replace all-but-one use of proto_tree_add_text(); - Fix encoding-args as appropriate; - Remove some obsolete comments; - Adust whitespace/indentation/formatting. Change-Id: I4271e3692288cef3ea0f1aa5eb44f5a0b05c29da Reviewed-on: https://code.wireshark.org/review/4348 Petri-Dish: Bill Meier <wmeier@newsguy.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-28PIDL (DCERPC lsa): enhance dissectorAlexis La Goutte4-69/+15
* Fix -Wunused-function (Add functions to lsa.cnf with NOEMIT) * Remove also some MANUAL function (no unused too..) * Remove dissector DCERPC lsa from DIRTY list Change-Id: I7b7f924f244757207f378b8650b8dd30e739da08 Reviewed-on: https://code.wireshark.org/review/4325 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28PIDL (DCERPC eventlog): enhance dissectorAlexis La Goutte4-21/+4
* Fix -Wunused-function (Add functions to eventlog.cnf with NOEMIT) * Remove dissector DCERPC eventlog from DIRTY list Change-Id: I29710ce4f548a6e4d9bf1dd6e652acf1eeaddf2c Reviewed-on: https://code.wireshark.org/review/4324 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28PIDL (DCERPC dnsserver): enhance dissectorAlexis La Goutte4-28/+7
* Fix -Wunused-function (Add functions to dnsserver.cnf with NOEMIT) * Remove dissector DCERPC dnsserver from DIRTY list Change-Id: Id1d4f43784bfbf417156353fd3254375365c35c8 Reviewed-on: https://code.wireshark.org/review/4323 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28PIDL (DCERPC winreg): enhance dissectorAlexis La Goutte5-24/+13
* Fix PIDL generator for NOEMIT Element (fix -Wunused-function for DCERPC winreg dissector) * Fix indent (use tabs) * Remove DCERPC winreg dissector from DIRTY list Change-Id: I5d16cbfe8481a5e5f7e5df9b51735c93ae4375a7 Reviewed-on: https://code.wireshark.org/review/4322 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28PIDL: fix -Wmissing-prototypeAlexis La Goutte20-1043/+1561
Change-Id: I4cae47450e8026b10bd373828f235184560e0a99 Reviewed-on: https://code.wireshark.org/review/4308 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>
2014-09-28[Automatic manuf, services and enterprise-numbers update for 2014-09-28]Gerald Combs4-6/+220
Change-Id: I7604c01a061f4832e53aa88903a53c1d6a50e4dc Reviewed-on: https://code.wireshark.org/review/4339 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-28New dissector for KNXnetIP protocolalage3-0/+1801
Bug:10403 Change-Id: I8c733ce69e6d44d1bff0ebbe72995f06212d9d93 Reviewed-on: https://code.wireshark.org/review/3828 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-28Don't change the packet list column precision in taps.Guy Harris2-6/+0
The only place where the packet list column precision should be set is in the code for the column precision menu item, the code for the recent file item for that precision, and, if we were to provide it, code for a command-line optpion to set it. It's not up to some tap to change it. Change-Id: I547e606fb346b4c21674a66e883cbbe382055a37 Reviewed-on: https://code.wireshark.org/review/4336 Reviewed-by: Guy Harris <guy@alum.mit.edu>