Commit graph

71 commits

Author SHA1 Message Date
Bill Meier
e1541182cb Fix one more MSVC2015 issue: "[...]ignoring unknown option '/Zd'"
Remove some old cruft which compiled packet-rrc.c with '/Zd'
 option for certain very old Microsoft C compilers which we no
 longer support (e.g., MSVC6!).

Change-Id: I47f7ab8c92b9e495acedfe76260d607a01c2a40f
Reviewed-on: https://code.wireshark.org/review/10362
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-09-02 18:35:17 +00:00
Bill Meier
5c529c95c5 Add '*.nativecodeanalysis.xml' to 'clean' targets
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6
Reviewed-on: https://code.wireshark.org/review/6220
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02 01:45:16 +00:00
Роман Донченко
dc748b1e7f Now that Python is mandatory on Windows, remove checks for it from nmakefiles
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a
Reviewed-on: https://code.wireshark.org/review/3392
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09 20:23:39 +00:00
Роман Донченко
afa8f21f56 make-dissectors-reg: optimize by factoring out the loops
Instead of calling the grep/sed pipelines for each file, build the
list of files in the beginning and call each pipeline only once,
passing the list to the first grep.

This results in a massive speedup in Cygwin; in my test, the time
it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan
is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where
the time do to the same goes from ~6 to ~0.5 seconds.

