Commit Graph

147 Commits

Author SHA1 Message Date
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
Luis Ontanon 6ce4115354 Turns out that smiGetMinSize() and smiGetMaxSize() exists only in libsmi's HEAD... ;-)
Official releases do not have them yet, avoid using them.


svn path=/trunk/; revision=22662
2007-08-25 23:49:09 +00:00
Luis Ontanon 782c19a0c5 get libsmi into the picture
svn path=/trunk/; revision=22661
2007-08-25 20:27:58 +00:00
Luis Ontanon bcd55f4c8e replace oid_to_str_buf() and oid_to_str()
fix a potential buffer overflow due to a very liberal estimate by oid_repr_len()


svn path=/trunk/; revision=22659
2007-08-25 17:29:55 +00:00
Luis Ontanon 7c174c63f8 Initialize to zero all subids in oid_string2subid() to avoid creating bogus oids. This is aspirin for a buffer overflow somewhere in the code that reads cretificates, that dimensions a buffer probably assumung oid subids are few digits while they can actually be bigger.
Place two DISSECTOR_ASSERT() guards to avoid an (I believe impossible) buffer overflow of the ep_allocated subid array in  oid_string2subid() and oid_encoded2subid().


svn path=/trunk/; revision=22656
2007-08-25 14:15:56 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
Richard van der Hoff b2f5d183fa fix 'unused variable' warning
svn path=/trunk/; revision=22631
2007-08-24 12:43:38 +00:00
Luis Ontanon e7d5e2fc2d Another iteration, the new code is almost there, We're missing just the implied octetstrings indexes.
svn path=/trunk/; revision=22618
2007-08-24 00:26:30 +00:00
Luis Ontanon cfc4b0efc8 Implement Resolution of conceptual table indexing
So far this has being tested only for integer indexes.


svn path=/trunk/; revision=22606
2007-08-23 19:45:31 +00:00
Luis Ontanon 4e3372473b Prepare the oids dataset for managing conceptual table indexing
svn path=/trunk/; revision=22596
2007-08-22 22:56:36 +00:00
Luis Ontanon 76658ef0f1 A further iteration in the code, things start to look good!
svn path=/trunk/; revision=22575
2007-08-21 21:32:00 +00:00
Luis Ontanon a5efe69a79 Filtering on snmp variables starts to work so I put it there in case anyone wants to start playing with it. I'll leave the generated dissector in place and the rest off the Makefiles so that others are not bothered by this.
TODO:
- Global
   - add libsmi to autoconf (I modified CFLAGS and LDADDs in the makefile.ams appending my own values, that's good only for me)
   - have other users of oid_resolv.h get to use the new functions in oids.h
   - add a menu item or preference setting for the smi_modules UAT ( the smi_modules file has one dquoted string per line with the name of each module to be loaded)
- SNMP
  - put complete information in the labels of the VarBind Items
  - add oids to COL_INFO
  - negative testing (Well, testing in general)
- OIDS
  - implement "ALL" modules 
  - some functions are not yet tested or implemented

I'll put a TO-DO list on the wiki for people (incl. me) to add more items




svn path=/trunk/; revision=22556
2007-08-19 23:00:47 +00:00
Luis Ontanon b782333f20 - It's just-a-bad-idea(tm) to redefine anything from a foreign library, Don't.
- Allow to look for value-types by name.

[still largelly  untested]

svn path=/trunk/; revision=22524
2007-08-16 06:48:51 +00:00
Luis Ontanon 05bdebe45d I'm at the end of the second iteration, so far this compiles OK still haven't tested it but it does not go in the Makefiles, I need this as a reference point.
svn path=/trunk/; revision=22508
2007-08-15 19:52:44 +00:00