aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-22Add a routine to return a version string including VCS information.Guy Harris24-80/+162
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_major_version() to wsutil and rename it to ↵Guy Harris6-30/+35
get_windows_major_version(). It's Windows-specific, so name it appropriately. Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e Reviewed-on: https://code.wireshark.org/review/2528 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Reorder some statements to avoid unused build-type directoriesJoerg Mayer1-22/+19
Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21Move the routine to get memory information to wsutil.Guy Harris5-14/+89
Change-Id: I94717cec5a464166585b258a83f8ccdaccf8d5ff Reviewed-on: https://code.wireshark.org/review/2525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Get rid of trailing blank lines.Guy Harris1-1/+0
Change-Id: Ie28a9904fd8befe98677c9f9f169beffe4df1d5d Reviewed-on: https://code.wireshark.org/review/2524 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move the routine to get a CPU information string to wsutil.Guy Harris5-38/+111
Change-Id: Ibf6e57d7382cbbd831a0367fd48d684118712408 Reviewed-on: https://code.wireshark.org/review/2523 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Clean up inclusion of cfutils.h.Guy Harris2-2/+2
Change-Id: I7da381f12db6721448e15d30d441a943127cbca1 Reviewed-on: https://code.wireshark.org/review/2522 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21cfutils.c is now part of libwsutils.Guy Harris1-1/+0
Change-Id: I86ab5f5890a10cc8475f5e9bee4c4f7c89dfb8bc Reviewed-on: https://code.wireshark.org/review/2521 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Get rid of trailing blank lines.Guy Harris1-2/+0
Change-Id: Ib806d07aea8e4d903f084171ce2021c6f3c3fc07 Reviewed-on: https://code.wireshark.org/review/2520 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Add a get_compiler_info() routine in libwsutil to get compiler information.Guy Harris5-75/+154
Change-Id: I8ccb6187f2ee0255460f448aee170768b6fa3f5d Reviewed-on: https://code.wireshark.org/review/2519 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Is <stdio.h> necessary here?Guy Harris1-1/+0
Change-Id: Ibfe4fa8b2c1f092781c4137cde7febe2d6f49e81 Reviewed-on: https://code.wireshark.org/review/2518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Need <string.h> for string routines.Guy Harris1-1/+3
Change-Id: I828bb29953727eb43e169fa9b06837c9657ca051 Reviewed-on: https://code.wireshark.org/review/2517 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21We need the Unicode utilities, at least on Windows.Guy Harris1-4/+2
Multiple UTFs FTW! Change-Id: Ib50dda4577f0038b11179be92dc6fb321b033618 Reviewed-on: https://code.wireshark.org/review/2516 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21cfutils.c is now part of libwsutil.Guy Harris1-2/+1
Change-Id: I2105ace8575e93d79e10dfdd33e1523461c3f03e Reviewed-on: https://code.wireshark.org/review/2514 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21We need <windows.h> on Windows.Guy Harris1-0/+4
Change-Id: I54c9991b3322d14966913367f951900cc7e54c4e Reviewed-on: https://code.wireshark.org/review/2513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Check constraints for OSPFv2 LSAs:Anish Bhatt1-7/+41
1 Router LSA: >= 24 bytes (>= 0 link descriptor(s) required) 2 Network LSA: >= 28 bytes (>= 1 router-ID(s) required) 3 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required) 4 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required) 5 AS-External LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required) 7 NSSA LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required) 9 Opaque Link LSA: >= 20 bytes 10 Opaque Area LSA: >= 20 bytes 11 Opaque AS LSA: >= 20 bytes as described in Bug 6302 for all other types including unknown, check for minimum length of 20 Change-Id: I93451d99a93213b4ded8157cecd54b0a6221d351 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2292 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21Move the Windows build target OS definitions to Win XPGraham Bloice2-4/+4
This doesn't preclude use on < XP but does potentially allow use of API's that don't exist on Win2K, and doing so would then stop the exe from running on 2K. Change-Id: I08b58bd510b832ddabbb717dd73eb7a89264048e Reviewed-on: https://code.wireshark.org/review/2504 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21Move get_os_version_info() to libwsutil.Guy Harris15-459/+546
This mean we also have to move CFString_to_C_string() there for OS X. Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337 Reviewed-on: https://code.wireshark.org/review/2511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_copyright_info() to wsutil.Guy Harris15-17/+91
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21batch of tvb-length conversionsEvan Huus50-306/+300
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21Add command-line argument to request the version to a number of the utilities.Jeff Morriss10-40/+124
In some cases "-v" was already used so "-V" is the option. Note that the version information in these utilities is much shorter than what is presented by the big programs. As requested by https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5804 Bug: 5804 Change-Id: I35db35a4eace2797afd895f9be7322ef39928480 Reviewed-on: https://code.wireshark.org/review/2489 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add .rc files to the sources to have them included in the buildJoerg Mayer20-0/+31
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20Move the "capture-comment" long option to LONGOPT_CAPTURE_COMMON.Guy Harris3-2/+1
Change-Id: I55884d48911de307cde52accfebbda69f2989526 Reviewed-on: https://code.wireshark.org/review/2505 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Fix build without pcap.Guy Harris3-14/+0
The files that use LONGOPT_CAPTURE_COMMON and OPTSTRING_CAPTURE_COMMON include capture_opts.h unconditionally, so there's no need to define them if we don't have pcap. In addition, we want the capture options "available" even if we don't have pcap, so we can tell the user "you're using a version of *shark without pcap, but you gave a capture option". Change-Id: I0bd3893b73d3d903610d0bc6cacb60bfb37096f4 Reviewed-on: https://code.wireshark.org/review/2503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20More .in files to handleJoerg Mayer1-35/+10
Change-Id: I55a04fe6f72c22f1a936ef45b215a8813f7a02db Reviewed-on: https://code.wireshark.org/review/2502 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20relnotes got updated againJoerg Mayer1-1/+3
Change-Id: I1f006805548829435710b1d86297aa9168afe7f9 Reviewed-on: https://code.wireshark.org/review/2501 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20Process all .in files, not only the ones needed for Unix'ish systems.Joerg Mayer1-1/+40
Change-Id: I265367f07253be4379efbb6689ec944f04ef6134 Reviewed-on: https://code.wireshark.org/review/2500 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20Add flags required for VS2013 to CmakeGraham Bloice1-0/+17
Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4 Reviewed-on: https://code.wireshark.org/review/2499 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-20Fix builds without pcap.Guy Harris4-4/+4
Change-Id: I6c67f9ea9d115a8396af0904ef9a73d2c528dcaa Reviewed-on: https://code.wireshark.org/review/2498 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add long names for -a, -b, and -p.Guy Harris1-0/+3
(The name for -p matches what's in the tcpdump trunk.) Change-Id: If4f1824518aee1f0213f140d884db9c676dd15c4 Reviewed-on: https://code.wireshark.org/review/2497 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Also define LONGOPT_CAPTURE_COMMON as nothing if we don't have pcap.Guy Harris3-27/+17
While we're at it, simplify the #ifdefs and #defines in capture_opts.h - don't do the same tests twice. Change-Id: I2079167f31789470ef77120054d769d5914745e3 Reviewed-on: https://code.wireshark.org/review/2496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20"-d" isn't common to all capturing programs, it's dumpcap-specific.Guy Harris2-6/+6
Change-Id: I827615d45051c9d66407516b311d3de448de6d07 Reviewed-on: https://code.wireshark.org/review/2495 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Use OPTSTRING_CAPTURE_COMMON here as well.Guy Harris1-19/+3
Change-Id: If0078797a2e7b14edbd1b64863c4961c9b198168 Reviewed-on: https://code.wireshark.org/review/2494 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Define OPTSTRING_CAPTURE_COMMON as nothing if we don't have pcap.Guy Harris2-15/+3
No capturing, no capture options. Change-Id: I0023184b9c358d5876f19a098590f34d641c8649 Reviewed-on: https://code.wireshark.org/review/2493 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add some long options for capture short options.Guy Harris4-41/+63
The names match tcpdump trunk's names for the corresponding options. Also have capture_opts.h provide a #define for the part of the short option string that corresponds to the capture short options that all our programs that take capture short options take (those are largely the ones we have in common with tcpdump). Change-Id: Ia209425959c801725850b56a7d63441ee99b5001 Reviewed-on: https://code.wireshark.org/review/2492 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add --help and --version long options.Guy Harris4-14/+35
Also, make the convention for long-only options be that their case-statement values start at 128, so they avoid colliding with any ASCII code points, including control characters. Make the tables of long options "static const" while we're at it, and get rid of unnecessary casts. Change-Id: I55702a85e9bc078b1cd0f2803ebb68a710405bab Reviewed-on: https://code.wireshark.org/review/2491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20TCP: update the list of options and put Kind and Length items in the right ↵Pascal Quantin1-49/+98
subtree Bug: 10211 Change-Id: Ide37f2a2b33f0d6d7cdff897eed02a8c1ea24f7d Reviewed-on: https://code.wireshark.org/review/2488 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-20Fix documentation generation on WindowsPascal Quantin1-1/+1
Change-Id: I7166528e312c99b8477361140869ebeb2b7c03b9 Reviewed-on: https://code.wireshark.org/review/2487 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-20Revert part of svn revision 52045 (git b38ee917)Stig Bjørlykke2-79/+128
This fix does change the format printed for values using bitmasks (because the bit values are printed first) and is not always wanted in this dissectors (because of readability). We should have a better way of doing what I want in this dissectors, so I'll have a look at this later. Change-Id: I2477aa6b1d0c42a7ad5848bba3cb74dce3bba1f0 Reviewed-on: https://code.wireshark.org/review/2485 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-20One more change to dissector_add_for_decode_as.Guy Harris1-1/+1
Change-Id: Icd272fc9ae749728a601966de573843390e278ab Reviewed-on: https://code.wireshark.org/review/2484 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Rename dissector_add_handle() to dissector_add_for_decode_as().Guy Harris133-183/+189
Hopefully that name makes it clear what the routiner's purpose is, and will encourage people to use it rather than using dissector_add_uint() with a bogus integer value. Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8 Reviewed-on: https://code.wireshark.org/review/2483 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20remove duplicate offset=0Martin Kaiser1-2/+0
Change-Id: I6653b733dfd2c587909371e50fd0c2efc4649dcd Reviewed-on: https://code.wireshark.org/review/2482 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-20no need for if(tree)Martin Kaiser1-6/+4
Change-Id: I5762fb30f57d0f9bc3e5fc786577ed1cc49b64d7 Reviewed-on: https://code.wireshark.org/review/2481 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-20fix printf argument indexEvan Huus1-2/+1
Change-Id: I56aae95d61930c74ac9962225e1bcda72079595e Reviewed-on: https://code.wireshark.org/review/2477 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20Add proto_tree_add_subtree and proto_tree_add_subtree_formatMichael Mann2-0/+66
This is intended as a replacement for all of the proto_tree_add_text followed by proto_item_add_subtree calls. Change-Id: I892136d7b9d8b4e100996097eff62ce7af9512d2 Reviewed-on: https://code.wireshark.org/review/2472 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20add cast to fix buildbotEvan Huus1-1/+1
Change-Id: I945830a6dd9c34adf9802fa9e9948e2e90d8aba8 Reviewed-on: https://code.wireshark.org/review/2476 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20Don't hide tcp option kind/len fieldsEvan Huus1-36/+18
Hidden fields are deprecated, and we were hiding them inconsistently anyways. Bug:10211 Change-Id: Iaf1576ae7bc04c0c0bd896c096b117f1b8af2e9e Reviewed-on: https://code.wireshark.org/review/2474 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20batch of tvb-length conversionsEvan Huus17-104/+103
Change-Id: I5e40df8af6841e3dad71c41d7e43c7971611b15f Reviewed-on: https://code.wireshark.org/review/2473 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20Cleanup display filters reported by checkfiltername.plMichael Mann23-107/+87
Also ensured some files have their correct names at the top so they are more easily grepped Change-Id: Ib0f5ddf14eb1616a93dee496107dc0eb09048825 Reviewed-on: https://code.wireshark.org/review/2452 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20Improve the tolerance of checkfiltername.pl so it can be added to the ↵Michael Mann1-10/+150
pre-commit script. 1. Correctly identify ASN.1 dissectors (so checkfiltername.pl can be more lenient on them) 2. "Whitelist" known (good) filters Change-Id: Iea662190b6655a1919bf08bc35e7978eb2693509 Reviewed-on: https://code.wireshark.org/review/2453 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 23:09:35 +0000