1 ; From: Bill Fenner <fenner@research.att.com>
2 ; Subject: Re: libsmi 0.2.6 && tcpdump from cvs
4 ;Care to try these diffs? I didn't see any documentation on the API
5 ;change so I mostly just looked around for similar-looking functions.
6 ;It at least compiles now. (Juergen, can you look these over?)
11 ===================================================================
12 RCS file: /tcpdump/master/tcpdump/print-snmp.c,v
13 retrieving revision 1.42
14 diff -u -r1.42 print-snmp.c
15 --- print-snmp.c 2000/10/06 05:54:51 1.42
16 +++ print-snmp.c 2000/11/04 20:43:09
21 - for (smiRange = smiGetFirstRange(smiType->module, smiType->name);
22 + for (smiRange = smiGetFirstRange(smiType);
24 smiRange = smiGetNextRange(smiRange)) {
26 ok = smi_check_a_range(smiType, smiRange, elem);
29 - smiFreeRange(smiRange);
34 - if (ok && smiType->parentmodule && smiType->parentname) {
37 - parentType = smiGetType(smiType->parentmodule,
38 - smiType->parentname);
39 + parentType = smiGetParentType(smiType);
41 ok = smi_check_range(parentType, elem);
42 - smiFreeType(parentType);
50 - fputs(smiNode->module, stdout);
51 + fputs(smiGetNodeModule(smiNode)->name, stdout);
54 fputs(smiNode->name, stdout);
55 @@ -1026,17 +1019,17 @@
56 && smiNode->access == SMI_ACCESS_NOT_ACCESSIBLE) {
57 fputs("[noAccess]", stdout);
60 - if (! smi_check_type(smiNode->basetype, elem->type)) {
61 - fputs("[wrongType]", stdout);
64 - smiType = smiGetType(smiNode->typemodule, smiNode->typename);
65 + smiType = smiGetNodeType(smiNode);
71 + if (! smi_check_type(smiType->basetype, elem->type)) {
72 + fputs("[wrongType]", stdout);
75 if (! smi_check_range(smiType, elem)) {
76 fputs("[wrongLength]", stdout);
78 @@ -1051,15 +1044,14 @@
82 - if (smiNode->basetype == SMI_BASETYPE_BITS
83 - && smiNode->typemodule && smiNode->typename) {
84 + if (smiType->basetype == SMI_BASETYPE_BITS) {
85 /* print bit labels */
87 smi_decode_oid(elem, oid, &oidlen);
88 smiNode = smiGetNodeByOID(oidlen, oid);
91 - fputs(smiNode->module, stdout);
92 + fputs(smiGetNodeModule(smiNode)->name, stdout);
95 fputs(smiNode->name, stdout);
96 @@ -1075,10 +1067,8 @@
100 - if (smiNode->basetype == SMI_BASETYPE_ENUM
101 - && smiNode->typemodule && smiNode->typename) {
102 - for (nn = smiGetFirstNamedNumber(smiNode->typemodule,
103 - smiNode->typename);
104 + if (smiType->basetype == SMI_BASETYPE_ENUM) {
105 + for (nn = smiGetFirstNamedNumber(smiType);
107 nn = smiGetNextNamedNumber(nn)) {
108 if (nn->value.value.integer32
109 @@ -1096,10 +1086,6 @@
115 - smiFreeType(smiType);
120 @@ -1215,7 +1201,6 @@
121 if (elem.type != BE_NULL) {
123 smi_print_value(smiNode, pduid, &elem);
124 - smiFreeNode(smiNode);