aboutsummaryrefslogtreecommitdiffstats
path: root/text2pcap.c
AgeCommit message (Collapse)AuthorFilesLines
2018-12-13text2pcap: allow to set interface nameJaap Keuter1-2/+7
When generating a capture file from a text file it can be helpfull to be able to set the capture interface name in the generated IDB. This can be especially true if later on the generated captures are merged and the individual IDB's have to be compared. Without a name every IDB of the same datalink type will be equal and subject to merge. Also it keeps the individual streams identifiable for the end user. Change-Id: I70224379d88f516a0a356bf0b46aebafb69665f0 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/31015 Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-13Move more version-info-related stuff to version_info.c.Guy Harris1-31/+5
Have a ws_init_version_info() routine that, given an application name string: constructs the app-name-and-version-information string, and saves it; adds the initial crash information on platforms that support it, and saves it. Have show_version() use the saved information and take no arguments. Add a show_help_header() routine to print the header for --help command-line options, given a description of the application; it prints the application name and version information, the description, and the "See {wireshark.org URL}" line. Use those routines in various places, including providing the "application name" string in pcapng SHBs. Change-Id: I0042a8fcc91aa919ad5c381a8b8674a007ce66df Reviewed-on: https://code.wireshark.org/review/31029 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-13Put the main() and wmain() routines for CLI programs into a separate file.Guy Harris1-22/+2
That means that code is only in one place, rather than having copies of it in each of those programs. CLI programs that, on Windows, should get UTF-8 arguments rather than arguments in the local code page should: include the top-level cli_main.h header; define the main function as real_main(); be built with the top-level cli_main.c file. On UN*X, cli_main.c has a main() program, and just passes the arguments on to real_main(). On Windows, cli_main.c has a wmain() function that converts the UTF-16 arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so that it doesn't use any functions other than those provided by the system, and then calls real_main() with the argument count and UTF-8 arguments. Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e Reviewed-on: https://code.wireshark.org/review/31017 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-06Update comments, get rid of IMPORT_MAX_PACKET.Guy Harris1-2/+3
Get rid of the IMPORT_MAX_PACKET #define; just directly use WTAP_MAX_PACKET_SIZE_STANDARD, to match what text2pcap.c does. Update comments in text2pcap.c and ui/text_import.c to say the maximum packet size is WTAP_MAX_PACKET_SIZE_STANDARD. Change-Id: I34118f76426d1416fccf43b2a356ad8d200de19b Ping-Bug: 15292 Reviewed-on: https://code.wireshark.org/review/30945 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-05text2pcap: extend snap lengthJaap Keuter1-3/+2
The snaplength as saved in the capture file is set to the original PCAP file length of 65535. In reality the package size can grow to 256kiB. Make use of the correct constant when writing the PCAP file. Bug: 15292 Change-Id: Ib7710e4151cdc712f3344c1436252f9b3bfb556c Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30923 Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-23text2pcap: cleanup type usageJaap Keuter1-18/+12
The glib gboolean and integer types are used interchangably, while a proper use is easily achievable. While at it, replace the duplicate definition of the IPv4 source and destination addresses (endian sensitive). Change-Id: I5378544f370dc41962eb6303ddeeecb184db14f4 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30770 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-22text2pcap: make ethernet dummy header direction awareJaap Keuter1-4/+11
When giving the command line option '-D' and having 'I' and 'O' markers in the hexdump to import the IP addresses are adjusted, transport layer ports are adjusted, the TCP window information is adjusted, but still the frames originate from the same interface and go to the other interface. This changes makes it so that the Ethernet destination and source address is also adjusted with the direction indicated, to match the other adjusted addressing used. Bug: 15287 Change-Id: I762f195ece206ed14e6bca1c1160055df7c4dac1 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30767 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-21Update text2pcap documentationJaap Keuter1-7/+8
Various parts of the text2pcap documentation need some fixing up. This change brings them back in line and up to date with current features. Change-Id: I038cf5c4943d2a4bbcc3d0fbd8f5e111dcf0d0a9 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30754 Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-19text2pcap: consolidate ethernet header protocol determinationJaap Keuter1-13/+10
With the addition of the IPv6 dummy header the logic to set the correct ethernet protocol has become scattered across the code and also poured into the actual packet writing code. Once command line parsing is completed a consistent set of frame generating parameters should be established. This change consolidates the ethernet header protocol determination to one point, with the added benefit of resolving a possible duplicate IPv4 / IPv6 paramter setting in the same manner as is done for other conflicting parameters. Change-Id: I2c0d3ee8ad5a28b216a374dad807406113200fa2 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30691 Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Vasil Velichkov <vvvelichkov@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18text2pcap: pcapng is an output optionJaap Keuter1-1/+1
Buried at the end of the help text, in the Miscellaneous section, is the '-n' option to write pcapng format files. This can hardly be considered miscellaneous but rather an output option. Move the option in the help text to the output section. Change-Id: I3e39b75281091d6d5d9607891ef2f97ba031e48a Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30690 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18text2pcap: assure an IP next layer protocol is setJaap Keuter1-0/+6
Using -4 or -6 to set an IP address pair to use in the dummy IP header it is possible to generate a capture in which the next layer protocol is undefined. Add a check that an next layer protocol is always set. Bug: 15275 Change-Id: Ifef54be7f708a0f168d2067f6f691e2611f25428 Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/30683 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-31text2pcap: Fix IPv6 checksumVasil Velichkov1-22/+24
Add the length field in the IPv6 pseudo header struct and refactor the pseudo headers initialization Change-Id: Ie0490dfba051a1112e465aaa6d03909417b2977e Reviewed-on: https://code.wireshark.org/review/30407 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-10-31text2pcap: Fix -i <proto> when IPv6 (-6) is specifiedVasil Velichkov1-2/+6
When the -i <proto> option is specified the hdr_ip was always set to TRUE which resulted in a wrong header length when the IPv6 (-6) option is specified as well. To resolve this set hdr_ip only when -i is specified without -4 or -6 options. Change-Id: I21898f27ceaad603b9275ab6878ff4bd8f9586cd Reviewed-on: https://code.wireshark.org/review/30411 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-10-30text2pcap: Fix IPv6 payload lengthVasil Velichkov1-4/+2
According to RFC 8200 the payload length must contain the length of the payload without the IPv6 header's length Change-Id: Ibeb18c243edc396eaac6d2ffde73d6c4a6fe75a0 Reviewed-on: https://code.wireshark.org/review/30406 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-11text2pcap: Fix TCP, UDP or SCTP headers over IPv6Vasil Velichkov1-4/+10
When the IPv6 (-6) option was specified together with either TCP (-T), UDP (-u) or SCTP (-s/-S) option the generated packet was invalid because an IPv4 option was implied an a wrong header was added. Bug: 15194 Change-Id: I5a7b83d8aa3f3ad56f0c8110e598090945e60225 Reviewed-on: https://code.wireshark.org/review/30107 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-08Bring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.Guy Harris1-7/+4
Call it from wmain() in the command-line tools, passing it the input argument count and vector, and call it from main() in Wireshark, after getting a UTF-16 argument vector from passing the result of GetCommandLineW() to CommandLineToArgvW(). Change-Id: I0e51703c0a6c92f7892d196e700ab437bd702514 Reviewed-on: https://code.wireshark.org/review/30063 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-07Use wsetargv.obj, and wmain() rather than main(), on Windows.Guy Harris1-8/+26
Doing so for command-line programs means that the argument list doesn't ever get converted to the local code page; converting to the local code page can mangle file names that *can't* be converted to the local code page. Furthermore, code that uses setargv.obj rather than wsetargv.obj has issues in some versions of Windows 10; see bug 15151. That means that converting the argument list to UTF-8 is a bit simpler - we don't need to call GetCommandLineW() or CommandLineToArgvW(), we just loop over the UTF-16LE argument strings in argv[]. While we're at it, note in Wireshark's main() why we discard argv on Windows (Qt does the same "convert-to-the-local-code-page" stuff); that means we *do* need to call GetCommandLineW() and CommandLineToArgvW() in main() (i.e., we duplicate what Qt's WinMain() does, but converting to UTF-8 rather than to the local code page). Change-Id: I35b57c1b658fb3e9b0c685097afe324e9fe98649 Ping-Bug: 15151 Reviewed-on: https://code.wireshark.org/review/30051 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-13Get rid of TestBigEndian and AC_C_BIGENDIAN.Gerald Combs1-2/+2
Get rid of CMake's TestBigEndian and Autotools' AC_C_BIGENDIAN checks in favor of G_BYTE_ORDER. We use G_BYTE_ORDER elsewhere and TestBigEndian is noticeably slow on Windows. Change-Id: Idc1326294db9cbee8f6b6b11c2028fc4d19acbf0 Reviewed-on: https://code.wireshark.org/review/26462 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-16Squelch redundant declaration warnings.Guy Harris1-2/+1
Have the text-to-pcap scanners define a routine that the main code calls, which both allocates and destroys the scanner. Don't declare the Lex-generated routines in a header file we create, declare that routine, instead. Change-Id: Icad6a83db1a0dea8ac390315af72383fc99f8513 Reviewed-on: https://code.wireshark.org/review/25822 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo1-1/+1
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-09Use pcapng as the name of the file format.Guy Harris1-3/+3
At one point, I remember a discussion resulting in the official name of the next-generation replacement for pcap format being changed to "pcapng", with no hyphen. Make Wireshark reflect that. Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a Reviewed-on: https://code.wireshark.org/review/25214 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-09Start using SPDX license identifiers.Gerald Combs1-13/+1
A while back Graham pointed out the SPDX project (spdx.org), which is working on standardizing license specifications: https://www.wireshark.org/lists/wireshark-dev/201509/msg00119.html Appendix V of the specification describes a short identifier (SPDX-License-Identifier) that you can use in place of boilerplate in your source files: https://spdx.org/spdx-specification-21-web-version#h.twlc0ztnng3b Start the conversion process with our top-level C and C++ files. Change-Id: Iba1d835776714deb6285e2181e8ca17f95221878 Reviewed-on: https://code.wireshark.org/review/24302 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-26Add a ws_in6_addr typedef for struct e_in6_addr.Guy Harris1-9/+9
That allows a parallel typedef of ws_in4_addr for guint32. Change-Id: I03b230247065e0e3840eb87635315a8e523ef562 Reviewed-on: https://code.wireshark.org/review/24073 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-1/+1
It's not installed so like most other files it doesn't need or benefit from the prefix. Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c Reviewed-on: https://code.wireshark.org/review/23751 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-25text2pcap: fix crash when there is no argumentPascal Quantin1-3/+10
Bug: 14082 Change-Id: Ifd8b2bf9bee817967e3b00e01b8b4ae90970e984 Reviewed-on: https://code.wireshark.org/review/23727 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: Michael Mann <mmann78@netscape.net>
2017-08-11Do not allow -m option to be larger than our allocated bufferSontol Bonggol1-0/+6
Specifying -m larger than our allocated buffer may result in segfault. This patch protects it from happening and exits early. Change-Id: I2197605d90c98fc9d12b69a68fe533aaf6457df2 Reviewed-on: https://code.wireshark.org/review/23044 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>
2017-06-05Allow bigger snapshot lengths for D-Bus captures.Guy Harris1-4/+4
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for them, because that's the largest possible D-Bus message size. See https://bugs.freedesktop.org/show_bug.cgi?id=100220 for an example of the problems caused by limiting the snapshot length to 256KB for D-Bus. Have a snapshot length of 0 in a capture_file structure mean "there is no snapshot length for the file"; we don't need the has_snap field in that case, a value of 0 mean "no, we don't have a snapshot length". In dumpcap, start out with a pipe buffer size of 2KB, and grow it as necessary. When checking for a too-big packet from a pipe, check against the appropriate maximum - 128MB for DLT_DBUS, 256KB for everything else. Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20 Reviewed-on: https://code.wireshark.org/review/21952 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29Check for localtime() failing.Guy Harris1-2/+12
It "shouldn't happen", but at least this squelches a Coverity complaint, CID 1394503. Change-Id: I40af10d47c1d1b026f6b40ef68b139e6bf246109 Reviewed-on: https://code.wireshark.org/review/20774 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28text2pcap: define max packet size to WTAP_MAX_PACKET_SIZEPascal Quantin1-5/+6
Change-Id: I73ab87032e4a0c0259227622412be36aaf66a9d6 Reviewed-on: https://code.wireshark.org/review/20758 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-28text2pcap: free memory on exit.Dario Lombardo1-4/+5
Make also text2pcap_lex_destroy() public to be called from main. Change-Id: I360c3dd3991d027afe6e4542ea5f9680e92f92cf Reviewed-on: https://code.wireshark.org/review/20226 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: Dario Lombardo <lomato@gmail.com>
2017-02-27text2pcap: fix -Wmacro-redefined warningPeter Wu1-3/+3
With flex 2.6.3, this warning is observed (which causes a build failure when -Werror is not disabled: text2pcap-scanner.c:398:9: warning: 'yywrap' macro redefined [-Wmacro-redefined] #define yywrap() (/*CONSTCOND*/1) ^ text2pcap-scanner.c:76:13: note: previous definition is here #define yywrap yywrap Issue is specific to flex 2.6.3 and resolved upstream at https://github.com/westes/flex/issues/162 Change-Id: I861565f5080f87a9457427e7a63b5d9256c49e85 Reviewed-on: https://code.wireshark.org/review/20294 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27text2pcap: check return values of functions and use a single exit point.Dario Lombardo1-70/+96
This is going to check every function for success and following patches will free allocated memory in clean_exit. Change-Id: I7ba7a53eae8a37a4c25e56369af20e575c3489fb Reviewed-on: https://code.wireshark.org/review/20225 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-22Include <io.h> and <fcntl.h> for _setmode().Guy Harris1-0/+5
Change-Id: I1910275653ef4a985e9894f01cf5cb5fa33070d4 Reviewed-on: https://code.wireshark.org/review/18928 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-22On Windows, put the standard output in binary mode if we're writing the ↵Guy Harris1-2/+13
capture file to it. While we're at it, explicitly compare the restult of strcmp() against 0, to make it clearer that it's testing for the argument *not* being equal to "-". Bug: 13165 Change-Id: Ic63085abb2de5f5c60d2101d19c1a269b7e0c9d7 Reviewed-on: https://code.wireshark.org/review/18924 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22More checks for localtime() and gmtime() returning NULL.Guy Harris1-0/+1
And some comments in the case where we're converting the result of time() - if your machine's idea of time predates January 1, 1970, 00:00:00 UTC, it'll crash on Windows, but that's not a case where a *file* can cause the problem due either to a bad file time stamp or bad time stamps in the file. Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498 Reviewed-on: https://code.wireshark.org/review/18369 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-10Fix version-string releated memleak for some CLI toolsPeter Wu1-0/+4
These programs resulted on a memleak report on exit. Change-Id: I630618f50d723b7af4cb00ba29671d4e7c6fcdc2 Reviewed-on: https://code.wireshark.org/review/17623 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-04-21Link version code statically againJoão Valverde1-1/+1
This allows keeping the code-sharing with the static linking. This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more external dependencies to wsutil than strictly necessary. A nice side-effect is that libwsutil no longer depends on version.h. Follow up to f95976eefcbeb5d24df383c29d29ef888b503945. Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23 Reviewed-on: https://code.wireshark.org/review/15002 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-04Include ws_diag_control.h in config.hJoão Valverde1-1/+0
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317 Reviewed-on: https://code.wireshark.org/review/14749 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-03Move zlib version check to wsutilJoão Valverde1-32/+2
Change-Id: I0950f61e90af5bb21c0017204de0c0b509616e5c Reviewed-on: https://code.wireshark.org/review/14747 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-24Put pcapio.c into a writecap library, and use it.Guy Harris1-1/+1
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-19Add inet_pton/inet_ntop interface to libwsutilJoão Valverde1-42/+16
Change-Id: Ifc344ed33f2f7ca09a6912a5adb49dc35f07c81f Reviewed-on: https://code.wireshark.org/review/13881 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-13Just #include wsutil/inet_aton.hJoão Valverde1-4/+0
No need for platform-specific system header boilerplate. Change-Id: I5387a0005ddb0d7aab3c5b9f28d6282053c1b0fd Reviewed-on: https://code.wireshark.org/review/13865 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-13Fix an indentation to get rid ofJoerg Mayer1-2/+3
text2pcap.c:1254:17: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] Change-Id: Ifa031f5faad3445bcd3ab893d83c5dc6386fe3a2 Reviewed-on: https://code.wireshark.org/review/13927 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-12-21Don't write out statistics if we don't have any.Guy Harris1-29/+0
We don't know when the capture started or ended (the time stamps of the first and last packets aren't necessarily the time when the capture started or ended), we don't know how many packets were dropped in the capture process, and we don't know how many packets were seen in various stages before they were received by whatever software dumped them out as text, so we have no statistics to report. Change-Id: Ia8bface63a95f925a6ccb19c32d188055809f203 Reviewed-on: https://code.wireshark.org/review/12812 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-21text2pcap: fix There are identical sub-expressions 'num_packets_written' to ↵Alexis La Goutte1-1/+1
the left and to the right of the '-' operator found by PVS Studio (V501) Change-Id: Ib3fb73f6cc3dba549bd3104e9227f4e4a6e3b08c Reviewed-on: https://code.wireshark.org/review/12310 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-12Remove -Wwrite-strings compiler flagJoão Valverde1-4/+2
The "-Wwrite-strings" flag produces nuisance warnings. These warnings are not useful, they're impossible to fix in a sane way and therefore are being handled with casts of static strings to (char *). This just moves the warning to [-Wcast-qual] and a compiler pragma is in turn required (and used) to squelch that warning. Remove the Wwrite-strings warning. Let that responsibility fall on the programmer (as is done by casting). Change-Id: I5a44dfd9decd6d80797a521a3373593074962fb5 Reviewed-on: https://code.wireshark.org/review/12162 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-11Update user guide for development releasePascal Quantin1-1/+1
Change-Id: I9b4c5ab2e98ad6daa618bcda20b53a23467e16e0 Reviewed-on: https://code.wireshark.org/review/11734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-07Clean up includes of unistd.h, fcntl.h, and sys/stat.h.Guy Harris1-4/+0
Have wsutil/file_util.h include them on UN*X, just as it includes io.h on Windows, so we can have a rule of "if you do file operations, include <wsutil/file_util.h> and use the routines in it". Remove includes of unistd.h, fcntl.h, and sys/stat.h that aren't necessary (whether because of the addition of them to wsutil/file_util.h or because they weren't needed in the first place). Change-Id: Ie241dd74deff284e39a5f690a297dbb6e1dc485f Reviewed-on: https://code.wireshark.org/review/11619 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-20Suppress a bunch of cast-qual warnings.Gerald Combs1-0/+3
Squelch warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual] similar to g630f54f. Change strtod to g_ascii_strtod to squelch a checkAPIs error. Change-Id: Ib2d26ef89f08827a5adc07e35eaf876cd7b8d14e Reviewed-on: https://code.wireshark.org/review/7269 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-09(Trivial) Fix printf-related 'Mismatch on sign' warningsBill Meier1-1/+1
Found by MSVC2013 Code Analysis Change-Id: I58063946dd558e98308c87b36eeac0ddbe1a6e79 Reviewed-on: https://code.wireshark.org/review/7045 Reviewed-by: Bill Meier <wmeier@newsguy.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:22:29 +0000