Re: PR/59486 CVS commit: src/sys/compat/linux/common

[mc36 <csmate%nop.hu@localhost>]

hi team, christos,

after checking out the latest from anoncvs, the merged one seems

to be the original patch, which got some feedback from christoph.


so please revert that, and apply the latest (re-attaching)...

sorry for the inconvenience and thank you so much in advance,

csaba


On 6/27/25 17:05, Christos Zoulas wrote:
> The following reply was made to PR kern/59486; it has been noted by GNATS.
>
> From: "Christos Zoulas" <christos%netbsd.org@localhost>
> To: gnats-bugs%gnats.NetBSD.org@localhost
> Cc:
> Subject: PR/59486 CVS commit: src/sys/compat/linux/common
> Date: Fri, 27 Jun 2025 11:03:33 -0400
>
>   Module Name: src
>   Committed By: christos
>   Date:  Fri Jun 27 15:03:33 UTC 2025
>   
>   Modified Files:
>    src/sys/compat/linux/common: linux_socket.c linux_socket.h
>   
>   Log Message:
>   PR/59486: csaba mate: Ignore IP_MULTICAST_ALL, since we don't have it.
>   
>   
>   To generate a diff of this commit:
>   cvs rdiff -u -r1.156 -r1.157 src/sys/compat/linux/common/linux_socket.c
>   cvs rdiff -u -r1.25 -r1.26 src/sys/compat/linux/common/linux_socket.h
>   
>   Please note that diffs are not public domain; they are subject to the
>   copyright notices on the relevant files.
>   
diff -crB a/linux_socket.c b/linux_socket.c
*** a/linux_socket.c	2021-09-23 08:56:27.000000000 +0200
--- b/linux_socket.c	2025-06-27 13:16:32.420057642 +0200
***************
*** 945,950 ****
--- 945,956 ----
  		return IP_TOS;
  	case LINUX_IP_TTL:
  		return IP_TTL;
+ 	case LINUX_IP_RETOPTS:
+ 		return IP_RETOPTS;
+ 	case LINUX_IP_PKTINFO:
+ 		return IP_PKTINFO;
+ 	case LINUX_IP_RECVOPTS:
+ 		return IP_RECVOPTS;
  	case LINUX_IP_HDRINCL:
  		return IP_HDRINCL;
  	case LINUX_IP_MULTICAST_TTL:
***************
*** 958,964 ****
--- 964,973 ----
  	case LINUX_IP_DROP_MEMBERSHIP:
  		return IP_DROP_MEMBERSHIP;
  	case LINUX_IP_RECVERR:
+ 	case LINUX_IP_FREEBIND:
  		return -2;	/* ignored */
+ 	case LINUX_IP_MULTICAST_ALL:
+ 		return -3;	/* noprotoopt */
  	default:
  		return -1;
  	}
***************
*** 975,980 ****
--- 984,993 ----
  	switch (lopt) {
  	case LINUX_IPV6_V6ONLY:
  		return IPV6_V6ONLY;
+ 	case LINUX_IPV6_MULTICAST_HOPS:
+ 		return IPV6_MULTICAST_HOPS;
+ 	case LINUX_IPV6_MULTICAST_ALL:
+ 		return -3;	/* noprotoopt */
  	default:
  		return -1;
  	}
***************
*** 1075,1084 ****
  		return EINVAL;
  	}
  
! 	if (name == -1)
  		return EINVAL;
! 	if (name == -2)
  		return 0;
  	SCARG(&bsa, name) = name;
  
  	return sys_setsockopt(l, &bsa, retval);
--- 1088,1101 ----
  		return EINVAL;
  	}
  
! 	switch (name) {
! 	case -1:
  		return EINVAL;
! 	case -2:
  		return 0;
+ 	case -3:
+ 		return ENOPROTOOPT;
+ 	}
  	SCARG(&bsa, name) = name;
  
  	return sys_setsockopt(l, &bsa, retval);
***************
*** 1127,1134 ****
  		return EINVAL;
  	}
  
! 	if (name == -1)
  		return EINVAL;
  	SCARG(&bga, name) = name;
  
  	return sys_getsockopt(l, &bga, retval);
--- 1144,1157 ----
  		return EINVAL;
  	}
  
! 	switch (name) {
! 	case -1:
! 		return EINVAL;
! 	case -2:
  		return EINVAL;
+ 	case -3:
+ 		return ENOPROTOOPT;
+ 	}
  	SCARG(&bga, name) = name;
  
  	return sys_getsockopt(l, &bga, retval);
diff -crB a/linux_socket.h b/linux_socket.h
*** a/linux_socket.h	2021-09-23 08:56:27.000000000 +0200
--- b/linux_socket.h	2025-06-27 11:47:47.911425969 +0200
***************
*** 104,121 ****
--- 104,129 ----
  #define LINUX_IP_TOS		1
  #define LINUX_IP_TTL		2
  #define LINUX_IP_HDRINCL	3
+ #define LINUX_IP_RECVOPTS	6
+ #define LINUX_IP_RETOPTS	7
+ #define LINUX_IP_PKTINFO	8
  #define LINUX_IP_RECVERR	11
+ #define LINUX_IP_FREEBIND	15
  #define	LINUX_IP_MULTICAST_IF	32
  #define	LINUX_IP_MULTICAST_TTL	33
  #define	LINUX_IP_MULTICAST_LOOP	34
  #define	LINUX_IP_ADD_MEMBERSHIP	35
  #define	LINUX_IP_DROP_MEMBERSHIP 36
+ #define LINUX_IP_MULTICAST_ALL	49
  
  /*
   * Options for [gs]etsockopt(2), IPV6 level.
   */
  
  #define LINUX_IPV6_V6ONLY		26
+ #define LINUX_IPV6_MULTICAST_HOPS	18
+ #define LINUX_IPV6_MULTICAST_ALL	29
+ 
  
  /*
   * Options for [gs]etsockopt(2), TCP level.