Commit Graph

25 Commits

Author SHA1 Message Date
Guy Harris c1f30471ca Move the version_info.c stuff to wsutil/ws_version_info.c.
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde
Reviewed-on: https://code.wireshark.org/review/6153
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 03:41:02 +00:00
Dario Lombardo 63ebe918d9 Removed duplicated #include lines
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-28 00:02:39 +00:00
Peter Wu f2b4daf400 Add printf-format annotations, fix garbage
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-06 23:00:40 +00:00
Guy Harris 9e6487f247 Move utility routines for capturing into a libcaputils static library.
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-07-04 07:25:26 +00:00
Guy Harris b33512b704 Move capture_session.h to capchild; what it declares is defined there.
Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002
Reviewed-on: https://code.wireshark.org/review/2709
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30 05:09:31 +00:00
Guy Harris adf6b1a8df For capchild headers, include <capchild/XXX.h>.
Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d
Reviewed-on: https://code.wireshark.org/review/2594
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 00:28:08 +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 43443af0ac Move get_copyright_info() to wsutil.
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a
Reviewed-on: https://code.wireshark.org/review/2510
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21 17:33:05 +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
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 061831b3db Don't include epan/filesystem.h any more
svn path=/trunk/; revision=53402
2013-11-17 21:25:00 +00:00
Jörg Mayer f24067ec9d Fix warnings shown by gcc-4.8.1
/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-09-13 17:08:00 +00:00
Jörg Mayer da52691fb1 Include sys/wait.h
svn path=/trunk/; revision=50833
2013-07-23 13:11:16 +00:00
Jörg Mayer 94bdbd2e1e Include config.h, not ../config.h, just like everywhere else.
svn path=/trunk/; revision=50750
2013-07-21 13:25:35 +00:00
Jeff Morriss 16206348d9 Move disabled_protos.{h,c} into epan.
svn path=/trunk/; revision=50521
2013-07-12 01:40:06 +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 db09d8d0f0 another iteration, prepared for automake.
svn path=/trunk/; revision=50136
2013-06-25 03:33:02 +00:00
Luis Ontanon f25a68221c Not yet running but almost there with the dummy
svn path=/trunk/; revision=50114
2013-06-22 20:26:13 +00:00
Luis Ontanon b5c96de50b move echld to final dest...
svn path=/trunk/; revision=50102
2013-06-21 01:27:28 +00:00