aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier8-38/+38
Change-Id: I9fda7de49255857cc1cf270d6202c85573d91674 Reviewed-on: https://code.wireshark.org/review/4490 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier20-1168/+1167
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3 Reviewed-on: https://code.wireshark.org/review/4489 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06plugins: Add editor modelines; Adjust whitespace as needed.Bill Meier70-3745/+4623
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05mpeg-pes: don't modify source and destination address columsMartin Kaiser2-32/+6
the mpeg-pes dissector replaced source or destination address with decoding timestamp, presentation timestamp or pack data rate these values don't belong into address columns and erase the IP addresses when mpeg-pes is transmitted over IP the timestamps etc can be displayed in a user-defined column if required this patch is part of Bug: 10505 Change-Id: I1bf561648f848eb18818862edd138724abfc8e88 Reviewed-on: https://code.wireshark.org/review/4472 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-05docsis: Add editor modelines; Adjust whitespace; Remove boilerplate comments.Bill Meier44-7941/+7702
Change-Id: I78f9815616f4fc3c14204339c5826f0ca7d0680e Reviewed-on: https://code.wireshark.org/review/4485 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05Add editor modelines; Adjust whitespace as needed.Bill Meier56-1557/+2284
Change-Id: I6e70c933ae61a97377235d67b2f6a1b3d67dc155 Reviewed-on: https://code.wireshark.org/review/4484 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05Reformat hfi entries; Add editor modelines; Adjust whitespace.Bill Meier2-323/+349
Change-Id: Iead53f92cc847d04c32f4a307d45f9748c49a69c Reviewed-on: https://code.wireshark.org/review/4483 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05packet-igap.c: Reformat hf[] entries; Add editor modelines.Bill Meier1-131/+170
Change-Id: I0ac4f2eb7f2b93aab864c6f43dee057774048165 Reviewed-on: https://code.wireshark.org/review/4482 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05Read the record length in common code.Guy Harris1-61/+52
Instead of reading the 16-byte blob and record length at the same time, just read the 16-byte blob, and then fall through to the record-length reading code. Change-Id: Ib2819a2d654e2670233821882bac79d7cd656b12 Reviewed-on: https://code.wireshark.org/review/4480 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-05[Automatic manuf, services and enterprise-numbers update for 2014-10-05]Gerald Combs4-27/+228
Change-Id: Ib90638f6382b2112f0f49a2d8f5d2d10b4d3c520 Reviewed-on: https://code.wireshark.org/review/4474 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-05DLT User: add ability to export PDUsPascal Quantin1-1/+25
It can be really useful to share hand crafted captures without the need to configure the DLT User table Change-Id: Iefab00b741f95b1f3a3247cb28ed01a367fa4ff4 Reviewed-on: https://code.wireshark.org/review/4469 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-05Fix a comment.Guy Harris1-1/+1
Change-Id: I875888753859488ed810cedb5656bd870bee7122 Reviewed-on: https://code.wireshark.org/review/4471 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-05Improve comments, and add some #defines, to make it clearer what the code does.Guy Harris1-47/+110
Change-Id: I2cd8973bdce171053664cf4ed06a37bdd9b30353 Reviewed-on: https://code.wireshark.org/review/4470 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-04DSR: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-11/+11
Change-Id: Ifd694dc9a72cde787c00820ec5a02cc33d5157e0 Reviewed-on: https://code.wireshark.org/review/4466 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-04LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I616e57c84c5721213ee12a41b63595547ab15f72 Reviewed-on: https://code.wireshark.org/review/4465 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-04EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I88b90302df0202d38b7c089cf243e7860766e653 Reviewed-on: https://code.wireshark.org/review/4464 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04GSM-SMS: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+0
Change-Id: If0700726bf9a7359313d0cb69d959471c0ea9580 Reviewed-on: https://code.wireshark.org/review/4463 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04Juniper: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I9178a3de683dda661ed68ef6d743036a9f8aa39e Reviewed-on: https://code.wireshark.org/review/4462 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04RSVP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: Iccfeaa514cd60f02bb37e210c5f714bcb616521b Reviewed-on: https://code.wireshark.org/review/4461 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04Eliminate proto_tree_add_text from packet-gsm_a_bssmap.cMichael Mann1-525/+385
Also remove other_decode_bitfield_value calls. Change-Id: I056fe74fbd547b690cd5ed60e3e8777df9474704 Reviewed-on: https://code.wireshark.org/review/4468 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04GTK (hostlist_table) fix indent (use 4 spaces) and modelines infoAlexis La Goutte1-13/+26
Change-Id: I072de752df0c0e41be663889dafd0f5860a29c37 Reviewed-on: https://code.wireshark.org/review/4458 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04GTK (hostlist_table) warning: comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I83e930b3179ce954fa4c09d1f46cc833517aa1f6 Reviewed-on: https://code.wireshark.org/review/4457 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04Qt (manage interface): fix warning: comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-2/+2
Change-Id: I728a50e47fd0d8eea77bc1cdebe2a155184ea953 Reviewed-on: https://code.wireshark.org/review/4456 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04extcap: warning: no previous prototype for ‘extcap_free_arglist’ ↵Alexis La Goutte1-5/+0
[-Wmissing-prototypes] Remove extcap_free_arglist (never used) Change-Id: I1f751512be627380a992db63c3e4abd22b3aa486 Reviewed-on: https://code.wireshark.org/review/4455 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04CEPH: Fix comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I0c04a3d217e75986878b276a1ac82b427de38384 Reviewed-on: https://code.wireshark.org/review/4454 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04DCERPC (butc): fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte2-4/+4
Fix a typo in last patch and regenerate file Change-Id: Id9083edd797af97d72a872187a0d0b5750e04547 Reviewed-on: https://code.wireshark.org/review/4453 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04CP2179: Fix warning: no previous prototype for proto_register_cp2179 ↵Alexis La Goutte1-2/+2
[-Wmissing-prototypes] Move on top also prototype of proto_reg_handoff_cp2179 Change-Id: I00f23a88606426acd17d63104630a885682d3c02 Reviewed-on: https://code.wireshark.org/review/4452 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-04Add editor modelines; Reformat as appropriate.Bill Meier66-5666/+6468
Change-Id: I8e9c58b75eea85877d22024201e5d8d0e9a3dbfd Reviewed-on: https://code.wireshark.org/review/4459 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-04Update capture_opts in extcap_cleanup().Tomasz Moń3-26/+22
This fixes redundant extcap_pid handle close that could occur in capture_opts_del_iface() which resulted in unhandled exception on Windows. Change-Id: I06b680fcb65cd6fd854a25fb1b01248dce3251a1 Reviewed-on: https://code.wireshark.org/review/4447 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-04Wait for extcap to connect to pipe on Windows.Tomasz Moń2-2/+129
This prevents dumpcap from failing with timeout exceeded error message with some extcaps (especially those that display UAC screen) by making sure that extcap connects to pipe before dumpcap is even started. Change-Id: I549da9217c7f4ae89509330ca4fa613a119a9523 Reviewed-on: https://code.wireshark.org/review/4428 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-04Use some macros to clean up the Snifer decompression code.Guy Harris1-92/+91
For code that's used in more than one place, use macros. This combines a bunch of checks into the output macros. Change-Id: Ic32dce75e1c531fd28bfed180856e230277bfe58 Reviewed-on: https://code.wireshark.org/review/4451 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-03Fix memory leak and heap corruption on Windows.Tomasz Moń1-6/+6
LPSECURITY_ATTRIBUTES is type definition for pointer to SECURITY_ATTRIBUTES structure. Change-Id: I94a835bfd8f7eb76c808fac8286ca3f2db9b19c3 Reviewed-on: https://code.wireshark.org/review/4449 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-03WSDG: Update the Windows Qt download text.Gerald Combs1-15/+6
Change-Id: I6fd027ff76b5b463f33992898965a3e037778071 Reviewed-on: https://code.wireshark.org/review/4443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-03Add editor modelines; Adjust whitespace as needed.Bill Meier42-3708/+4251
Change-Id: I391cdf80a6e4ae5b0f4068e0500a90d013588f8a Reviewed-on: https://code.wireshark.org/review/4442 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03packet-aim-messaging.c: Add editor modelines; reformat various (including ↵Bill Meier1-105/+176
hf[] entries). Change-Id: Ie5973a717a80ba75b82e817cb9e30c3529afbb0c Reviewed-on: https://code.wireshark.org/review/4441 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03packet-dcerpc-fileexp.c: Add editor modelines; reformat various (including ↵Bill Meier1-1378/+1934
hf[] entries). Change-Id: I0d49f4c1c3a3960c3fdc9b1cd411c73097829c09 Reviewed-on: https://code.wireshark.org/review/4440 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03LocationNumber digits is off by one(to many).AndersBroman2-6/+6
Bug 10522. Change-Id: I7887f3ee229ac22d2aa37a3d8900d76d8b814ed0 Reviewed-on: https://code.wireshark.org/review/4439 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-03Create field filters for gsm_rr_csn_HL_flag() usages.Michael Mann1-95/+188
Change-Id: I74f110b477a3bf7e0c374db3147604d50018deba Reviewed-on: https://code.wireshark.org/review/4435 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-03Re-enable the Wireshark test suite.Gerald Combs1-1/+1
Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad Reviewed-on: https://code.wireshark.org/review/4434 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02CMake: Don't assume we have a "cat" command.Gerald Combs1-6/+25
Use "copy /B" on Windows to create wireshark.pod, similar to doc/Makefile.nmake. Change-Id: I454afca0bd3497cca795ca18256dd7c4e2f224d4 Reviewed-on: https://code.wireshark.org/review/4415 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Partially re-enable Wireshark tests.Gerald Combs2-3/+6
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris buildbots run the test script under Xtightvnc, which provides neither of those. Only enable the tests on Windows and OS X for now. Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d Reviewed-on: https://code.wireshark.org/review/4430 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Add editor modelines & adjust indentation/whitespace as needed.Bill Meier47-9435/+10053
Change-Id: Ice2d93632cd42dfcef3bfbf0e15f2a8a147278fc Reviewed-on: https://code.wireshark.org/review/4433 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02Reformat hf[] entries; Add editor modelines & adjust whitespace.Bill Meier4-1449/+2459
Change-Id: I30b25db89d3fbae5f3913ede8bf7bd66fd2516da Reviewed-on: https://code.wireshark.org/review/4432 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02packet-nfs.c: (trivial) Add dropped/missing newline; Adjust some whitespace.Bill Meier1-169/+170
Change-Id: I2ef3af42a712ced6917d94e1dcf708b3f34d7e82 Reviewed-on: https://code.wireshark.org/review/4431 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02Fix the release notes.Gerald Combs1-2/+3
The Bug Fixes section is empty, which creates an empty Docbook section, which isn't allowed. Comment out its header for now. AsciiDoc interprets single quoted text as emphasized, which probably isn't what was intended. Use curly quote markup instead. Add a link to the AsciiDoc cheat sheet. Change-Id: Ib9746ea714f90a28a2f1204e97e9e185aaef3df6 Reviewed-on: https://code.wireshark.org/review/4429 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02epl: FIX PDO_MappingLukas Emersberger1-12/+43
The subindex of the R/TPDO frames was interpreted false. Now the subindex is correctly interpreted. ASend SDO Write Multiple Parameter by Index interpreted the mapping data false. Change-Id: Icfb1896e96f5486c5479c1dd060eb1032695f9f6 Reviewed-on: https://code.wireshark.org/review/4397 Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-02Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 packagePascal Quantin2-4/+5
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys Bug: 10476 Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e Reviewed-on: https://code.wireshark.org/review/4401 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>
2014-10-02Create field filters for gsm_rr_csn_flag() usages.Michael Mann1-278/+676
Change-Id: I77b0c33c054397666f978a9ae175fa386cb87b59 Reviewed-on: https://code.wireshark.org/review/4419 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-02Add dissection of IS-IS Router CAPABILITY TLV.AndersBroman2-7/+92
Bug 10520. Change-Id: I8d8d56e36d90088af3cd7d2490f95c5f87c75423 Reviewed-on: https://code.wireshark.org/review/4420 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-02Qt: Keep dialogs from blocking tests.Gerald Combs2-11/+10
If WIRESHARK_QUIT_AFTER_CAPTURE is set, call exit(0). This keeps us from emitting the aboutToQuit signal and doing things that might pop up dialogs. Change-Id: I6e986b6e7ad824d8b5258e34a12c32869f5b2d34 Reviewed-on: https://code.wireshark.org/review/4421 Reviewed-by: Gerald Combs <gerald@wireshark.org>