svn commit: r214338 - in stable/8/sys: netinet netinet6

[Robert Watson]

On Mon, 25 Oct 2010, Attilio Rao wrote:

>  IP_BINDANY is not correctly handled in getsockopt() case.
>  Fix it by specifying the correct bits.

It would be nice if we had regression tests to validate this sort of thing; I 
think we already have something in the area of socket options, but it doesn't 
test for this sort of stuff...

Robert

>
> Modified:
>  stable/8/sys/netinet/ip_output.c
>  stable/8/sys/netinet6/ip6_output.c
> Directory Properties:
>  stable/8/sys/   (props changed)
>  stable/8/sys/amd64/include/xen/   (props changed)
>  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
>  stable/8/sys/contrib/dev/acpica/   (props changed)
>  stable/8/sys/contrib/pf/   (props changed)
>  stable/8/sys/dev/xen/xenpci/   (props changed)
>
> Modified: stable/8/sys/netinet/ip_output.c
> ==============================================================================
> --- stable/8/sys/netinet/ip_output.c	Mon Oct 25 13:13:16 2010	(r214337)
> +++ stable/8/sys/netinet/ip_output.c	Mon Oct 25 13:16:11 2010	(r214338)
> @@ -1127,6 +1127,7 @@ ip_ctloutput(struct socket *so, struct s
> 		case IP_FAITH:
> 		case IP_ONESBCAST:
> 		case IP_DONTFRAG:
> +		case IP_BINDANY:
> 			switch (sopt->sopt_name) {
>
> 			case IP_TOS:
> @@ -1182,6 +1183,9 @@ ip_ctloutput(struct socket *so, struct s
> 			case IP_DONTFRAG:
> 				optval = OPTBIT(INP_DONTFRAG);
> 				break;
> +			case IP_BINDANY:
> +				optval = OPTBIT(INP_BINDANY);
> +				break;
> 			}
> 			error = sooptcopyout(sopt, &optval, sizeof optval);
> 			break;
>
> Modified: stable/8/sys/netinet6/ip6_output.c
> ==============================================================================
> --- stable/8/sys/netinet6/ip6_output.c	Mon Oct 25 13:13:16 2010	(r214337)
> +++ stable/8/sys/netinet6/ip6_output.c	Mon Oct 25 13:16:11 2010	(r214338)
> @@ -1798,6 +1798,7 @@ do { \
> 			case IPV6_PORTRANGE:
> 			case IPV6_RECVTCLASS:
> 			case IPV6_AUTOFLOWLABEL:
> +			case IPV6_BINDANY:
> 				switch (optname) {
>
> 				case IPV6_RECVHOPOPTS:
>