Commit Graph

63 Commits

Author SHA1 Message Date
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
Gerald Combs 577f355e23 oid_get_default_mib_path() is present in libwireshark.def. Make sure it's
available even if HAVE_LIBSMI isn't defined.

svn path=/trunk/; revision=24667
2008-03-17 17:06:33 +00:00
Stig Bjørlykke fdc980e79d Added an option to uat_new() to set if configuration shall be saved in the
selected profile.

Don't save SMI Paths and SMI Modules in the profiles because reloading
currently doesn't work (bug 2309).

svn path=/trunk/; revision=24580
2008-03-06 22:13:24 +00:00
Stig Bjørlykke 752408e466 Added yet another free().
svn path=/trunk/; revision=24576
2008-03-06 17:54:53 +00:00
Stig Bjørlykke 4e1d1942e7 Free return value from smiRenderType, smiRenderOID, smiGetPath,
get_datafile_path and get_persconffile_path.

This was reported by Valgrind.

svn path=/trunk/; revision=24569
2008-03-05 20:55:56 +00:00
Stig Bjørlykke 1efb7e3627 Add Luis' uat_get_table_by_name() to fetch SMI uat tables.
svn path=/trunk/; revision=24229
2008-01-30 22:50:55 +00:00
Jaap Keuter 44ea74a5da Move libsmi settings from virtual mibs protocol page to name resolution page.
svn path=/trunk/; revision=24131
2008-01-18 07:18:32 +00:00
Stig Bjørlykke a2d1e9005d This patch adds support for configuration profiles, which can be used to
configure and use more than one set of preferences and configuration files.

This can be found in the "Configuration Profiles..." menu item from the Edit
menu, or by pressing Shift-Ctrl-A.  It's also possible to start wireshark
and tshark with a named profile by using the "-C ProfileName" option.
A new status pane in the main window will show the current profile.

The configuration files currently stored in the Profiles are:
- Preferences
- Capture Filters
- Display Filters
- Coloring Rules
- Disabled Protocols
- User Accessible Tables

The recent data are by design not added to the profile.

Planned future enhancements:
- make a more convenient function to switch between profiles
- add a "clone profile" button to copy an existing profile
- make the profiles list active and accept return as OK
- save users "Decode as" in the profile
- make new, clone and deletion of profiles more secure
- make some of the recent values available in the profile

This patch also fixes:
- setting default status pane sizes
- a bug setting status pane for packets when not having main lower pane.

svn path=/trunk/; revision=24089
2008-01-14 16:40:23 +00:00
Gerald Combs 3254a8f9cb Don't free memory that we're going to use later.
svn path=/trunk/; revision=23841
2007-12-11 21:17:55 +00:00
Gerald Combs fcadd9d59f Fix a typo.
svn path=/trunk/; revision=23793
2007-12-07 18:47:03 +00:00
Guy Harris f43601180c Only define oid_get_default_mib_path() if we have libsmi.
Explicitly mark it as having no arguments.

svn path=/trunk/; revision=23754
2007-12-04 19:39:09 +00:00
Gerald Combs 0fa29bb1ea Add an oid_get_default_mib_path() function, and use it to display the MIB
path in About->Folders.

svn path=/trunk/; revision=23753
2007-12-04 18:43:40 +00:00
Luis Ontanon fb34ef1f2c Given the opportunity I check in the changes to snmp I got in this machine.
- Indexing (implied and not) is OK now, however indexes for related tables (AUGMENT, EXTEND, etc) are registered many times.


svn path=/trunk/; revision=22861
2007-09-13 16:49:51 +00:00
Luis Ontanon d56f4f3a68 - turn some other TC from FT_BYTES to FT_STRING so that human-readable strings become readable by humans
- Add the EngineId decoding for the contextEngineId
- Add some expert info about malformed indexed oids


svn path=/trunk/; revision=22720
2007-08-28 23:55:49 +00:00
Luis Ontanon 450767fb93 Report loading failures to the user
svn path=/trunk/; revision=22712
2007-08-28 19:07:39 +00:00
Luis Ontanon dfbac00752 SNMP:
- As noted by Thomas Anders values are not added to the tree anymore. Move the calling of subdissectors to the end of the function, so that the value is added to the tree.
 - add port 8161 to be decoded as SNMP (hey, it's on IANA's services file!)
UAT:
 - do not have the uat reloaded.
OIDS:
 - do not complain if renaming an OID to an identical name



svn path=/trunk/; revision=22704
2007-08-28 15:18:32 +00:00
Jaap Keuter 22cb9fb03f Fix warnings "dereferencing type-punned pointer will break strict-aliasing rules"
svn path=/trunk/; revision=22699
2007-08-28 05:59:09 +00:00
Luis Ontanon 5e7a8a9a87 Do not throw, some of this functions get called outside TRY blocks.
svn path=/trunk/; revision=22692
2007-08-27 21:29:20 +00:00
Luis Ontanon 4e26d3ad2e cast a guint64 down to guint32 before assignment to get windows build running
svn path=/trunk/; revision=22689
2007-08-27 19:37:48 +00:00
Luis Ontanon 1b760a7ae5 Fixed an ep_ buffer overflow (off by one) in oid_subid2string()
Abort on integer overflow in oid_string2subid() and oid_encoded2subid()





svn path=/trunk/; revision=22688
2007-08-27 19:14:30 +00:00
Guy Harris 49dbf60a03 Get rid of extra newlines at the end of epan/oids.h, and give one of
them to epan/oids.c. :-)

svn path=/trunk/; revision=22687
2007-08-27 18:44:55 +00:00
Luis Ontanon 392fd3f689 - packet-snmp(-template).c
- reimplement the "snmp.variable_oid" dissector table
- oids.[ch]
   - get rid of keytype_implicit in oid_value_type_t we won't use it.
   - have the windows base path for mibs be consistent to where we've put the mibs
   - oid_get_from_encoded() and oid_get_from_string(): have the subids array being computed in a prior statement of where the side-effected argument is going to be used... worked on gcc, not on windows... I deserve "have daemons flying out of my nose" for that :-).


svn path=/trunk/; revision=22684
2007-08-27 17:05:11 +00:00
Luis Ontanon 9a850615d1 Give the files its propper title
Keep libsmi's default path and append the user given one


svn path=/trunk/; revision=22677
2007-08-26 21:37:11 +00:00