Commit Graph

85 Commits

Author SHA1 Message Date
Jaap Keuter 23d2320dd0 Fixing CID 280433 and 280357.
Also strengthening the checking and debug presentation.

svn path=/trunk/; revision=47060
2013-01-14 07:43:14 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Evan Huus ee5a8dd17d Do free overwritten names when registering oids. There was a comment claiming
we couldn't since the name might not be on the heap, but it looks to me like
we're always careful to put it on the heap via a g_strdup if necessary.

Fixes some minor memory leaks.

svn path=/trunk/; revision=45814
2012-10-27 21:01:41 +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
Evan Huus ad759c88f8 Safely handle empty OIDs and other weird cases where we can't find a sub-id.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7219

svn path=/trunk/; revision=44460
2012-08-12 21:04:39 +00:00
Jeff Morriss 8f12c9d7d7 First phase of fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380 :
Add a new name resolution option: whether or not use the configured (in the OS)
name resolver (e.g., DNS) to resolve network names.  When this option is disabled
but network name resolution is enabled then Wireshark will resolve only those
names that it can from local sources.  This includes (at least, AFAIK):

- name resolutions that Wireshark picks up on from DNS packets it decodes
- the "user hosts file" (~/.wireshark/hosts on *NIX)
- what Wireshark reads out of capture file (the PCAPNG name resolution block)

This new preference defaults to "use external resolvers" for backward
compatibility (so people turning on network name resolution will get the old
behavior).

This option can be set via Edit->Preferences and on the command line; there
remain several UIs (e.g., the "open capture file" dialog, the
View->Name Resolution menu, etc.) that don't have the new option yet.


Also expand on the "description" for the name resolution preferences: these
are used not only in the tooltips but are also written to the preferences
file.  The previous text didn't include enough context when written do the
preferences file.

svn path=/trunk/; revision=43605
2012-07-08 01:31:48 +00:00
Guy Harris 659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Jakub Zawadzki 500018d4f6 Fix compilation of epan/oids.c without HAVE_LIBSMI
svn path=/trunk/; revision=43583
2012-07-06 07:24:22 +00:00
Anders Broman c19583b72c From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.

svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +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
Bill Meier 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Stig Bjørlykke 0554530407 From Dirk via bug 6361:
Use File/Directory Dialog as a field type for UAT preferences.

svn path=/trunk/; revision=39059
2011-09-20 10:15:09 +00:00
Guy Harris 0b2cb8a575 Squelch some compiler warnings.
svn path=/trunk/; revision=37684
2011-06-16 17:17:55 +00:00
Guy Harris 0aa46cb66c Get rid of unused function.
svn path=/trunk/; revision=37230
2011-05-18 00:29:48 +00:00
Guy Harris 8f53a5655c Make some routines static that aren't used outside the source file in
which they're defined.

Include some header files that declare functions in the source files
that define the functions.

Declare packet_list_get_type() in gtk/packet_list_store.h, as it defines
a macro that uses that function.

svn path=/trunk/; revision=37223
2011-05-17 23:33:23 +00:00
Guy Harris 4ae55217d0 This ain't C++; you have to put "void" in as the argument list of
functions that take no arguments, otherwise the function is treated as a
crufty old C function with undeclared arguments.

svn path=/trunk/; revision=37212
2011-05-17 21:28:07 +00:00
Stephen Fisher 4e974fdc7d Cast away some clang errors about cast alignments that appear safe.
svn path=/trunk/; revision=36848
2011-04-25 16:29:16 +00:00
Stephen Fisher ca8dfff3da Fix clang error ("increases requird alignment from 1 to 8") by removing
unnecessary VALS() cast


svn path=/trunk/; revision=36847
2011-04-25 16:19:07 +00:00
Stig Bjørlykke 62559137c4 Corrected decoding of oid values with length 5.
This fixes coverity 340.

svn path=/trunk/; revision=36230
2011-03-21 18:58:48 +00:00
Jaap Keuter 9e1d1e0e13 Allow presentation of Gauge32 values larger than 0x7FFFFFFF.
svn path=/trunk/; revision=35599
2011-01-20 20:04:39 +00:00
Guy Harris 17d4d51b7d Make the third argument to a UAT copy callback a size_t (not that any of
the callbacks we have use that argument - is it really needed?).

svn path=/trunk/; revision=34694
2010-10-29 21:11:33 +00:00
Balint Reczey 6094889963 Fix the libsmi workaround by adding missing brackets.
From Grzegorz Głowacki <g.glowacki@wasko.pl>

svn path=/trunk/; revision=34280
2010-09-29 15:46:35 +00:00
Balint Reczey 533685a9a6 Fix crash when opening About box with disabled OID resolution.
Thanks to Hilko Bengen for the detailed bug report at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574086

svn path=/trunk/; revision=32217
2010-03-17 13:26:07 +00:00
Stig Bjørlykke 1193f9d571 From LEGO via bug 2309:
Alert the user that a restart is needed when changes are made to the MIBs
configuration.

svn path=/trunk/; revision=32124
2010-03-05 19:33:07 +00:00
Stig Bjørlykke 2f8830b4d0 From LEGO via bug 3459:
Add a callback to UAT to be called after the table has being updated,
use it to renew the snmp_ue_cache.

svn path=/trunk/; revision=32112
2010-03-04 12:50:18 +00:00
Balint Reczey e24d953fe1 Disable OID resolution and loading SMI modules by default.
Add an option to enable OID resolution.
Add an option to suppress errors reported by libsmi.

