Commit Graph

22 Commits

Author SHA1 Message Date
Guy Harris 9423a13b2d Just have init_progfile_dir() take a void pointer.
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-02-20 00:24:08 +00:00
Guy Harris 63a3d043e3 Consistently use the "g_string_free returns a C string pointer" idiom.
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>
2015-01-13 23:14:13 +00:00
Guy Harris 27be466c9b Do the full string in get_{compiled,runtime}_version_info().
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-31 06:29:11 +00:00
Gerald Combs 9ba9cd83a4 Qt: Add a CaptureFile class.
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-12-20 17:39:29 +00:00
Joerg Mayer ed676ca3b9 Commit 54b733ce9a broke compilation of
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-10-18 06:43:58 +00:00
Peter Wu 0272b9c435 Fix heap-use-after-free via setlocale
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-29 01:53:32 +00:00
Guy Harris 376dfe847b Fix build errors for tfshark and echld.
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-22 01:55:41 +00:00
Guy Harris c46329c27b Add a routine to return a version string including VCS information.
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-22 01:06:25 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(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-03-04 14:27:33 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
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>
2014-02-07 23:03:03 +00:00
Bill Meier 8ab9c55618 From Ville Skyttä: Spelling Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591


svn path=/trunk/; revision=54387
2013-12-23 15:53:13 +00:00
Jörg Mayer 7b80faa66f Fix some warnings that were really errors.
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-18 07:25:12 +00:00
Jörg Mayer a3d422f906 The experimental code in echld/ also got broken by the wtap
file types commit. Make this compile again as well.
Trivial whitespace cleanup while in those files.

svn path=/trunk/; revision=53168
2013-11-08 11:50:57 +00:00
Luis Ontanon c9e6eda769 Yet another iteration...
svn path=/trunk/; revision=50846
2013-07-23 18:26:38 +00:00
Luis Ontanon 880e19ac3d Yet another iteration:
- 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
2013-07-05 23:57:07 +00:00
Luis Ontanon 047c252e93 some more harvesting from tshark
svn path=/trunk/; revision=50380
2013-07-04 05:34:25 +00:00
Luis Ontanon baee2e21f7 ANother iteration,
- started harvesting pieces from tshark.
- fixed? signal handlers
- interactive test program

very hard to debug... set follow-on-fork doesn't seem to work on my mac. Need linux I guess...


svn path=/trunk/; revision=50273
2013-07-01 01:49:34 +00:00
Luis Ontanon a3c320fd75 One further iteration, get things right, put placeholders for things to do.
svn path=/trunk/; revision=50227
2013-06-29 01:16:48 +00:00
Luis Ontanon cf647de6a1 MS: new child
MS: ping child
MS: set/get child parameter


svn path=/trunk/; revision=50218
2013-06-28 21:10:52 +00:00
Luis Ontanon 99013aefa8 MS: list interfaces!
svn path=/trunk/; revision=50195
2013-06-27 19:00:01 +00:00
Luis Ontanon e48b0084e1 MS: Pong from the dispatcher!
svn path=/trunk/; revision=50183
2013-06-27 03:41:48 +00:00
Luis Ontanon 0a060270b3 Last changes to autofoo, rename the files as they live now in their own dir...
svn path=/trunk/; revision=50152
2013-06-25 21:09:29 +00:00