diff options
| author | Gerald Combs <gerald@wireshark.org> | 2003-11-02 23:12:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2003-11-02 23:12:35 +0000 |
| commit | 031db8b9c87e9f096a377547dfbf6266958fa6cd (patch) | |
| tree | b9ceb9b8cc87f48bc800f3b66eb28fb37398cb09 /packet-snmp.c | |
| parent | b8d155186ccf09f303c0f7196f09484bf6c9a674 (diff) | |
From Gisle Vanem:
* Added a new function get_file_in_temp() to
epan/filesystem.c. This because of asn1.dll plugin which
had code to write to a log-file "c:\temp\ethereal.log". I feel
this patch makes this safer; I don't even have a c:\temp dir.
* Patched packet-asn1.c to use get_file_in_temp().
* Added some #undef to packet-snmp.c to silence gcc.
* Changed "%u" -> "%lu" formats in util.c
Rename get_file_in_temp() to get_tempfile_path() to match other function
names.
svn path=/trunk/; revision=8859
Diffstat (limited to 'packet-snmp.c')
| -rw-r--r-- | packet-snmp.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/packet-snmp.c b/packet-snmp.c index ad13856351..b8b9b4f08d 100644 --- a/packet-snmp.c +++ b/packet-snmp.c @@ -10,7 +10,7 @@ * * See RFCs 2570-2576 for SNMPv3 * - * $Id: packet-snmp.c,v 1.121 2003/10/29 22:11:08 guy Exp $ + * $Id: packet-snmp.c,v 1.122 2003/11/02 23:12:31 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -182,6 +182,20 @@ static const value_string versions[] = { { 0, NULL }, }; +/* defined in net-SNMP; include/net-snmp/library/snmp.h */ +#undef SNMP_MSG_GET +#undef SNMP_MSG_SET +#undef SNMP_MSG_GETNEXT +#undef SNMP_MSG_RESPONSE +#undef SNMP_MSG_TRAP +#undef SNMP_MSG_GETBULK +#undef SNMP_MSG_INFORM +#undef SNMP_MSG_TRAP2 +#undef SNMP_MSG_REPORT +#undef SNMP_NOSUCHOBJECT +#undef SNMP_NOSUCHINSTANCE +#undef SNMP_ENDOFMIBVIEW + /* PDU types */ #define SNMP_MSG_GET 0 #define SNMP_MSG_GETNEXT 1 |