Commit graph

843 commits

Author SHA1 Message Date
Anders Broman
73c91d6fa0 "Upgrade" gtk_combo to 'E'.
svn path=/trunk/; revision=36746
2011-04-21 06:05:55 +00:00
Jeff Morriss
4f510bc54d Based on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c2 :
Move the setting of debug environment variables out of the while loop.

Export MALLOC_OPTIONS=AJ to increase memory allocation debug on FreeBSD (and
others).

Export a number of environment variables that MacOS looks at.

(I don't have easy access to either of these OS so this has not been tested.)

Add a comments for each entry explaining which OS uses it and what it does.

svn path=/trunk/; revision=36622
2011-04-13 15:36:05 +00:00
Anders Broman
3db53e54ba Build win64 with a modified zlib (google is your friend).
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0

First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.

svn path=/trunk/; revision=36616
2011-04-13 04:47:38 +00:00
Anders Broman
a0e2d8ec0a Use the new label(It will still break on zlib as zlib 1.2.5 isn't used yet).
svn path=/trunk/; revision=36611
2011-04-12 21:09:34 +00:00
Anders Broman
b5125be726 Build with zlib-1.2.5 for win32
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
 * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
 * wrong. So make sure any such macros misguidedly defined by the
 * user have no effect. Windows has large file support, but the
 * official zlib DLL has not been built to provide the 64-bit offset
 * APIs, sigh.  So we have just patched out the 64-bit offset API
 * from this header file.
 */

svn path=/trunk/; revision=36586
2011-04-12 15:44:05 +00:00
Gerald Combs
a5b20fbdf6 Add a relative path to the "#line" directives we produce. Regenerate the
SNMP and SPNEGO dissectors to see if it helps Coverity locate the
original source files.

svn path=/trunk/; revision=36522
2011-04-08 19:51:39 +00:00
Gerald Combs
92c8f32ff7 Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.

svn path=/trunk/; revision=36483
2011-04-05 22:38:12 +00:00
Bill Meier
4f462b3d09 foo="\windows\style\pathname"; printf "$foo" isn't going to work too well in the general case ...
svn path=/trunk/; revision=36479
2011-04-05 19:21:16 +00:00
Bill Meier
84837d8fcd 1. Remove \r from tshark output so output OK on Windows cygwin bash.
2. Error messsages to stderr.
3. Check capinfos return value to verify that file is a valid capture file.

svn path=/trunk/; revision=36478
2011-04-05 18:01:33 +00:00
Jeff Morriss
b8acdc8ee0 Set BIN_DIR to . by default. Use tr to replace colons with newlines.
svn path=/trunk/; revision=36467
2011-04-05 01:21:19 +00:00
Jeff Morriss
8dba97226a Based on idea from Bill Meier:
A little script to extract the protocols used in given capture files.

(Just so I don't have to remember how to do it again.)

svn path=/trunk/; revision=36462
2011-04-04 19:10:30 +00:00
Jeff Morriss
4cbe8ff6db Fix up indentation
svn path=/trunk/; revision=36461
2011-04-04 18:43:59 +00:00
Anders Broman
5e494f36ae From Vincent Helfre:
updated the script that extracts the asn1 from the specification (we modified it after noticing that it currently fails to take the IMPORT section). It should also work now to extract the WCDMA RRC (TS 25.331).

svn path=/trunk/; revision=36442
2011-04-04 14:35:21 +00:00
Chris Maynard
c236db55fe Don't use pParser->yyidx as an index into pParser->yystack[] until after it is
verified that it is non-negative.  Should resolve CID 619.

svn path=/trunk/; revision=36431
2011-04-01 16:55:59 +00:00
Ronnie Sahlberg
f4d68c6a08 Memory leak in lemon.c
coverity 1177


svn path=/trunk/; revision=36427
2011-03-31 20:50:13 +00:00
Jeff Morriss
892d734975 Prohibit (memory-unsafe) g_sprintf() and g_vsprintf().
svn path=/trunk/; revision=36390
2011-03-29 01:27:20 +00:00
Stig Bjørlykke
feb0a4aeaa Allocate space for null termination in make_basename.
Coverity 710.

svn path=/trunk/; revision=36247
2011-03-22 11:46:19 +00:00
Ronnie Sahlberg
dddec126f6 Coverity 323
Use strdup to copy a string literal we will free() later on.



svn path=/trunk/; revision=36240
2011-03-22 09:12:57 +00:00
Gerald Combs
667629d80d Don't clobber the capinfos data if we have a valid capture file. This
should let the original file information show up in bug reports.

svn path=/trunk/; revision=36209
2011-03-17 19:53:28 +00:00
Anders Broman
49ac7b9759 W -> E for g_clist funktions.
svn path=/trunk/; revision=36171
2011-03-08 19:55:22 +00:00
Jeff Morriss
1e425a1d66 As suggested by Anders: when we detect non-ASCII characters, print the line
number on which we found them.

svn path=/trunk/; revision=36122
2011-03-02 17:18:34 +00:00
Chris Maynard
25d68e6c5b Disallow invalid char's in the filename passed to idl2wrs. Fixes bug 1129.
svn path=/trunk/; revision=35944
2011-02-14 01:44:15 +00:00
Jeff Morriss
2620f18569 There is a better (and faster) way to see if all the members of one list are
in another list: convert the 2nd list to a hash.  This speeds checking for ett_
variables up considerably.

Store the pattern to match ett_ variable names in a variable (since it's used 3
times).

Only match ett_ variable declarations that start on their own line (hopefully to
speed things up a bit).

svn path=/trunk/; revision=35929
2011-02-12 03:53:29 +00:00
Jeff Morriss
e13389a2b7 Add a function to verify that ett_ variables are registered (or at least
stored in an array which will hopefully be registered).

This is a work-in-progress, so the function is not called.

It is also EXTREMELY slow on big files.  (Or maybe it's looping...
I haven't yet had the patience to let it finish processing packet-rrc.c .)

svn path=/trunk/; revision=35923
2011-02-11 22:44:29 +00:00
Jeff Morriss
d8659693ef Check for places where tvb_bytes_to_str() or tvb_get_bytes_to_str_punct()
should be used (instead of the non-tvb functions with a call to tvb_get_ptr()).

Use those functions in a bunch of places.

svn path=/trunk/; revision=35911
2011-02-11 02:43:07 +00:00
Jeff Morriss
8d03f63e17 Oops, put a comma back
svn path=/trunk/; revision=35910
2011-02-11 02:29:45 +00:00
Jeff Morriss
1a0287a486 Clean up indentation
svn path=/trunk/; revision=35909
2011-02-11 02:27:33 +00:00
Jeff Morriss
7be63e199b Add (commented-out for now) code to check certain function calls for embedded
(in the argument list) calls to tvb_get_ptr().

svn path=/trunk/; revision=35906
2011-02-10 22:53:48 +00:00
Anders Broman
6f598e72e1 White space changes.
svn path=/trunk/; revision=35825
2011-02-04 16:22:37 +00:00
Bill Meier
bec334b1c6 Fix: Cygwin make fails after updating to bash v 4.1.9.2
Extracts from the cygwin Bash 4.1.9.2 release announcement:

4a. For a single affected script, add this line just after the she-bang:
 (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed

4e. bash-4.1.9-1 dropped support for 'shopt -s igncr';

I'm assuming this is backwards compatible; If not, we'll know quite shortly :) 


svn path=/trunk/; revision=35788
2011-02-03 19:33:48 +00:00
Anders Broman
583d2776f5 Add GTK 2.22 deprecated functions
svn path=/trunk/; revision=35759
2011-02-02 17:11:26 +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
Bill Meier
b0aac9d9c2 WIN32 ==> _WIN32
svn path=/trunk/; revision=35745
2011-02-01 23:02:54 +00:00
Stig Bjørlykke
84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Bill Meier
cc70d90bb0 (Trivial) Fix a typo.
svn path=/trunk/; revision=35652
2011-01-26 00:15:01 +00:00
Anders Broman
0119e04527 Try to enhance output at ValueError to ease debugging.
svn path=/trunk/; revision=35578
2011-01-19 06:33:33 +00:00
Jeff Morriss
f09b22e600 Revert 35447 and 35364: remove comments and strings in one regex (so it doesn't get confused by things like /* inside a string). And don't remove comments+strings before checking the hf's.
svn path=/trunk/; revision=35453
2011-01-10 14:43:29 +00:00
Jeff Morriss
d6393bba6e Remove the comments and strings separately so that we can check the hf's when the comments are gone but the strings are not.
svn path=/trunk/; revision=35447
2011-01-10 03:04:26 +00:00
Jeff Morriss
b0beaec6a1 Prohibit strtoull(): Windows doesn't have it. (Putting this in just saves waiting for the buildbot to complain.)
svn path=/trunk/; revision=35410
2011-01-06 23:23:28 +00:00
Guy Harris
e3e9007f28 Let's discourage the use of g_warning in dissectors. Either use one of
the dissector-bug macros, or try your best to dissect a packet that's
"wrong".

svn path=/trunk/; revision=35409
2011-01-06 23:04:48 +00:00
Jeff Morriss
7a5c44beed Check hf entries *after* removing comments (in case there are commented-out entries).
svn path=/trunk/; revision=35364
2011-01-04 18:48:26 +00:00
Jeff Morriss
c18d15f9f7 Detect (and error on) NULL or empty abbreviations. Wireshark aborts on the former and warns on the latter.
svn path=/trunk/; revision=35363
2011-01-04 18:43:24 +00:00
Balint Reczey
04386e3ca1 Raise Exceptions containing a string instead of string exceptions
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4846

svn path=/trunk/; revision=35258
2010-12-23 23:36:48 +00:00
Jeff Morriss
67aba31f94 Deprecate dissector_add(), dissector_change(), dissector_delete(),
dissector_get_port_handle(), dissector_reset(), dissector_try_port(),
dissector_try_port_new(), and next_tvb_add_port().

Re-tabify the file.

svn path=/trunk/; revision=35229
2010-12-20 16:39:09 +00:00
Guy Harris
a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Bill Meier
8867ada0f8 Export G_SLICE=debug-blocks to do additional memory checks;
svn path=/trunk/; revision=35166
2010-12-10 05:23:40 +00:00
Bill Meier
9b9dcb0161 Export G_SLICE=debug-blocks to do additional memory checks;
From the GLib docs
 "Using this option (present since GLib-2.13) engages extra code which
  performs sanity checks on the released memory slices. Invalid slice
  addresses or slice sizes will be reported and lead to a program halt."

svn path=/trunk/; revision=35165
2010-12-10 03:13:09 +00:00
Gerald Combs
d798a21643 Update the location of make-manuf.
svn path=/trunk/; revision=35133
2010-12-06 18:34:49 +00:00
Gerald Combs
0bf5fcd6b3 Move make-manuf to the tools directory.
svn path=/trunk/; revision=35130
2010-12-06 18:30:14 +00:00
Jörg Mayer
7c99468ea7 Sync from samba git:
======== f99c009..189b4bc =========
commit 135756c8ac34c4cf82992dce8c7218781e67f39b
Author: Andrew Tridgell <tridge@samba.org>
Date:   Fri Nov 5 11:52:20 2010 +1100

    pidl: use a union assignment instead of memmove
    
    this means we don't lose type checking
    
    Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>

commit 3bff03723d8920faece76dd57bcf5d19b84d7b02
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Tue Nov 30 23:48:46 2010 +0100

    pidl/python: Allow import of talloc, even though it doesn't live in the
    samba.dcerpc. namespace.

commit ba2110d19060c4d84656917eb6be7b78afc6df6b
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Tue Nov 30 23:06:32 2010 +0100

    pidl: Allow more flexibility importing modules using convenience function.

commit dd0fbc47c798acfb003e37afbee5f0748e30ad1b
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Tue Nov 30 22:59:32 2010 +0100

    pidl: Base new objects off of talloc object.

commit a3ed70ff96122531ba000123cdf3992d26663f30
Author: Andrew Tridgell <tridge@samba.org>
Date:   Sun Nov 21 23:05:07 2010 +1100

    pidl: fixed call to cpp with a space in the directory name
=============================

svn path=/trunk/; revision=35107
2010-12-03 16:56:04 +00:00