aboutsummaryrefslogtreecommitdiffstats
path: root/echld
AgeCommit message (Collapse)AuthorFilesLines
2015-02-28Get rid of unused variable.Guy Harris1-1/+0
Change-Id: I4141f00285cbb6080a782ea2837ea87b7100e081 Reviewed-on: https://code.wireshark.org/review/7439 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-20Just have init_progfile_dir() take a void pointer.Guy Harris1-1/+1
dladdr() takes a void * as a code pointer; have init_progfile_dir() do so, and do the casting in the calls. We don't care about the signature of the function whose address we're passing, we just want to pass a pointer to *something* in the main program. Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709 Reviewed-on: https://code.wireshark.org/review/7270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-22Get us building with the subdir-objects automake option.Jeff Morriss2-15/+1
subdir-objects will be enabled unconditionally in automake-2.0 and automake-1.14 gives us warnings about the upcoming change. Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of the source files rather than the full path to each. In echld don't use sources in the top-level directory in libechld: it breaks distclean with subdir-objects turned on. Bug: 10648 Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76 Reviewed-on: https://code.wireshark.org/review/6697 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-18Clean up ftype-conversion and dfilter error message string handling.Guy Harris1-9/+11
Have dfilter_compile() take an additional gchar ** argument, pointing to a gchar * item that, on error, gets set to point to a g_malloc()ed error string. That removes one bit of global state from the display filter parser, and doesn't impose a fixed limit on the error message strings. Have fvalue_from_string() and fvalue_from_unparsed() take a gchar ** argument, pointer to a gchar * item, rather than an error-reporting function, and set the gchar * item to point to a g_malloc()ed error string on an error. Allow either gchar ** argument to be null; if the argument is null, no error message is allocated or provided. Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c Reviewed-on: https://code.wireshark.org/review/6608 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13Consistently use the "g_string_free returns a C string pointer" idiom.Guy Harris4-19/+5
g_string_free(str, FALSE) frees the GString container but not the underlying g_malloc()ed string; instead, it returns a pointer to the g_malloc()ed string. Fix those places that didn't already get the string pointer from g_string_free() to do so rather than manually extracting the string themselves. And fix one place that didn't even need to use a string - it was just scanning a C string without even modifying it. Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5 Reviewed-on: https://code.wireshark.org/review/6532 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31No version_info.c any more.Guy Harris1-2/+1
Change-Id: I96f4d07ac08d80811bb4ba9469cba8265d288945 Reviewed-on: https://code.wireshark.org/review/6157 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31Do the full string in get_{compiled,runtime}_version_info().Guy Harris1-4/+2
Have them start the string with "Compiled" or "Running on", and return the string when done. Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810 Reviewed-on: https://code.wireshark.org/review/6155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-1/+0
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-28Removed duplicated #include linesDario Lombardo1-1/+0
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c Reviewed-on: https://code.wireshark.org/review/6065 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-20Qt: Add a CaptureFile class.Gerald Combs1-1/+1
Wrap the capture_file struct in a QObject which translates cf_cb_* and capture_cb_* events into signals. Move the global cfile to capture_file.cpp. Don't use a void pointer for the capture file struct. Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a Reviewed-on: https://code.wireshark.org/review/5885 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-18Commit 54b733ce9a0d1cd4ab9b142479368a5e696360be broke compilation ofJoerg Mayer1-15/+18
echld by removing TS_PREC_AUTO_USEC. Replace its use by TS_PREC_AUTO. No idea whether that's correct but it compiles again. Trying to commit this brought complaints by checkapi, so fixed them as well. Maybe the echld code should be removed, it seems to be unmaintained. Change-Id: Id9a0a6fc129abd1b8c93629c31a89c2d9ea2243f Reviewed-on: https://code.wireshark.org/review/4811 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-31Add a bunch of missing files to the distribution.Guy Harris1-1/+2
Files from the debian directory, documents from the doc directory, graphics from the docbook/wsug_graphics directory, and the echld Makefile.nmake. Change-Id: Iccccc58811753581b0b180053defd937aea22f95 Reviewed-on: https://code.wireshark.org/review/3283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-29Fix heap-use-after-free via setlocalePeter Wu1-1/+12
setlocale returns a statically-allocated memory which can be modified by subsequent calls of setlocale. This triggers a heap-use-after free in ASAN when the setlocale function is called again with the previous pointer. This was found when trying to use the "Show All Streams" option via the Telephony -> RTP menu. While at it, add some modelines Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a Reviewed-on: https://code.wireshark.org/review/3234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-07Wrong macro.Guy Harris1-1/+1
Change-Id: I2e0e7c1a30c9fc2d5af7cbd53dae26ad9a619e71 Reviewed-on: https://code.wireshark.org/review/2908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06Add printf-format annotations, fix garbagePeter Wu2-2/+4
The WRETH dissector showed up some garbage in the column display. Upon further inspection, it turns out that the format string had a trailing percent sign which caused (unsigned)-1 to be returned by g_printf_string_upper_bound (in emem_strdup_vprintf). Then ep_alloc is called with (unsigned)-1 + 1 = 0 memory, no wonder that garbage shows up. ASAN could not even catch this error because EP is in charge of this. So, start adding G_GNUC_PRINTF annotations in each header that uses the "fmt" or "format" paramters (grepped + awk). This revealed some other errors. The NCP2222 dissector was missing a format string (not a security vuln though). Many dissectors used val_to_str with a constant (but empty) string, these have been replaced by val_to_str_const. ASN.1 dissectors were regenerated for this. Minor: the mate plugin used "%X" instead of "%p" for a pointer type. The ncp2222 dissector and wimax plugin gained modelines. Change-Id: I7f3f6a3136116f9b251719830a39a7b21646f622 Reviewed-on: https://code.wireshark.org/review/2881 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris3-5/+4
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_session.h to capchild; what it declares is defined there.Guy Harris1-1/+1
Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002 Reviewed-on: https://code.wireshark.org/review/2709 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-29clopts_common.c is now part of wsutil.Guy Harris1-1/+0
Change-Id: I0fa773bfc6364689d6e4f97ee89a6508622d2b2a Reviewed-on: https://code.wireshark.org/review/2706 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24capture_ifinfo.c and capture_sync.c are now in libcapchild.Guy Harris1-2/+0
Change-Id: I8203a3a1a77f231c4286fd32fcc6372a2ac9db48 Reviewed-on: https://code.wireshark.org/review/2603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24For capchild headers, include <capchild/XXX.h>.Guy Harris1-2/+2
Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d Reviewed-on: https://code.wireshark.org/review/2594 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Fix build errors for tfshark and echld.Guy Harris2-4/+6
Some come from the recent version information changes, some were broken before that. Change-Id: I9429f7d45d3c51c579aef592b37c79130a443299 Reviewed-on: https://code.wireshark.org/review/2531 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Add a routine to return a version string including VCS information.Guy Harris1-2/+2
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-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-21Move get_copyright_info() to wsutil.Guy Harris1-0/+1
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-01Remove 'include win32.mak' from certain nmake files when not needed.Bill Meier1-1/+0
Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74 Reviewed-on: https://code.wireshark.org/review/1460 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte4-7/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte8-16/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier1-5/+5
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-2/+2
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2013-12-23From Ville Skyttä: Spelling FixesBill Meier2-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 svn path=/trunk/; revision=54387
2013-11-18Fix some warnings that were really errors.Jörg Mayer3-14/+7
It would really help to fix the remaining warnings so that these files can be compiled with -Werror, which gets me to the quesiton: Is this code still maintained in some form or was it an interesting experiment that has been terminated? svn path=/trunk/; revision=53406
2013-11-17Don't include epan/filesystem.h any moreJörg Mayer1-1/+0
svn path=/trunk/; revision=53402
2013-11-08The experimental code in echld/ also got broken by the wtapJörg Mayer2-61/+61
file types commit. Make this compile again as well. Trivial whitespace cleanup while in those files. svn path=/trunk/; revision=53168
2013-10-27More SVN properties cleanup.Jeff Morriss3-3/+3
svn path=/trunk/; revision=52884
2013-09-13Move common.c to dirty filesJörg Mayer1-1/+1
svn path=/trunk/; revision=52012
2013-09-13FixJörg Mayer1-1/+1
/home/jmayer/work/wireshark/svn/trunk/echld/parent.c: In function ‘echld_terminate’: /home/jmayer/work/wireshark/svn/trunk/echld/parent.c:305:5: error: suggest braces around empty body in ‘do’ statement [-Werror=empty-body] do ; while(sleep(1)); /* wait a full sec without signals */ ^ cc1: all warnings being treated as errors svn path=/trunk/; revision=52011
2013-09-13Fix might be used uninitialized warningJörg Mayer1-1/+1
svn path=/trunk/; revision=52009
2013-09-13Fix warnings shown by gcc-4.8.1Jörg Mayer3-56/+55
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat] {0,NULL} ^ /home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: (near initialization for ‘t_map[34].type’) [-Werror=c++-compat] /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’ /home/jmayer/work/wireshark/svn/trunk/echld/common.c:253:8: error: variable ‘off’ set but not used [-Werror=unused-but-set-variable] long off; ^ cc1: all warnings being treated as errors Still todo: /home/jmayer/work/wireshark/svn/trunk/echld/common.c: In function ‘echld_read_frame’: /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: error: enum conversion when passing argument 4 of ‘cb’ is invalid in C++ [-Werror=c++-compat] cb( &(r->rp[sizeof(hdr_t)]), HDR_LEN(h), h->h.chld_id, HDR_TYPE(h), h->h.reqh_id, cb_data); ^ /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’ Whitespace fixes svn path=/trunk/; revision=52007
2013-07-23Fix ECHLD_TIMEOUT vs ECHLD_TIMED_OUT a second time for today.Jörg Mayer1-2/+2
svn path=/trunk/; revision=50852
2013-07-23Yet another iteration...Luis Ontanon6-32/+156
svn path=/trunk/; revision=50846
2013-07-23Move files to dirty that generate a warning aboutJörg Mayer1-5/+9
variable length array svn path=/trunk/; revision=50835
2013-07-23- Fix a typo that was warned about (acually a coding error thatJörg Mayer1-23/+24
would not have had any effect in this particular case). - Remove trailing whitespace. svn path=/trunk/; revision=50834
2013-07-23Include sys/wait.hJörg Mayer1-0/+4
svn path=/trunk/; revision=50833
2013-07-21- Whitespace changesJörg Mayer1-11/+11
- Add a missing continuation \ svn path=/trunk/; revision=50770
2013-07-21Remove trailing whitespaceJörg Mayer1-14/+14
svn path=/trunk/; revision=50754
2013-07-21More fixes for building echld with cmake (not yet finished)Jörg Mayer1-11/+24
svn path=/trunk/; revision=50752
2013-07-21Include config.h, not ../config.h, just like everywhere else.Jörg Mayer2-2/+2
svn path=/trunk/; revision=50750
2013-07-12disabled_protos.c is in libwireshark now.Jeff Morriss1-1/+0
svn path=/trunk/; revision=50523
2013-07-12Move disabled_protos.{h,c} into epan.Jeff Morriss1-1/+1
svn path=/trunk/; revision=50521
2013-07-05Yet another iteration:Luis Ontanon6-203/+413
- improve the parameter api - Add a parameter set message to the NEW child message to set parameters in bulk in the child - some more harvestig from tshark svn path=/trunk/; revision=50393
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 16:21:46 +0000