aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-03-29Extcap: fix USBPcap capture broken by g8204578Pascal Quantin2-12/+8
g8204578 was not the right way to do things: if_type is used to identify an extcap interface Change-Id: Iead6c5e63f6874012c27ed7c1bf7152a5891ad65 Reviewed-on: https://code.wireshark.org/review/7849 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29DVB-CI Card Information Structure (CIS): start dissecting the device tuplesMartin Kaiser1-0/+57
Change-Id: I20a098eb1fdcfd34eb03b685d6936a6cf5868c0d Reviewed-on: https://code.wireshark.org/review/7848 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-29smart card dev class descriptor: use a bit field for the supported protocolsMartin Kaiser1-3/+19
Change-Id: Icf1d71f0aa90ed418264cd4f349e2a514f1ae2f9 Reviewed-on: https://code.wireshark.org/review/7847 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-29dissect two more features in the smart card device class descriptorMartin Kaiser1-0/+12
Change-Id: Ia442cbf7a30c1f1054a3fa8e814d595867e2c034 Reviewed-on: https://code.wireshark.org/review/7846 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-29RRC: add dissection of ims-Information IEVincent Helfre3-30/+145
Bug: 11096 Change-Id: I348726dcd3b62f75db67e63c07bcdc79e86657a7 Reviewed-on: https://code.wireshark.org/review/7842 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-03-29[Automatic manuf, services and enterprise-numbers update for 2015-03-29]Gerald Combs4-36/+398
Change-Id: Ied01fe7ddb1734f1f8974c725b802075220bbd0f Reviewed-on: https://code.wireshark.org/review/7843 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-28bitcoin: Updated dissector to support the latest protocol version (70002).Laurenz Kamp1-14/+634
Changes made: Updated dissectors: -> ping: ping packets now have a nonce. -> version: If version >= 70002, version messages have a relay flag. -> Messages with no payload: Added mempool and filterclear messages. Added dissectors: -> pong message -> notfound message -> reject message -> filterload message -> filteradd message -> merkleblock message -> headers message Change-Id: I9eb0dba971b2f612f95211847a7f283a037341e6 Reviewed-on: https://code.wireshark.org/review/7831 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-03-28wsp: fix format stringEvan Huus1-2/+2
I76f7515889727dc7fad27ac90ca96750384a46f3 made the format strings static using macros, but missed the fact that sprintf("%s foo", bar) should become (bar " foo") and not ("%s foo" bar). This caused a malformed value string fallback. Bug: 11092 Change-Id: Idba3c87a32a6b3c852e661a62e8cd9be6cad0904 Reviewed-on: https://code.wireshark.org/review/7836 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-28x11: destroy two more hash tables in convo dataEvan Huus1-0/+3
Fixes a memory leak. Bug: 11088 Change-Id: Ie5532507c6e2963af8056d41abf1c7a398e08cfd Reviewed-on: https://code.wireshark.org/review/7835 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-28Remove proto_tree_add_text from packet-sml.cMichael Mann1-60/+91
Change-Id: I811933345a5c62624af08db39ee79c1431c89aa5 Reviewed-on: https://code.wireshark.org/review/7833 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-27Extcap: display a USB icon when adding a USBPcap interfacePascal Quantin1-1/+10
Change-Id: Ibe78b115eb6e7e737a5dc9c8a7937b82d8cf76a8 Reviewed-on: https://code.wireshark.org/review/7830 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-26USB: use URB/IRP ID for request/response trackingPascal Quantin3-29/+51
Bug: 11072 Change-Id: I5f1824d602e4b88c9c5c8520b0aac9945206f093 Reviewed-on: https://code.wireshark.org/review/7781 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-03-26[Diameter] Pretify a couple of AVPs that might be text eventhough they areAndersBroman1-18/+160
specified as octet strings. Change-Id: Ib3dd1fe18b64c9defdcd6e0434dd9937fbd4dfea Reviewed-on: https://code.wireshark.org/review/7828 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-26CMake updates for Windows buildGraham Bloice3-51/+2
Removed the redundant setpath batch file and associated macro and updated docs. Change-Id: I5ddab6bad2d14ed3443194d7269f1890e4aa608e Reviewed-on: https://code.wireshark.org/review/7826 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-26DTLS: use addresses_ports_reassembly_table_functionsAndreas Schultz1-1/+1
When capturing two consecutive DTLS session to the same server, fragments for the second session report a error: > [Reassembly error, protocol DTLS: New fragment overlaps old data (retransmission?)] It turns out that the DTLS dissector uses the addresses_reassembly_table_functions which takes only the IP addresses into account and not the ports. Changing that to the addresses_ports_reassembly_table_functions fixes the bogus error message. Change-Id: If317314dca4b1d46e802bac54c07c89c7a73e24e Reviewed-on: https://code.wireshark.org/review/7824 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>
2015-03-26CMake cleanup for VS solutionGraham Bloice3-1/+5
Add FOLDER properties to targets to tidy up the VS solution Change-Id: Ia42e0e89fb490cd3dcd33b7c5f59eb0a27b74c7a Reviewed-on: https://code.wireshark.org/review/7822 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-26html2text.py: Python 2.5 compatibility, improve Unicode supportPeter Wu1-13/+16
Add support for Python 2.5 (remove unicode_literals import which does not seem to be necessary), check before using break_on_hyphens (without this option in Python 2.5, the output is uglier though) and avoid the 'with' keyword. While at it, fix reading Unicode text from file in Python 2 (tested with: echo € | tools/html2text.py) and support reading from stdin using the '-' filename. Tested against Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 with the commands from the previous html2text.py commit message, and additionally with the Unicode character € as input (instead of the faq.py output). Change-Id: I3de3f7a4e7cf7d702463c3a59758803843338a54 Reviewed-on: https://code.wireshark.org/review/7823 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25packet-iec104: fix showing information objects if SQ flag is setJiří Engelthaler1-5/+6
IOA of information object is shown only for first object in sequence, corrected byte count for information object. Change-Id: Id428ce3b9d98da0be0315f2a880e5c025e076183 Reviewed-on: https://code.wireshark.org/review/7821 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-03-25FindPOD: fix link to CSSPeter Wu1-1/+1
docbook/Makefile.am uses --stylesheet=ws.css too, without this change the generated HTML will point to the source directory... Change-Id: I351cb658c404a08655201933158f91765f8d9c35 Reviewed-on: https://code.wireshark.org/review/7503 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-25dfilter-test.py: add OOT support and Python 3 compatPeter Wu3-11/+13
Support WS_BIN_PATH and SOURCE_DIR (modelled after test/config.sh) to support out-of-tree builds (including cmake). Add Python 3 support and mention this in the documentation. Tested with Python 2.7.9, 3.2.6, 3.4.3: WS_BIN_PATH=/tmp/wsbuild/run SOURCE_DIR=/tmp/wireshark \ tools/dfilter-test.py testBytesIPv6 (2.7.9 and 3.4.3 were also tested fully, but some cases seem to fail even before this patch. 2.5.6 and 2.6.6 do not work because the unittest module is outdated.) Change-Id: I13074579f6f74206edb5cd7be8e7a8406de49c56 Reviewed-on: https://code.wireshark.org/review/7793 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25indexcap.py: fix tmpdir handling, python 3 compatPeter Wu2-48/+53
Add Python 3 compatibility to indexcap.py and only create a tmpdir for actions that need it. Only remove tmpdir for the compare action and try to remove the temp dir even if an exception occurs. In list_protos_in_cap.sh, rename BIN_DIR to WS_BIN_PATH (matching test/config.sh) and allow it to be overridden from the environment. Tested with Python 2.6.6, 2.7.9, 3.2.6, 3.4.3 as follows (with tshark built using cmake and '-b /tmp/wsbuild/run'): tools/indexcap.py out pop-ssl.pcapng; tools/indexcap.py out pop-ssl.pcapng --list-all-proto; tools/indexcap.py out pop-ssl.pcapng --list-all-files; tools/indexcap.py out pop-ssl.pcapng --list-all-proto-files=ssl; rm out; Python 2.5.6 does not work (there is no multiprocessing module). The dict output in Python 3.4.3 is different (has the hash function changed?) Change-Id: I592d8c4458a20d5088d815c6dd1cf90c9d3df9d3 Reviewed-on: https://code.wireshark.org/review/7792 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu10-569/+171
A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25faq: fix formatting, fix links, use HTML5Peter Wu1-171/+185
The "a:hover" styling on https://www.wireshark.org/faq.html is ugly as it is not a real link. This patch turns questions into clickable links (focusing at the anchor) and converts from XHTML syntax to HTML5. Dead links have been updated and other links have been converted to https if available. The result passes the HTML5 validation at https://validator.nu. Change-Id: I32b7c18baeabe7ab7fce2dadd4c1d4e6de5c593f Reviewed-on: https://code.wireshark.org/review/7778 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25Small fixes to Windows installerPascal Quantin4-1/+9
- re-add option to install SNMP MIBs - remove Qt specific folders during uninstall Change-Id: Idb5889cf164e90f4403435d24ae10e3dfe37fe44 Reviewed-on: https://code.wireshark.org/review/7808 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-03-25Add support for WIRESHARK_EXTCAP_DIR environment variable on WindowsPascal Quantin1-1/+11
This can be useful when a user cannot modify the Wireshark installation folder (due to UAC restriction for example) This is already supported on Linux / OSX Change-Id: Icfcb43908de1fd8cd415cd31a98219eab1c757c8 Reviewed-on: https://code.wireshark.org/review/7809 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-03-25Generate the filter using _ws.expert.message instead of expert.messageMichael Mann1-10/+10
Bug: 11073 Change-Id: Ie98d52561b7aebe6875392cf3efeb22adb2ac499 Reviewed-on: https://code.wireshark.org/review/7813 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>
2015-03-25Have a #define for whether the capture buffer size can be set.Guy Harris20-91/+109
It can be set if either 1) this is Windows (where we're assumed to be using WinPcap, which includes calls to set the buffer size) or 2) we have pcap_create() (in which case we also have pcap_set_buffer_size(), at least in a normal libpcap release). Use that rather than testing "defined(_WIN32) || defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's being tested. Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12 Reviewed-on: https://code.wireshark.org/review/7816 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25OK, this appears to be what's intended.Guy Harris1-4/+29
Include a column to describe what's intended. If that's *not* what's intended, fix the comment and the twisty little maze of #defines. Change-Id: Ic5d120c401d8aba23a19e9d042b1460621b80e0b Reviewed-on: https://code.wireshark.org/review/7815 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25Clean up handling of buffer size.Guy Harris1-40/+40
Instead of a twisty little maze of #if, #ifdefs, and #elifs, all different, define HAVE_BUFFER_SIZE upfront iff we can set the buffer size - i.e., if this is Win32, and thus we're using WinPcap, or if we have pcap_create() and thus pcap_set_buffer_size() - and use that to govern whether to have a buffer size setting or not. Always put the buffer size setting in the right vertical box. If that doesn't work well for some configurations of available interface knobs, feel free to change the checks, but please make it less opaque what's going on (include a comment if necessary). Change-Id: I384c601982b470ae08de271431eac06d6c925332 Reviewed-on: https://code.wireshark.org/review/7814 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25Generate format strings at compile time.Guy Harris1-20/+20
This squelches some compiler warnings, with the addition of G_GNUC_PRINTF() calls. Change-Id: I76f7515889727dc7fad27ac90ca96750384a46f3 Reviewed-on: https://code.wireshark.org/review/7812 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25Replace HF_EMPTY and ETT_EMPTY with -1Michael Mann4-128/+124
Change-Id: If3e89f8e46edd4eef82037b6b348fd70a9a3033d Reviewed-on: https://code.wireshark.org/review/7811 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-03-25convert proto_tree_add_uint -> proto_tree_add_itemMichael Mann1-61/+52
The calls were just passing in a tvb_get function anyway. Change-Id: If69b2d41997f748dc5d12650e2553d5bc69930ce Reviewed-on: https://code.wireshark.org/review/7810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-24Win32: Compilation error if winpcap remote capturing disabledRoland Knall1-1/+3
If HAVE_PCAP_REMOTE is not set, this code is not defined and therefore will not be compiled correctly. Change-Id: Ie08a6f99598d46cfa38e2448ea979a8a9aa7c7fc Reviewed-on: https://code.wireshark.org/review/7803 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-24Since g2ef72cb, plugins are no more stored in plugins/$VERSION folderPascal Quantin3-50/+4
Also update the custom samples to reflect the latest changes done Change-Id: I2ac865fad1acdef5a5c4d68a155cbdf970c306f5 Reviewed-on: https://code.wireshark.org/review/7805 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-03-24Q931: Dissect IEC/ISO cause coding standard as ITU-TMikhail Koreshkov1-1/+8
Add preference to enable dissect IEC/ISO cause coding as ITU-T (Q.850) Change-Id: Id61f0785b8355f1aed03c4dea70657d661af3f11 Reviewed-on: https://code.wireshark.org/review/7806 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-24ftsanity.py: make it work with modern tsharkPeter Wu4-38/+30
Broken since 4ac2441d7c7371249a3422fc2e67b8ad98aa6631 ("Coalesce "-G fields2" and "-G fields3" into "-G fields"). This patch fixes Python3 compatibility, fixes handling of the changed output and option and prints the faulting line on assertion error. It also updates two dissectors which had tabs in their description, breaking the output. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c Reviewed-on: https://code.wireshark.org/review/7791 Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-24checklicenses.py: add python3 compatibilityPeter Wu1-21/+24
Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: I5893bb32d339118ec968edc7de0e185e39ab4f81 Reviewed-on: https://code.wireshark.org/review/7789 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-24http2: fix dissection over TLSEdward Dao1-4/+13
Previously, the http2 heuristics dissector sets a conversation dissector which overrides the SSL dissector, breaking SSL decryption before http2. This patch fixes that by checking for an active http2 session in the http2 heuristics dissector. Change-Id: Ibacbcde3e29bbb746ad2e394f1c10ca571b07bf5 Reviewed-on: https://code.wireshark.org/review/7782 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-24Overhaul WSP dissector.Michael Mann3-1950/+1852
1. Remove proto_tree_add_text (the reason I started the update) 2. Add expert info (mostly related to proto_tree_add_text, but since I was in the neighborhood...) 3. Replace "big functions macros" with "small macro" + real function (for big .o size savings) 4. Remove DebugLog macro (intent seems to duplicate basic functionality of a step-through debugger) 5. Replace HF_EMPTY (and comparible macros) with -1 6. Move header handler array to remove need for many forward declarations. Change-Id: Ic5467289aae7d54e78c1fd65f93358387d6139aa Reviewed-on: https://code.wireshark.org/review/7799 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>
2015-03-24wcp: add validations to decompressed_entryEvan Huus1-2/+31
Ensure that a reference to past bytes refers to bytes that actually exist. Bug: 10978 Change-Id: If95d785ee15243c88edcd7115b5ff25fbaa08e6c Reviewed-on: https://code.wireshark.org/review/7783 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-23GSM RLC/MAC: fix an out of bounds accessPascal Quantin1-1/+1
When GRNTI does not exist in Packet Measurement Report R5 additions, too many lines are skipped Fixes an ASAN failure reported by Alexis Change-Id: I400bc4d9732f1d8e3c6fb8b72bf08a70a636d78c Reviewed-on: https://code.wireshark.org/review/7772 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-23Centralize the code to set the active_dlt value for a device.Guy Harris5-24/+66
We were doing it similarly, but not the same, in several places; make a common routine for it. Have that code check to make sure the DLT_ value in question is actually supported by the device; if not, pick the first supported DLT_ value, if any; this keeps it from, for example, picking a bad DLT_ value if your defaults were set based on monitor mode being on but monitor mode actually being off, or vice versa. Change-Id: I1722bfeaf60429bc5c6f665fdea3d466052b13bd Reviewed-on: https://code.wireshark.org/review/7795 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-22Update libwireshark0.symbols filePascal Quantin1-2/+3
Change-Id: Ib79e9eabd44d3eb444be7a33d30d5a1f9839d548 Reviewed-on: https://code.wireshark.org/review/7794 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-22delete_includes.py: Python 3 compatibilityPeter Wu1-44/+40
While improving python 3 compatibility, fix whitespaces and remove the useless try/except block as these modules are part of core. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 (with "make" replaced by "true" and by comparing stdout). Change-Id: I9c585da89aef76f01672c8f7320ac4a13c6cc7d7 Reviewed-on: https://code.wireshark.org/review/7790 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-03-22[Automatic manuf, services and enterprise-numbers update for 2015-03-22]Gerald Combs4-60/+305
Change-Id: Icddd1da625dd7bb333f888fd9832e12d7c6512d1 Reviewed-on: https://code.wireshark.org/review/7786 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-22IPv6: fix using extended field designator is an extension [-Wextended-offsetof]Alexis La Goutte1-24/+20
Change-Id: Ibe5fce79a195b27e5d8e84c86613298083dabef2 Reviewed-on: https://code.wireshark.org/review/7780 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-03-22Remove proto_tree_add_text from packet-ospf.cMichael Mann1-89/+136
Change-Id: Ice87c69902a09874d5bdfa996523db9a9af50706 Reviewed-on: https://code.wireshark.org/review/7785 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-03-21IPv6: fix indent (use 4 spaces) and Modelines infoAlexis La Goutte1-91/+104
Change-Id: Iabd6de1e3ca7e7de156847fd33d38a25ac14f1c2 Reviewed-on: https://code.wireshark.org/review/7784 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-21Replace copying of packet_info with just saving fragmented member of ↵Michael Mann1-5/+3
packet_info. Bug:11071 Change-Id: I6d87ace5f6bed1b1d0db98eef25204130ba21c9e Reviewed-on: https://code.wireshark.org/review/7777 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-21Proto.h: fix parameter 'err' not found in the function declaration ↵Alexis La Goutte1-1/+0
[-Wdocumentation] Change-Id: Ibca63a9119b9c45e6a24fe3dc14dc7ed86c3576a Reviewed-on: https://code.wireshark.org/review/7774 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 23:42:40 +0000