svn path=/trunk/; revision=32096
2010-03-03 17:19:30 +00:00
Balint Reczey 866c5a1733 From Vincent Bernat <bernat@debian.org>:
Refine workaroud for preventing libsmi error.

svn path=/trunk/; revision=32017
2010-02-26 19:07:01 +00:00
Balint Reczey 339131d835 Prevent potential crash in libsmi.
From: Vincent Bernat <bernat@debian.org>

svn path=/trunk/; revision=32006
2010-02-25 19:28:58 +00:00
Gerald Combs afc57e6fac Add NULL pointer checks. Fixes the fuzz crash in bug 4351.
svn path=/trunk/; revision=31362
2009-12-24 21:23:38 +00:00
Balint Reczey 6b45b0a901 Suggest solutions on the missing MIBs popup window.
svn path=/trunk/; revision=31247
2009-12-12 01:41:32 +00:00
Balint Reczey acbaa2848d Add /usr/share/snmp/mibs to MIB search path on !Win32 platforms, not just on Apple.
svn path=/trunk/; revision=31052
2009-11-23 17:28:38 +00:00
Gerald Combs a3fb8e9a74 On OS X, prepend /usr/share/snmp/mibs to the SMI path. Partial fix for
bug 3163.

svn path=/trunk/; revision=30951
2009-11-13 17:55:55 +00:00
Stig Bjørlykke 297cd83538 Made some functions static.
svn path=/trunk/; revision=30600
2009-10-18 20:13:06 +00:00
Stig Bjørlykke 4b7763036b Removed unused variable 'bytes' in oid_subid2encoded.
svn path=/trunk/; revision=30196
2009-09-29 19:16:00 +00:00
Stig Bjørlykke e83dbefaaf Ensure we don't dereference a null pointer.
svn path=/trunk/; revision=30187
2009-09-29 06:52:51 +00:00
Stig Bjørlykke ec53e7789a From Kovarththanan Rajaratnam:
Avoid duplicate blurb/name.

svn path=/trunk/; revision=29014
2009-07-08 08:00:55 +00:00
Stig Bjørlykke 8531980952 From Kovarththanan Rajaratnam:
More hf_register_info related cleanup.

svn path=/trunk/; revision=28832
2009-06-24 02:17:12 +00:00
Bill Meier 793fcdd849 Use smiFree for libsmi >= v 0.4.8; Also: sprintf->g_snprintf
svn path=/trunk/; revision=27753
2009-03-17 15:34:18 +00:00
Stig Bjørlykke 62f60df6b4 From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.

svn path=/trunk/; revision=27718
2009-03-13 22:06:48 +00:00
Stig Bjørlykke c2e2fa98b5 Use UAT_FLD_PATHNAME for paths.
svn path=/trunk/; revision=27643
2009-03-07 14:39:39 +00:00
Guy Harris 5742ede54c Add an additional "title" attribute for UAT fields; that's what's
displayed to the user.

svn path=/trunk/; revision=27462
2009-02-16 04:10:06 +00:00
Anders Broman 1b0b2bb4b6 From Paul Stath:
Dissector fails for OIDs with MacAddress in index.

svn path=/trunk/; revision=26746
2008-11-10 20:25:38 +00:00
Bill Meier afd857957a Fix a few Emacs "file variables" to have "safe" values.
That is: indent-tabs-mode: tabs --> indent-tabs-mode: t
Also: fix a typo: set-tabs-mode --> indent-tabs-mode

svn path=/trunk/; revision=26113
2008-09-02 11:17:03 +00:00
Luis Ontanon 42c3239a1a luis.ontanon@gmail.com => luis@ontanon.org
svn path=/trunk/; revision=25937
2008-08-05 21:03:46 +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
Anders Broman 1d5cb5ff64 Fix Dissector bug, protocol SNMP: proto.c:932: failed assertion
From LEGO:
DISSECTOR_ASSERT_NOT_REACHED() is a Bug regardless, it is triggered because we
are proto_add_item()ing an FT_UINT32 of 5 bytes in length.

IF-MIB:ifInOctets is a Counter32 so the value should (and is) application
encoded using tag 41.

the value's value (!) is  H'00d49e69fa (D'3567151610).

the assertion is triggered because there's an error in oids.c:59 
where states the ft_type as being an FT_UINT32 with a length of 1 to 4 bytes,
It should be FT_UINT64 and the length from 1 to 5 bytes considering that
integers bigger than 2^31 will be ber encoded in 5 bytes.

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2468

svn path=/trunk/; revision=25148
2008-04-22 19:31:03 +00:00
Anders Broman e49ad89714 TimeTicks ::= [APPLICATION 3] IMPLICIT INTEGER (0..4294967295)
If the BER encoding should not have the top bit set as to not become a negative number
  the ber encoding may take 5 octets to encode.
Fixes BUG:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2253

svn path=/trunk/; revision=25135
2008-04-21 18:38:01 +00:00
Anders Broman 60117dce27 TimeStamp are derived from timeticks_type (See SNMPv2-TC).
Fixes Bug:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2442

svn path=/trunk/; revision=25134
2008-04-21 18:23:23 +00:00
Bill Meier 1d6e4189a9 Windows: use free() only if vc6 (as suggested by Peter Johansson);
Thus standard Windows Wireshark release will not have memory leak here.
Assumption: Wireshark Windows libsmi.dll built with vc6.
This solution is temporary.

svn path=/trunk/; revision=24702
2008-03-19 21:09:31 +00:00
Stig Bjørlykke 1aa7d41bed Avoid calling some free() on WIN32 on memory that may be allocated in
another heap.  This is a temporary solution.

svn path=/trunk/; revision=24693
2008-03-19 01:02:55 +00:00