FreeBSD Bugzilla – Attachment 94911 Details for
Bug 133152
net-mgmt/net-snmp: fails building on recent -CURRENT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-agent_mibgroup_mibII_ipv6.c-ver2.txt
patch-agent_mibgroup_mibII_ipv6.c-ver2.txt (text/plain; charset=US-ASCII; name="patch-agent_mibgroup_mibII_ipv6.c-ver2.txt"), 5.02 KB, created by
Scot Hetzel
on 2009-03-28 07:58:37 UTC
(
hide
)
Description:
patch-agent_mibgroup_mibII_ipv6.c-ver2.txt
Filename:
MIME Type:
Creator:
Scot Hetzel
Created:
2009-03-28 07:58:37 UTC
Size:
5.02 KB
patch
obsolete
>--- agent/mibgroup/mibII/ipv6.c.orig 2009-03-28 01:27:21.421079000 -0500 >+++ agent/mibgroup/mibII/ipv6.c 2009-03-28 02:04:54.974806106 -0500 >@@ -1332,7 +1332,7 @@ > j = (int) vp->namelen; > for (i = 0; i < sizeof(struct in6_addr); i++) > newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; >- newname[j++] = ntohs(tstpcb.in6p_lport); >+ newname[j++] = ntohs(tstpcb.inp_lport); > if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) > newname[j++] = > ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); >@@ -1396,7 +1396,7 @@ > *var_len = sizeof(struct in6_addr); > return savpcb.in6p_laddr.s6_addr; > case IPV6UDPLOCALPORT: >- long_return = ntohs(savpcb.in6p_lport); >+ long_return = ntohs(savpcb.inp_lport); > return (u_char *) & long_return; > case IPV6UDPIFINDEX: > if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) >@@ -1519,19 +1519,19 @@ > if (0 == (tstpcb.inp_vflag & INP_IPV6)) > goto skip; > #endif >- if (!NETSNMP_KLOOKUP(tstpcb.in6p_ppcb, (char *) &tcp6cb, sizeof(tcp6cb))) { >+ if (!NETSNMP_KLOOKUP(tstpcb.inp_ppcb, (char *) &tcp6cb, sizeof(tcp6cb))) { > DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcp6cb at %x\n", >- tstpcb.in6p_ppcb)); >+ tstpcb.inp_ppcb)); > found = 0; > break; > } > j = (int) vp->namelen; > for (i = 0; i < sizeof(struct in6_addr); i++) > newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; >- newname[j++] = ntohs(tstpcb.in6p_lport); >+ newname[j++] = ntohs(tstpcb.inp_lport); > for (i = 0; i < sizeof(struct in6_addr); i++) > newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; >- newname[j++] = ntohs(tstpcb.in6p_fport); >+ newname[j++] = ntohs(tstpcb.inp_fport); > if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) > newname[j++] = > ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); >@@ -1545,7 +1545,7 @@ > DEBUGMSG(("mibII/ipv6", " %d\n", exact)); > > #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ >- if (ntohs(tstpcb.in6p_lport) == 0) >+ if (ntohs(tstpcb.inp_lport) == 0) > goto skip; > #endif > >@@ -1601,13 +1601,13 @@ > *var_len = sizeof(struct in6_addr); > return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; > case IPV6TCPLOCALPORT: >- long_return = ntohs(savpcb.in6p_lport); >+ long_return = ntohs(savpcb.inp_lport); > return (u_char *) & long_return; > case IPV6TCPREMOTEADDR: > *var_len = sizeof(struct in6_addr); > return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; > case IPV6TCPREMOTEPORT: >- long_return = ntohs(savpcb.in6p_fport); >+ long_return = ntohs(savpcb.inp_fport); > return (u_char *) & long_return; > case IPV6TCPIFINDEX: > if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr)) >@@ -1742,19 +1742,19 @@ > if (0 == (tstpcb.inp_vflag & INP_IPV6)) > goto skip; > #endif >- if (!NETSNMP_KLOOKUP(tstpcb.in6p_ppcb, (char *) &tcpcb, sizeof(tcpcb))) { >+ if (!NETSNMP_KLOOKUP(tstpcb.inp_ppcb, (char *) &tcpcb, sizeof(tcpcb))) { > DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6.tcpcb at %x\n", >- tstpcb.in6p_ppcb)); >+ tstpcb.inp_ppcb)); > found = 0; > break; > } > j = (int) vp->namelen; > for (i = 0; i < sizeof(struct in6_addr); i++) > newname[j++] = tstpcb.in6p_laddr.s6_addr[i]; >- newname[j++] = ntohs(tstpcb.in6p_lport); >+ newname[j++] = ntohs(tstpcb.inp_lport); > for (i = 0; i < sizeof(struct in6_addr); i++) > newname[j++] = tstpcb.in6p_faddr.s6_addr[i]; >- newname[j++] = ntohs(tstpcb.in6p_fport); >+ newname[j++] = ntohs(tstpcb.inp_fport); > if (IN6_IS_ADDR_LINKLOCAL(&tstpcb.in6p_laddr)) > newname[j++] = > ntohs(*(uint16_t *) & tstpcb.in6p_laddr.s6_addr[2]); >@@ -1768,7 +1768,7 @@ > DEBUGMSG(("mibII/ipv6", " %d\n", exact)); > > #if 1 /* this is very odd but sometimes happen, and cause infinite loop */ >- if (ntohs(tstpcb.in6p_lport) == 0) >+ if (ntohs(tstpcb.inp_lport) == 0) > goto skip; > #endif > result = snmp_oid_compare(name, *length, newname, j); >@@ -1823,13 +1823,13 @@ > *var_len = sizeof(struct in6_addr); > return (u_char *) & savpcb.in6p_laddr.s6_addr[0]; > case IPV6TCPLOCALPORT: >- long_return = ntohs(savpcb.in6p_lport); >+ long_return = ntohs(savpcb.inp_lport); > return (u_char *) & long_return; > case IPV6TCPREMOTEADDR: > *var_len = sizeof(struct in6_addr); > return (u_char *) & savpcb.in6p_faddr.s6_addr[0]; > case IPV6TCPREMOTEPORT: >- long_return = ntohs(savpcb.in6p_fport); >+ long_return = ntohs(savpcb.inp_fport); > return (u_char *) & long_return; > case IPV6TCPIFINDEX: > if (IN6_IS_ADDR_LINKLOCAL(&savpcb.in6p_laddr))
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=94911">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 133152
:
94910
| 94911