Amend makefile comments to elide mentions of invoking multiple processes
per file.

Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34
Reviewed-on: https://code.wireshark.org/review/2826
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-06 08:08:20 +00:00
Pascal Quantin
cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Alexis La Goutte
757aa33220 Continue to remove $Id$ from top of file
(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-31 18:48:06 +00:00
Pascal Quantin
cf9bbdecef From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9297 :
Add support for MSVC2013

svn path=/trunk/; revision=52716
2013-10-20 17:35:30 +00:00
Chris Maynard
ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Balint Reczey
1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Bill Meier
ae527cbf10 Update a comment.
svn path=/trunk/; revision=47521
2013-02-06 15:01:40 +00:00
Bill Meier
c7dd6480e4 Minor fix when building with VS2012 (VC11):
Prevents warning:
cl : Command line warning D9002 : ignoring unknown option '/Zd'

svn path=/trunk/; revision=46832
2012-12-28 22:13:05 +00:00
Jeff Morriss
0dc1b8b4b2 Run checkAPIs on DISSECTOR_SUPPORT_SRC too. This means we check register.c
(not very useful) but it means we'll also check the IPMI subparsers and
usb.c .  (Yes, register.c could be split out into Yet Another Variable but
I'm not sure it's worth it...)

svn path=/trunk/; revision=46399
2012-12-05 15:11:08 +00:00
Jeff Morriss
5c0dfb9e8e There's no need to include Custom.common here; it gets pulled in by Makefile.common
svn path=/trunk/; revision=42708
2012-05-18 17:19:50 +00:00
Jeff Morriss
af87b31852 Allow custom dissectors in automake too.
svn path=/trunk/; revision=42707
2012-05-18 16:20:36 +00:00
Jeff Morriss
75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Bill Meier
605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +00:00
Anders Broman
84370fffcb Add *.sbr files to the clean target.
svn path=/trunk/; revision=40762
2012-01-29 20:21:30 +00:00
Stig Bjørlykke
5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Gerald Combs
453d491eae Add Makefile.common to the dependency list for register.c.
svn path=/trunk/; revision=36736
2011-04-20 17:08:40 +00:00
Bill Meier
d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Jeff Morriss
c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss
f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00
Kovarththanan Rajaratnam
a831d2d2ca (Windows only) Make sure that register.c depends on make-dissector-reg.py and make-dissector-reg
svn path=/trunk/; revision=30448
2009-10-09 20:53:33 +00:00
Jeff Morriss
4661aad9a4 Run checkapi on the dissector header files
svn path=/trunk/; revision=29883
2009-09-13 19:48:22 +00:00
Jeff Morriss
522ecdd018 Try to get the paths right
svn path=/trunk/; revision=29872
2009-09-13 02:12:03 +00:00
Jeff Morriss
ee8f078374 Move all of the scripts in epan/dissectors/ to tools/ .
Add a target ("x11-dissector") to build the X11 dissector.

Put the X11-related files (back) in the source distribution.

svn path=/trunk/; revision=29871
2009-09-12 23:02:34 +00:00
Jeff Morriss
961cd3c6ce From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2981 :
This patch adds extension support to the X11 dissector.

I've removed the perl script from the make file, since the new one depends on
perl 5.10, xcbproto (at least git as of today), and mesa (at least the
mesa/src/mesa/glapi directory). It seemed easier to just add the generated
header files to svn directly.

svn path=/trunk/; revision=29854
2009-09-11 01:57:59 +00:00
Gerald Combs
c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Anders Broman
0b297c0215 Make it easy to add custom dissectors.
svn path=/trunk/; revision=26783
2008-11-15 15:44:56 +00:00
Gerald Combs
4cb727b342 It looks like /Zd was removed in VC++ 2005.
svn path=/trunk/; revision=26025
2008-08-14 22:23:27 +00:00
Gerald Combs
bb8e507f31 From cjkelly1: Add "/MD" to the PortAudio compilation flags. Fixes
bug 2791.

Don't use "-o" in the PortAudio compilation flags. If we're running Visual
C++ 2008, don't use "/Zd" when compiling packet-rrc.c. Fixes bug 2795.

svn path=/trunk/; revision=26023
2008-08-14 20:56:34 +00:00
Bill Meier
42a24b8c51 packet-ncp2222.obj depends upon packet-ncp2222.inc
svn path=/trunk/; revision=25846
2008-07-27 23:09:37 +00:00
Guy Harris
a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Guy Harris
b6e20d89be Put printf into a separate "termoutput" API group. For most files,
check for it - but not for TShark plugins, as they are expected to
print to the standard output.

svn path=/trunk/; revision=25653
2008-07-01 21:13:32 +00:00
Gerald Combs
83aacf0a09 Add support for "API groups" in checkAPIs.pl. Make the "prohibited"
and "deprecated" groups the default. Add an "abort" group for code that
shouldn't exit the program. Update the makefiles to call "checkAPIs.pl
-g abort" for dissectors. Remove a dependency on "cat" in checkAPIs.pl.

svn path=/trunk/; revision=25614
2008-06-26 22:20:05 +00:00
Anders Broman
e623809550 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25264
2008-05-09 13:59:10 +00:00
Anders Broman
9cc9c92e75 Fix some of the Errors/warnings detected by checkapi,
make non ASCII char a warning for now.

svn path=/trunk/; revision=25240
2008-05-05 20:38:27 +00:00
Jörg Mayer
094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Tomas Kukosa
6c5a299a55 UMTS RRC updated to 3GPP TS 25.331 V7.4.0 (2007-03) and moved to one directory
svn path=/trunk/; revision=21931
2007-05-25 06:54:39 +00:00
Gerald Combs
55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Tomas Kukosa
9f2ccb7fc0 - SSL desegmentation support
- SSL DEFLATE compression method support (RFC3749)
- fix for Bugzilla Bug 1515: SSL bug with mutual authentication

svn path=/trunk/; revision=21368
2007-04-10 15:12:48 +00:00
Gerald Combs
a0afc5d832 Add a registration symbol cache to make-dissector-reg.py. When you
update a dissector and recompile, make-dissector-reg.py can now pull
its list of registration routines from a cache instead of having to
scan through every dissector.  The time to create register.c has gone
from 20 to 30 seconds down to 2 on my desktop machine.

The cache file is a Python pickle data stream.  It should be portable
across architectures, so we may be able to add it to the distribution
at some point.

svn path=/trunk/; revision=21348
2007-04-06 16:15:36 +00:00
Gerald Combs
fdbcca2123 In epan/dissectors/Makefile.nmake, fix a typo.
In make-dissector-reg.py, throw an error if we don't have enough files
to process, or if we don't generate enough registrations.  "Enough"
is arbitrarily set to 100.

This should de-purple the buildbot.  (I'm sure there's a "smoke on the
water" joke in there somewhere.)

svn path=/trunk/; revision=21338
2007-04-05 21:38:39 +00:00
Luis Ontanon
d51726941d xFi a Ytpo
svn path=/trunk/; revision=21328
2007-04-03 20:52:37 +00:00
Sebastien Tandel
edfd071881 Creation of ALL_DISSECTORS_SRC including all dissectors sources
- used in Makefile.nmake instead of DISSECTOR_SRC
 - used for the target register.c

svn path=/trunk/; revision=21327
2007-04-03 20:22:32 +00:00
Ulf Lamping
c2408435bc fix the remaining MSVC warnings by setting individual #pragma(warning:disable) settings - this is very certainly not the way to go, but the way to prevent additional warnings rushing in ...
svn path=/trunk/; revision=21221
2007-03-27 02:14:56 +00:00
Bill Meier
04d29de81d Fix Windows Makefiles so clean removes all pdb files (PDB_FILE no longer defined)
svn path=/trunk/; revision=21052
2007-03-18 15:36:22 +00:00
Gerald Combs
bd282b4114 Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +00:00
Gerald Combs
8e397a2617 Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler
warning in the 802.11 dissector.

svn path=/trunk/; revision=20053
2006-12-06 20:29:54 +00:00
Gerald Combs
a980d04783 From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
support.

WEP key preferences have been overloaded to allow WPA keys.  The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.

Add a few text and whitespace fixups.

svn path=/trunk/; revision=20049
2006-12-05 19:24:25 +00:00