Attachment 162072 Details for Bug 253880 – Patch for RHEL5

[patch] Patch for RHEL5

ipmib-size-64bit-5.3.1-rhel5.patch (text/plain), 6.80 KB, created by Flavio Leitner on 2007-08-22 16:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Flavio Leitner

Created: 2007-08-22 16:10:14 UTC

Size: 6.80 KB

patch

obsolete

>Index: agent/mibgroup/mibII/at.c
>===================================================================
>--- agent/mibgroup/mibII/at.c.orig
>+++ agent/mibgroup/mibII/at.c
>@@ -315,7 +315,7 @@ var_atEntry(struct variable *vp,
>         *var_len = sizeof(LowPhysAddr);
>         return (u_char *) LowPhysAddr;
>     case IPMEDIANETADDRESS:    /* also ATNETADDRESS */
>-        *var_len = sizeof addr_ret;
>+        *var_len = sizeof(uint32_t);
>         addr_ret = LowAddr;
>         return (u_char *) & addr_ret;
>     case IPMEDIATYPE:
>@@ -455,7 +455,7 @@ var_atEntry(struct variable * vp,
>         *var_len = Lowentry.ipNetToMediaPhysAddress.o_length;
>         return Lowentry.ipNetToMediaPhysAddress.o_bytes;
>     case IPMEDIANETADDRESS:
>-        *var_len = sizeof(Lowentry.ipNetToMediaNetAddress);
>+        *var_len = sizeof(uint32_t);
>         return (u_char *) &Lowentry.ipNetToMediaNetAddress;
>     case IPMEDIATYPE:
>         *var_len = sizeof long_return;
>@@ -954,7 +954,7 @@ var_atEntry(struct variable *vp,
>         free(pIpNetTable);
>         return (u_char *) return_buf;
>     case IPMEDIANETADDRESS:    /* also ATNETADDRESS */
>-        *var_len = sizeof long_return;
>+        *var_len = sizeof(uint32_t);
>         long_return = pIpNetTable->table[i].dwAddr;
>         free(pIpNetTable);
>         return (u_char *) & long_return;
>Index: agent/mibgroup/mibII/var_route.c
>===================================================================
>--- agent/mibgroup/mibII/var_route.c.orig
>+++ agent/mibgroup/mibII/var_route.c
>@@ -228,6 +228,7 @@ var_ipRouteEntry(struct variable *vp,
> 
>     switch (vp->magic) {
>     case IPROUTEDEST:
>+       *var_len = sizeof(uint32_t);
>         return (u_char *) get_in_address((struct sockaddr *) (rtp + 1),
>                                          rtp->rtm_addrs, RTA_DST);
>     case IPROUTEIFINDEX:
>@@ -261,6 +262,7 @@ var_ipRouteEntry(struct variable *vp,
>         long_return = -1;
>         return (u_char *) & long_return;
>     case IPROUTENEXTHOP:
>+       *var_len = sizeof(uint32_t);
>         return (u_char *) get_in_address((struct sockaddr *) (rtp + 1),
>                                          rtp->rtm_addrs, RTA_GATEWAY);
>     case IPROUTETYPE:
>@@ -532,7 +534,7 @@ var_ipRouteEntry(struct variable * vp,
> 
>     switch (vp->magic) {
>     case IPROUTEDEST:
>-	*var_len = sizeof(addr_ret);
>+        *var_len = sizeof(uint32_t);
> #if NEED_KLGETSA
>         sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_dst);
>         return (u_char *) & (sa->sin_addr.s_addr);
>@@ -591,7 +593,7 @@ var_ipRouteEntry(struct variable * vp,
>         long_return = -1;
>         return (u_char *) & long_return;
>     case IPROUTENEXTHOP:
>-	*var_len = sizeof(addr_ret);
>+       *var_len = sizeof(addr_ret);
> #if NEED_KLGETSA
>         sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_gateway);
>         return (u_char *) & (sa->sin_addr.s_addr);
>@@ -1563,6 +1565,7 @@ var_ipRouteEntry(struct variable *vp,
> 
>     switch (vp->magic) {
>     case IPROUTEDEST:
>+        *var_len = sizeof(uint32_t);
>         *write_method = write_rte;
>         long_return = pIpRtrTable->table[RtIndex].dwForwardDest;
>         return (u_char *) & long_return;
>@@ -1591,6 +1594,7 @@ var_ipRouteEntry(struct variable *vp,
>         long_return = pIpRtrTable->table[RtIndex].dwForwardMetric5;
>         return (u_char *) & long_return;
>     case IPROUTENEXTHOP:
>+        *var_len = sizeof(uint32_t);
>         *write_method = write_rte;
>         long_return = pIpRtrTable->table[RtIndex].dwForwardNextHop;
>         return (u_char *) & long_return;
>@@ -1854,10 +1858,11 @@ var_ipRouteEntry(struct variable * vp,
>         *length = 14;
>     }
> 
>-    *var_len = sizeof long_return;
>+    *var_len = sizeof(long_return);
> 
>     switch (vp->magic) {
>     case IPROUTEDEST:
>+       *var_len = sizeof(uint32_t);
>         long_return = rt->dest.s_addr;
>         return (u_char *) & long_return;
> 
>@@ -1882,6 +1887,7 @@ var_ipRouteEntry(struct variable * vp,
>         return (u_char *) & long_return;
> 
>     case IPROUTENEXTHOP:
>+       *var_len = sizeof(uint32_t);
>         if (rt->gateway.s_addr == 0 && rt->ifa.s_addr == 0)
>             long_return = 0;
>         else if (rt->gateway.s_addr == 0)
>Index: agent/mibgroup/mibII/udpTable.c
>===================================================================
>--- agent/mibgroup/mibII/udpTable.c.orig
>+++ agent/mibgroup/mibII/udpTable.c
>@@ -213,12 +213,12 @@ udpTable_handler(netsnmp_mib_handler    
>                 addr = ntohl(IN6_EXTRACT_V4ADDR(&entry->pcb.inp_laddr));
> 	        snmp_set_var_typed_value(requestvb, ASN_IPADDRESS,
>                                          (u_char*)&addr,
>-                                         sizeof(addr));
>+                                         sizeof(uint32_t));
> #else
>                 addr = UDP_ADDRESS_TO_HOST_ORDER(entry->UDPTABLE_LOCALADDRESS);
> 	        snmp_set_var_typed_value(requestvb, ASN_IPADDRESS,
>                                          (u_char *)&addr,
>-                                         sizeof(addr));
>+                                         sizeof(uint32_t));
> #endif
>                 break;
>             case UDPLOCALPORT:
>Index: agent/mibgroup/mibII/ipAddr.c
>===================================================================
>--- agent/mibgroup/mibII/ipAddr.c.orig
>+++ agent/mibgroup/mibII/ipAddr.c
>@@ -293,6 +293,7 @@ var_ipAddrEntry(struct variable *vp,
>     *var_len = sizeof(long_return);
>     switch (vp->magic) {
>     case IPADADDR:
>+       *var_len = sizeof(uint32_t);
> #ifdef hpux11
>         long_return = lowin_ifaddr.Addr;
>         return (u_char *) & long_return;
>@@ -308,6 +309,7 @@ var_ipAddrEntry(struct variable *vp,
>         long_return = lowinterface;
>         return (u_char *) & long_return;
>     case IPADNETMASK:
>+       *var_len = sizeof(uint32_t);
> #ifdef hpux11
>         long_return = lowin_ifaddr.NetMask;
>         return (u_char *) & long_return;
>@@ -912,6 +914,7 @@ var_ipAddrEntry(struct variable *vp,
>     *var_len = sizeof(long_return);
>     switch (vp->magic) {
>     case IPADADDR:
>+       *var_len = sizeof(uint32_t);
>         long_return = ifs[i].addr.s_addr;
>         return (u_char *) & long_return;
> 
>@@ -920,6 +923,7 @@ var_ipAddrEntry(struct variable *vp,
>         return (u_char *) & long_return;
> 
>     case IPADNETMASK:
>+       *var_len = sizeof(uint32_t);
>         long_return = ifs[i].mask.s_addr;
>         return (u_char *) & long_return;
> 
>@@ -1021,6 +1025,7 @@ var_ipAddrEntry(struct variable *vp,
>     *var_len = sizeof(long_return);
>     switch (vp->magic) {
>     case IPADADDR:
>+       *var_len = sizeof(uint32_t);
>         long_return = pIpAddrTable->table[i].dwAddr;
>         return (u_char *) & long_return;
> 
>@@ -1030,6 +1035,7 @@ var_ipAddrEntry(struct variable *vp,
>         return (u_char *) & long_return;
> 
>     case IPADNETMASK:
>+       *var_len = sizeof(uint32_t);
>         long_return = pIpAddrTable->table[i].dwMask;
>         free(pIpAddrTable);
>         return (u_char *) & long_return;

Actions: View | Diff

Attachments on bug 253880: 162072