author | Huie-Ying Lee <huieying.lee@oracle.com> |
Wed, 20 May 2015 15:14:17 -0700 | |
branch | s11-update |
changeset 4329 | 771a6f41f496 |
parent 631 | 8fc12a712447 |
permissions | -rw-r--r-- |
631
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1 |
--- net-snmp/snmplib/snmp_api.c Fri Nov 11 12:36:16 2011 |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
2 |
+++ net-snmp/snmplib/snmp_api.c Fri Nov 11 12:35:36 2011 |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
3 |
@@ -419,7 +419,7 @@ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
4 |
if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_16BIT_IDS)) |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
5 |
return (retVal & 0x7fff); /* mask to 15 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
6 |
else |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
7 |
- return retVal; |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
8 |
+ return (retVal & 0x7fffffff); /* mask to 31 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
9 |
} |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
10 |
|
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
11 |
long |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
12 |
@@ -435,7 +435,7 @@ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
13 |
if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_16BIT_IDS)) |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
14 |
return (retVal & 0x7fff); /* mask to 15 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
15 |
else |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
16 |
- return retVal; |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
17 |
+ return (retVal & 0x7fffffff); /* mask to 31 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
18 |
} |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
19 |
|
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
20 |
long |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
21 |
@@ -451,7 +451,7 @@ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
22 |
if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_16BIT_IDS)) |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
23 |
return (retVal & 0x7fff); /* mask to 15 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
24 |
else |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
25 |
- return retVal; |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
26 |
+ return (retVal & 0x7fffffff); /* mask to 31 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
27 |
} |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
28 |
|
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
29 |
long |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
30 |
@@ -467,7 +467,7 @@ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
31 |
if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_16BIT_IDS)) |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
32 |
return (retVal & 0x7fff); /* mask to 15 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
33 |
else |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
34 |
- return retVal; |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
35 |
+ return (retVal & 0x7fffffff); /* mask to 31 bits */ |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
36 |
} |
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
37 |
|
8fc12a712447
7046749 SMA snmpd can generate a RequestID greater than 4-bytes in length
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
38 |
void |