aboutsummaryrefslogtreecommitdiffstats
path: root/packet-snmp.c
Commit message (Collapse)AuthorAgeFilesLines
* Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer2002-08-021-14/+6
| | | | | | | | equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
* Don't pass "tvb_reported_length_remaining(tvb, offset)" as the fourthGuy Harris2002-05-301-2/+3
| | | | | | | argument to "tvb_new_subset()" - just use -1 if the subset tvbuff is to run to the end of the parent tvbuff. svn path=/trunk/; revision=5597
* If variables are used only if "HAVE_UCD_SNMP" is undefined, declare themGuy Harris2002-04-081-2/+3
| | | | | | only if "HAVE_UCD_SNMP" is undefined. svn path=/trunk/; revision=5117
* From Kikuchi Ayamura: include <ucd-snmp/ucd-snmp-config.h> to fix IRIXGuy Harris2002-04-011-1/+2
| | | | | | compilation problems. svn path=/trunk/; revision=5073
* (Conditionally) mark unused variables as such.Guy Harris2002-03-311-3/+13
| | | | svn path=/trunk/; revision=5063
* Make the UCD SNMP library read its configuration files, so that, forGuy Harris2002-03-261-2/+15
| | | | | | | example, you can configure it to read in MIB files other than the default ones. svn path=/trunk/; revision=5022
* Get rid of the "--enable-snmp" option; instead, use "--with-ucdsnmp".Guy Harris2002-03-121-26/+22
| | | | | | | | | | | Make the directory option to "--with-ucdsnmp" optional. Handle "--with-ucdsnmp" similar to the way "--with-pcap" is handled. Get rid of unnecessary #defines in "packet-cops.c". Get rid of no-longer-necessary include of "dlfcn.h" in "packet-snmp.c". svn path=/trunk/; revision=4930
* "format_var()" returns a "malloc()"ed string, not a "g_malloc()"edGuy Harris2002-03-111-5/+6
| | | | | | string; free it with "free()", not "g_free()". svn path=/trunk/; revision=4925
* If we're linking with the UCD SNMP library, make "format_oid()" append aGuy Harris2002-03-111-45/+35
| | | | | | | | | | | | | display of the symbolic form of the OID. Remove code that used to do that outside of "format_oid()". Export "format_oid()" from "packet-snmp.c" and use it in "packet-cops.c". Remove support for CMU SNMP and older versions of UCD SNMP from "packet-cops.c", as it has been removed from the rest of Ethereal. svn path=/trunk/; revision=4924
* The "val_len" member of a "struct variable_list" should be set to theGuy Harris2002-03-111-7/+6
| | | | | | | | length of the variable's value, in bytes, not the length of the BER encoding of that variable's value. The latter setting means it won't be correct for object IDs. svn path=/trunk/; revision=4922
* Use "ds_set_int()", not "snmp_set_suffix_only()", to set the "printGuy Harris2002-03-101-2/+2
| | | | | | suffixes only" setting. svn path=/trunk/; revision=4916
* Use the "sprint_realloc_" routines in UCD SNMP 4.2.2 and later, ratherGuy Harris2002-03-101-419/+128
| | | | | | | | | | | | | | | | | | | than the "sprint_" routines in UCD and CMU SNMP; the latter routines have no bounds checking, and if you use them you cannot protect against buffer overflows. As we now require UCD SNMP 4.2.2 or later: 1) we no longer need code to support CMU SNMP; 2) we no longer need code to work around problems with UCD SNMP 4.1.1; and, as we no longer use the "sprint_" routines, we no longer need code to work around the changed API and ABI of those routines in some nonstandard versions of the UCD SNMP library. svn path=/trunk/; revision=4914
* Check to make sure SNMP_IPADDR items are 4 bytes long and SNMP_COUNTER64Guy Harris2002-03-061-3/+38
| | | | | | items are 8 bytes long. svn path=/trunk/; revision=4882
* Add a routine to "asn1.c" to translate ASN1_ERR_ values to strings. UseGuy Harris2002-03-011-29/+5
| | | | | | | | | | | | | | | | | | | | | | that in the SNMP dissector. Check the return values of ASN.1 routines in the LDAP dissector, and have all the subroutines in that disesctor that can return error indications return ASN1_ERR_ values. Have the routines that can supply a pointer to a newly-created protocol-tree item use the right type for items ("proto_item *", not "proto_tree *", even though they are, at least currently, typedefs for the same type), and use "proto_item" for the type of the item a pointer to which is passed to those routines. Before calling those routines, set the item pointer to null, in case the routine fails. Don't check the return value of "parse_filter_strings()" against -1 - that routine can't return -1. svn path=/trunk/; revision=4833
* From Andrew Hood: translate enterprise OIDs in SNMP traps to strings ifGuy Harris2002-02-191-1/+13
| | | | | | possible. svn path=/trunk/; revision=4758
* Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls inGuy Harris2002-01-241-5/+3
| | | | | | | | | | | | arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls that add FT_NONE or FT_PROTO items to the protocol tree, with -1. Replace some calls to "tvb_length()" or "tvb_length_remaining()" with calls to "tvb_reported_length()" and "tvb_reported_length_remaining()", as those give the actual length of the data in the packet, not just the data that happened to be captured. svn path=/trunk/; revision=4605
* Include files from the "epan" directory and subdirectories thereof withGuy Harris2002-01-211-4/+4
| | | | | | | | | | | | | "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
* Work around changes made to recent Red Hat ucd-snmp packages. SeeGerald Combs2001-12-121-1/+17
| | | | | | | | http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=57421 for details. svn path=/trunk/; revision=4387
* Move the pointer to the "column_info" structure in the "frame_data"Guy Harris2001-12-101-23/+23
| | | | | | | | | | | | | | | structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
* Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris2001-12-031-9/+10
| | | | | | | | take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. svn path=/trunk/; revision=4308
* Change "conversation_set_dissector()" to take a dissector handle, ratherGuy Harris2001-11-271-11/+4
| | | | | | | | | | | | | | | | | | | | | than a pointer to a dissector function, as an argument. This means that the conversation dissector is called through "call_dissector()", so the dissector itself doesn't have to worry about checking whether the protocol is enabled or setting "pinfo->current_proto", so get rid of the code that does that in conversation dissectors. Also, make the conversation dissectors static. Get rid of some direct calls to dissectors; replace them with calls through handles, and, again, get rid of code to check whether a protocol is enabled and set "pinfo->current_proto" where that code isn't needed. Make those dissectors static if they aren't already static. Add a routine "create_dissector_handle()" to create a dissector handle without registering it by name, if the dissector isn't used outside the module in which it's defined. svn path=/trunk/; revision=4281
* Switched from using CHECK_DISPLAY_AS_DATA to using CHECK_DISPLAY_AS_XEd Warnicke2001-11-261-2/+2
| | | | | | | which also takes a handle as an argument and thus doesn't call dissect_data directly. svn path=/trunk/; revision=4270
* Moved from using dissect_data() to using call_dissector()Ed Warnicke2001-11-261-3/+6
| | | | svn path=/trunk/; revision=4269
* Instead of having a single datum attached to a conversation, have a listGuy Harris2001-09-031-3/+2
| | | | | | | | | | | of protocol-id-plus-datum pairs, so that multiple protocols can attach information to the same conversation. Dissectors that attach information to a conversation should not assume that if they find a conversation it has one of its data attached to it; the conversation might've been created by another dissector. svn path=/trunk/; revision=3901
* Squelch some compiler warnings.Guy Harris2001-09-031-3/+4
| | | | svn path=/trunk/; revision=3899
* From Joerg Mayer: explicitly fill in all members of aGuy Harris2001-06-181-5/+5
| | | | | | | "header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
* Rename the arguments and flags for the conversation routines, so as notGuy Harris2001-06-101-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | to imply that 1) conversations have source and destination addresses and ports - they don't (if they did, they'd be monologues, not conversations), they just have two address/port pairs for the two endpoints, with one or more of the address or port in the second pair possibly being wildcarded; 2) the first and second address or port argument to "find_conversation()" or "try_conversation_dissector()" have anything to do with the first or second address/port pair in a conversation - they don't, the two arguments to those routines are matched against *both* address/port pairs for a conversation; as otherwise people might think that they need to add flags to wildcard the first arguments "conversation_new()" or "find_conversation()" (they don't, they just have to pass the non-wildcarded address/port first and then pass the wildcarded one, even if that means passing the destination first and source second). svn path=/trunk/; revision=3537
* Get rid of END_OF_FRAME references in tvbuffified dissectors.Guy Harris2001-04-231-3/+3
| | | | svn path=/trunk/; revision=3364
* Conversation dissectors are called through a mechanism that doesn'tGuy Harris2001-04-151-1/+10
| | | | | | | check for disabled protocols or set "pinfo->current_proto", so they have to do that for themselves. svn path=/trunk/; revision=3306
* Fix up a pile of NullTVB uses that were left in the previous checkin.Guy Harris2001-04-151-32/+32
| | | | svn path=/trunk/; revision=3304
* Tvbuffify the ASN.1 code and the Kerberos, LDAP, and SNMP dissectors.Guy Harris2001-04-151-197/+186
| | | | | | Clean up some problems that revealed. svn path=/trunk/; revision=3301
* At least with UCD SNMP 4.1.2, you can safely pass to "sprint_value()" aGuy Harris2001-04-071-2/+2
| | | | | | | | | | variable with a null pointer-to-value and a zero length, so we don't need to protect the assignment to "variable.val.string" with "SAFE_STRING()" - and doing so causes complaints from the compiler about assigning a pointer to a "const gchar" to the non-const pointer "variable.val.string". svn path=/trunk/; revision=3267
* Don't blow up if "asn1_string_value_decode()" supplies a null pointer asGuy Harris2001-04-071-5/+15
| | | | | | | | | the string because the string value is zero-length. Don't try to treat an agent address in a V1 trap as an IP address if it's not 4 bytes long. svn path=/trunk/; revision=3265
* In "dissect_snmp_parse_error()" and "dissect_snmp_error()", put an errorGuy Harris2001-04-061-76/+84
| | | | | | | | | | | indication into the protocol tree as well as the summary line, so people don't get confused if, say, doing "tethereal -V". Pass those routines the subtree for the packet, rather than the top-level tree, so that the error indication and the item for the rest of the packet show up there rather than at the top level. svn path=/trunk/; revision=3264
* Do a better job of #ifdef'ing out 3 variables in the case of non-UCD-SNMPGilbert Ramirez2001-02-271-2/+2
| | | | | | and linux. svn path=/trunk/; revision=3081
* Work around a CMU SNMP bug wherein "sprint_value()" dumps core if thereGuy Harris2001-01-301-47/+88
| | | | | | | are no entries in any of the MIBs for any of the components of the variable's OID. svn path=/trunk/; revision=2961
* SNMPv2u support.Guy Harris2001-01-301-2/+148
| | | | svn path=/trunk/; revision=2957
* Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris2001-01-091-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | "{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
* Ensure that all value_string arrays end in {0, NULL}. Dissectors got awayGilbert Ramirez2001-01-031-2/+3
| | | | | | | | | | | | | | with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
* Have "proto_register_protocol()" build a list of data structures forGuy Harris2001-01-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
* Rename "asn1_octet_string_value_decode()" toGuy Harris2000-12-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "asn1_string_value_decode()", as it can be used for various character string types as well. Turn "asn1_octet_string_decode()" into "asn1_string_decode()", which takes an additional argument giving the tag expected for the string in question, and make "asn1_octet_string_decode()" a wrapper around it. Clean up the ASN.1 dissection in the Kerberos dissector, making more use of the code in "asn1.c", wrapping more operations up in macros, and doing some more type checking. Use "REP" rather than "RESP" in names and strings; "REP" is what the Kerberos spec uses. Make the routines in the Kerberos dissector not used outside that dissector static. Fix some problems with the dissection of strings in the Kerberos dissector (it was extracting the data from the wrong place in the packet). In Kerberos V5, the "kvno" item in the EncryptedData type is optional; treat it as such. Treat integers as unsigned in the Kerberos dissector. svn path=/trunk/; revision=2777
* For each column, have both a buffer into which strings for that columnGuy Harris2000-11-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be put, and a pointer to the string for the column, which might or might not point to that buffer. Add a routine "col_set_str()", which sets the string for the column to the string passed to it as an argument; it should only be handed a static string (a string constant would be ideal). It doesn't do any copying, so it's faster than "col_add_str()". Make the routines that append to columns check whether the pointer to the string for the column points to the buffer for the column and, if not, copy the string for the column to the buffer for the column so that you can append to it (so you can use "col_set_str()" and then use "col_append_str()" or "col_append_fstr()"). Convert a bunch of "col_add_str()" calls that take a string constant as an argument to "col_set_str()" calls. Convert some "col_add_fstr()" calls that take a string constant as the only argument - i.e., the format string doesn't have any "%" slots into which to put strings for subsequent arguments to "col_set_str()" calls (those calls are just like "col_add_str()" calls). Replace an END_OF_FRAME reference in a tvbuffified dissector with a "tvb_length(tvb)" call. svn path=/trunk/; revision=2670
* Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just aGuy Harris2000-11-131-1/+2
| | | | | | | | | | | | | | | | | | | string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
* Don't require that all SNMP packets go to or from the SNMP port - theGuy Harris2000-10-211-1/+30
| | | | | | | | | SNMP request would, but an SNMP reply can come back from another port. Instead, when an SNMP request is seen, create a conversation with a wildcard port, if one doesn't already exist, and make its dissector the SNMP dissector. svn path=/trunk/; revision=2526
* Move the dlclose() of libsnmp_handle into the libsnmp_handle != NULLGilbert Ramirez2000-09-191-2/+2
| | | | | | block. svn path=/trunk/; revision=2446
* Close the handle for the SNMP library after we're done with it - sharedGuy Harris2000-09-171-1/+2
| | | | | | | objects are reference-counted so that won't make it disappear if Ethereal is also linked with it as a shared SNMP library. svn path=/trunk/; revision=2443
* Load "libsnmp.so.0", not "libsnmp.so":Guy Harris2000-09-081-8/+27
| | | | | | | | | | | | | | | | | | on the systems that have the problem we're working around, the SNMP shared library is "libsnmp.so.0"; on those systems, there's also no "libsnmp.so" unless the user has installed the UCD SNMP development package or has made a symlink from "libsnmp.so" to "libsnmp.so.0" by hand, and we don't want to force users to do that (some of them may be sufficiently new to UNIX that they don't know how to do that); the run-time linker, if told to load "libsnmp.so", won't necessarily realize that it's the same object as "libsnmp.so.0", and may load it again rather than using the already-loaded object, which might not be a good idea. svn path=/trunk/; revision=2398
* Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel2000-08-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the following: It is now possible to enable/disable a particular protocol decoding (i.e. the protocol dissector is void or not). When a protocol is disabled, it is displayed as Data and of course, all linked sub-protocols are disabled as well. Disabling a protocol could be interesting: - in case of buggy dissectors - in case of wrong heuristics - for performance reasons - to decode the data as another protocol (TODO) Currently (if I am not wrong), all dissectors but NFS can be disabled (and dissectors that do not register protocols :-) I do not like the way the RPC sub-dissectors are disabled (in the sub-dissectors) since this could be done in the RPC dissector itself, knowing the sub-protocol hfinfo entry (this is why, I've not modified the NFS one yet). Two functions are added in proto.c : gboolean proto_is_protocol_enabled(int n); void proto_set_decoding(int n, gboolean enabled); and two MACROs which can be used in dissectors: OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree) CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree) See also the XXX in proto_dlg.c and proto.c around the new functions. svn path=/trunk/; revision=2267
* Allow either old-style (pre-tvbuff) or new-style (tvbuffified)Guy Harris2000-08-071-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dissectors to be registered as dissectors for particular ports, registered as heuristic dissectors, and registered as dissectors for conversations, and have routines to be used both by old-style and new-style dissectors to call registered dissectors. Have the code that calls those dissectors translate the arguments as necessary. (For conversation dissectors, replace "find_conversation_dissector()", which just returns a pointer to the dissector, with "old_try_conversation_dissector()" and "try_conversation_dissector()", which actually call the dissector, so that there's a single place at which we can do that translation. Also make "dissector_lookup()" static and, instead of calling it and, if it returns a non-null pointer, calling that dissector, just use "old_dissector_try_port()" or "dissector_try_port()", for the same reason.) This allows some dissectors that took old-style arguments and immediately translated them to new-style arguments to just take new-style arguments; make them do so. It also allows some new-style dissectors not to have to translate arguments before calling routines to look up and call dissectors; make them not do so. Get rid of checks for too-short frames in new-style dissectors - the tvbuff code does those checks for you. Give the routines to register old-style dissectors, and to call dissectors from old-style dissectors, names beginning with "old_", with the routines for new-style dissectors not having the "old_". Update the dissectors that use those routines appropriately. Rename "dissect_data()" to "old_dissect_data()", and "dissect_data_tvb()" to "dissect_data()". svn path=/trunk/; revision=2218
* Use the right length when adding the "agent address" entry to the treeGuy Harris2000-07-251-3/+2
| | | | | | for an SNMP trap PDU. svn path=/trunk/; revision=2158
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 20:30:30 +0000