osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
71,137 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

20 Commits

Author SHA1 Message Date
Guy Harris b32a5ee98c Don't add the wiretap directory to the list of include directories. 
If you include something from the wiretap directory, always precede it
with wiretap/.

Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.

This makes it a bit clearer what's being included.

Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
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>
 2016-02-18 12:55:26 +00:00
Michael Mann f2b8504740 Don't limit capture packet counts to a fixed set of protocols. 
Kept backwards compatibility with GTK+ capture info dialog by keeping the protocols tracked hardcoded, but Qt should have more freedom.

Change-Id: I497be71ec761d53f312e14858daa7152d01b8c72
Reviewed-on: https://code.wireshark.org/review/12724
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2015-12-22 05:23:06 +00:00
Guy Harris d4bfa9c43b Have a common routine for constructing strings listing interfaces. 
We have a bunch of duplicated code to make those lists; make a common
routine for that.  (dumpcap currently doesn't use it, as the routine in
question uses a routine in libui, which dumpcap doesn't use.  We should
probably fix that.)

Change-Id: I9058bf3320d420b8713e90743618972da1d1c6ed
Reviewed-on: https://code.wireshark.org/review/7934
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2015-04-05 23:43:01 +00:00
Bill Meier bfde04b845 ui/gtk/*.c: Add editor modelines; As needed: Fix indentation 
Change-Id: I8cd9d9fe5f12c284f46b8f725766f681faccd753
Reviewed-on: https://code.wireshark.org/review/7138
Reviewed-by: Bill Meier <wmeier@newsguy.com>
 2015-02-15 19:02:30 +00:00
Guy Harris 435e7c6106 Move the AirPcap stuff into caputils. 
Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8
Reviewed-on: https://code.wireshark.org/review/3308
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-08-01 00:30:03 +00:00
Guy Harris a3f7d1951d Get rid of #if 0'ed out includes of capture-pcap-util.h. 
Change-Id: Ie3678a08ed9b3d46b22e7c59eef74e6e9636ae59
Reviewed-on: https://code.wireshark.org/review/3140
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-07-20 22:14:26 +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 ad1391aa4e Move capture.[ch] to libui. 
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0
Reviewed-on: https://code.wireshark.org/review/2711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-06-30 05:38:57 +00:00
Guy Harris df5833723c Move capture_ui_utils.[ch] to libui. 
Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a
Reviewed-on: https://code.wireshark.org/review/2708
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-06-30 01:36:56 +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
Guy Harris 8596d17d7f Pull the capture-session state information out of capture_opts and put 
it into a separate capture_session structure.  capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag).

svn path=/trunk/; revision=49493
 2013-05-22 07:44:28 +00:00
Bill Meier 8112ecc321 From beroset: 
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404

Note: The following parts of the patch had been previously done:
 asn1/snmp/packet-snmp-template.c
 epan/dissectors/packet-snmp.c
 epan/dissectors/packet-x11.c

Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
 didn't compile and needed a few additional patches.


svn path=/trunk/; revision=48447
 2013-03-21 02:29:09 +00:00
Anders Broman 76fd64bd9f Use explicit casts. 
svn path=/trunk/; revision=48183
 2013-03-07 22:57:36 +00:00
Bill Meier d6ddcc9e54 Replace gtk_table...() with ws_gtk_grid...() 
with some minor changes so that window resizing
 functions the same for both Gtk2 & Gtk3.

svn path=/trunk/; revision=47019
 2013-01-10 15:19:29 +00:00
Bill Meier ff7059d588 (Trivial) Remove unneeded #include. 
svn path=/trunk/; revision=45376
 2012-10-07 22:33:59 +00:00
Jeff Morriss 3729335973 We always HAVE_CONFIG_H so don't bother checking whether we have it or not. 
svn path=/trunk/; revision=45016
 2012-09-20 01:48:30 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address. 
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
 2012-06-28 22:56:06 +00:00
Anders Broman dbc4b09004 From Evan Huus Convert a bunch more GTK-2 calls to their cross-version ws_ equivalent 
svn path=/trunk/; revision=43009
 2012-06-02 23:53:04 +00:00
Bill Meier a703450659 AFAICT '#include sys/types.h' is not needed for these files. 
svn path=/trunk/; revision=42443
 2012-05-05 20:51:14 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk. 
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
 2012-01-15 21:59:11 +00:00