author | Tomas Klacko <tomas.klacko@oracle.com> |
Thu, 30 Oct 2014 12:03:11 -0700 | |
branch | s11-update |
changeset 3440 | 573f3b6b1987 |
permissions | -rw-r--r-- |
3440
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
1 |
http://sourceforge.net/p/net-snmp/official-patches/48 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
2 |
http://sourceforge.net/p/net-snmp/code/ci/7f4a7b891332899cea26e95be0337aae01648742 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
3 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
4 |
diff --git a/snmplib/mib.c b/snmplib/mib.c |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
5 |
index b0a7d29..e2fd906 100644 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
6 |
--- a/snmplib/mib.c |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
7 |
+++ b/snmplib/mib.c |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
8 |
@@ -436,17 +436,16 @@ sprint_realloc_octet_string(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
9 |
u_char *cp; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
10 |
int output_format; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
11 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
12 |
- if ((var->type != ASN_OCTET_STR) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
13 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
14 |
- const char str[] = "Wrong Type (should be OCTET STRING): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
15 |
- if (snmp_cstrcat |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
16 |
- (buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
17 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
18 |
+ if (var->type != ASN_OCTET_STR) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
19 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
20 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
21 |
+ const char str[] = "Wrong Type (should be OCTET STRING): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
22 |
+ if (!snmp_cstrcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
23 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
24 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
25 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
26 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
27 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
28 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
29 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
30 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
31 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
32 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
33 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
34 |
@@ -704,16 +703,16 @@ sprint_realloc_float(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
35 |
const struct enum_list *enums, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
36 |
const char *hint, const char *units) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
37 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
38 |
- if ((var->type != ASN_OPAQUE_FLOAT) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
39 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
40 |
- if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
41 |
- "Wrong Type (should be Float): ")) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
42 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
43 |
+ if (var->type != ASN_OPAQUE_FLOAT) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
44 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
45 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
46 |
+ u_char str[] = "Wrong Type (should be Float): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
47 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
48 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
49 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
50 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
51 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
52 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
53 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
54 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
55 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
56 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
57 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
58 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
59 |
@@ -774,17 +773,16 @@ sprint_realloc_double(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
60 |
const struct enum_list *enums, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
61 |
const char *hint, const char *units) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
62 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
63 |
- if ((var->type != ASN_OPAQUE_DOUBLE) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
64 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
65 |
- if (snmp_cstrcat |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
66 |
- (buf, buf_len, out_len, allow_realloc, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
67 |
- "Wrong Type (should be Double): ")) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
68 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
69 |
+ if (var->type != ASN_OPAQUE_DOUBLE) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
70 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
71 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
72 |
+ u_char str[] = "Wrong Type (should be Double): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
73 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
74 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
75 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
76 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
77 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
78 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
79 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
80 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
81 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
82 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
83 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
84 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
85 |
@@ -849,20 +847,21 @@ sprint_realloc_counter64(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
86 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
87 |
char a64buf[I64CHARSZ + 1]; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
88 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
89 |
- if ((var->type != ASN_COUNTER64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
90 |
+ if (var->type != ASN_COUNTER64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
91 |
#ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
92 |
&& var->type != ASN_OPAQUE_COUNTER64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
93 |
&& var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_U64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
94 |
#endif |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
95 |
- ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
96 |
- if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
97 |
- "Wrong Type (should be Counter64): ")) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
98 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
99 |
+ ) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
100 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
101 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
102 |
+ u_char str[] = "Wrong Type (should be Counter64): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
103 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
104 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
105 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
106 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
107 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
108 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
109 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
110 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
111 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
112 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
113 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
114 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
115 |
@@ -950,23 +949,25 @@ sprint_realloc_opaque(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
116 |
const struct enum_list *enums, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
117 |
const char *hint, const char *units) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
118 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
119 |
- if ((var->type != ASN_OPAQUE |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
120 |
+ if (var->type != ASN_OPAQUE |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
121 |
#ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
122 |
&& var->type != ASN_OPAQUE_COUNTER64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
123 |
&& var->type != ASN_OPAQUE_U64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
124 |
&& var->type != ASN_OPAQUE_I64 |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
125 |
&& var->type != ASN_OPAQUE_FLOAT && var->type != ASN_OPAQUE_DOUBLE |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
126 |
#endif /* NETSNMP_WITH_OPAQUE_SPECIAL_TYPES */ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
127 |
- ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
128 |
- if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
129 |
- "Wrong Type (should be Opaque): ")) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
130 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
131 |
+ ) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
132 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
133 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
134 |
+ u_char str[] = "Wrong Type (should be Opaque): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
135 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
136 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
137 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
138 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
139 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
140 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
141 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
142 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
143 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
144 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
145 |
+ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
146 |
#ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
147 |
switch (var->type) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
148 |
case ASN_OPAQUE_COUNTER64: |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
149 |
@@ -1042,17 +1043,16 @@ sprint_realloc_object_identifier(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
150 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
151 |
int buf_overflow = 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
152 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
153 |
- if ((var->type != ASN_OBJECT_ID) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
154 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
155 |
- u_char str[] = |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
156 |
- "Wrong Type (should be OBJECT IDENTIFIER): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
157 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
158 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
159 |
+ if (var->type != ASN_OBJECT_ID) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
160 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
161 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
162 |
+ u_char str[] = "Wrong Type (should be OBJECT IDENTIFIER): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
163 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
164 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
165 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
166 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
167 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
168 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
169 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
170 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
171 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
172 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
173 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
174 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
175 |
@@ -1112,16 +1112,16 @@ sprint_realloc_timeticks(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
176 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
177 |
char timebuf[40]; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
178 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
179 |
- if ((var->type != ASN_TIMETICKS) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
180 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
181 |
- u_char str[] = "Wrong Type (should be Timeticks): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
182 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
183 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
184 |
+ if (var->type != ASN_TIMETICKS) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
185 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
186 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
187 |
+ u_char str[] = "Wrong Type (should be Timeticks): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
188 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
189 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
190 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
191 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
192 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
193 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
194 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
195 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
196 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
197 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
198 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
199 |
if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_NUMERIC_TIMETICKS)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
200 |
@@ -1260,17 +1260,18 @@ sprint_realloc_integer(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
201 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
202 |
char *enum_string = NULL; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
203 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
204 |
- if ((var->type != ASN_INTEGER) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
205 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
206 |
- u_char str[] = "Wrong Type (should be INTEGER): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
207 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
208 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
209 |
+ if (var->type != ASN_INTEGER) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
210 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
211 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
212 |
+ u_char str[] = "Wrong Type (should be INTEGER): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
213 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
214 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
215 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
216 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
217 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
218 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
219 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
220 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
221 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
222 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
223 |
+ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
224 |
for (; enums; enums = enums->next) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
225 |
if (enums->value == *var->val.integer) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
226 |
enum_string = enums->label; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
227 |
@@ -1363,16 +1364,16 @@ sprint_realloc_uinteger(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
228 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
229 |
char *enum_string = NULL; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
230 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
231 |
- if ((var->type != ASN_UINTEGER) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
232 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
233 |
- u_char str[] = "Wrong Type (should be UInteger32): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
234 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
235 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
236 |
+ if (var->type != ASN_UINTEGER) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
237 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
238 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
239 |
+ u_char str[] = "Wrong Type (should be UInteger32): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
240 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
241 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
242 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
243 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
244 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
245 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
246 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
247 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
248 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
249 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
250 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
251 |
for (; enums; enums = enums->next) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
252 |
@@ -1460,17 +1461,16 @@ sprint_realloc_gauge(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
253 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
254 |
char tmp[32]; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
255 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
256 |
- if ((var->type != ASN_GAUGE) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
257 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
258 |
- u_char str[] = |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
259 |
- "Wrong Type (should be Gauge32 or Unsigned32): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
260 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
261 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
262 |
+ if (var->type != ASN_GAUGE) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
263 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
264 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
265 |
+ u_char str[] = "Wrong Type (should be Gauge32 or Unsigned32): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
266 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
267 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
268 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
269 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
270 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
271 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
272 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
273 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
274 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
275 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
276 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
277 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
278 |
@@ -1533,16 +1533,16 @@ sprint_realloc_counter(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
279 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
280 |
char tmp[32]; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
281 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
282 |
- if ((var->type != ASN_COUNTER) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
283 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
284 |
- u_char str[] = "Wrong Type (should be Counter32): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
285 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
286 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
287 |
+ if (var->type != ASN_COUNTER) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
288 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
289 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
290 |
+ u_char str[] = "Wrong Type (should be Counter32): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
291 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
292 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
293 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
294 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
295 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
296 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
297 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
298 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
299 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
300 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
301 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
302 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
303 |
@@ -1596,16 +1596,16 @@ sprint_realloc_networkaddress(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
304 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
305 |
size_t i; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
306 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
307 |
- if ((var->type != ASN_IPADDRESS) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
308 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
309 |
- u_char str[] = "Wrong Type (should be NetworkAddress): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
310 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
311 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
312 |
+ if (var->type != ASN_IPADDRESS) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
313 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
314 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
315 |
+ u_char str[] = "Wrong Type (should be NetworkAddress): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
316 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
317 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
318 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
319 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
320 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
321 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
322 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
323 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
324 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
325 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
326 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
327 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
328 |
@@ -1662,16 +1662,16 @@ sprint_realloc_ipaddress(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
329 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
330 |
u_char *ip = var->val.string; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
331 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
332 |
- if ((var->type != ASN_IPADDRESS) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
333 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
334 |
- u_char str[] = "Wrong Type (should be IpAddress): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
335 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
336 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
337 |
+ if (var->type != ASN_IPADDRESS) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
338 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
339 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
340 |
+ u_char str[] = "Wrong Type (should be IpAddress): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
341 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
342 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
343 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
344 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
345 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
346 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
347 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
348 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
349 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
350 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
351 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
352 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
353 |
@@ -1720,20 +1720,20 @@ sprint_realloc_null(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
354 |
const struct enum_list *enums, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
355 |
const char *hint, const char *units) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
356 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
357 |
- if ((var->type != ASN_NULL) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
358 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
359 |
- u_char str[] = "Wrong Type (should be NULL): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
360 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
361 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
362 |
+ if (var->type != ASN_NULL) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
363 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
364 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
365 |
+ u_char str[] = "Wrong Type (should be NULL): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
366 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
367 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
368 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
369 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
370 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
371 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
372 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
373 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
374 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
375 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
376 |
- u_char str[] = "NULL"; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
377 |
- return snmp_strcat(buf, buf_len, out_len, allow_realloc, str); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
378 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
379 |
+ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
380 |
+ u_char str[] = "NULL"; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
381 |
+ return snmp_strcat(buf, buf_len, out_len, allow_realloc, str); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
382 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
383 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
384 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
385 |
@@ -1768,16 +1768,16 @@ sprint_realloc_bitstring(u_char ** buf, size_t * buf_len, size_t * out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
386 |
u_char *cp; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
387 |
char *enum_string; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
388 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
389 |
- if ((var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
390 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
391 |
- u_char str[] = "Wrong Type (should be BITS): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
392 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
393 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
394 |
+ if (var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
395 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
396 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
397 |
+ u_char str[] = "Wrong Type (should be BITS): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
398 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
399 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
400 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
401 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
402 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
403 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
404 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
405 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
406 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
407 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
408 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
409 |
if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
410 |
@@ -1852,16 +1852,16 @@ sprint_realloc_nsapaddress(u_char ** buf, size_t * buf_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
411 |
const struct enum_list *enums, const char *hint, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
412 |
const char *units) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
413 |
{ |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
414 |
- if ((var->type != ASN_NSAP) && |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
415 |
- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
416 |
- u_char str[] = "Wrong Type (should be NsapAddress): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
417 |
- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
418 |
- return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
419 |
+ if (var->type != ASN_NSAP) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
420 |
+ if (!netsnmp_ds_get_boolean( |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
421 |
+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
422 |
+ u_char str[] = "Wrong Type (should be NsapAddress): "; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
423 |
+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
424 |
+ return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
425 |
+ } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
426 |
+ return sprint_realloc_by_type(buf, buf_len, out_len, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
427 |
allow_realloc, var, NULL, NULL, |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
428 |
NULL); |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
429 |
- } else { |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
430 |
- return 0; |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
431 |
- } |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
432 |
} |
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
433 |
|
573f3b6b1987
19547764 problem in UTILITY/NET-SNMP
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
434 |
if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) { |