mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	upgrade to most recent bluemonday (#11007)
* upgrade to most recent bluemonday * make vendor * update tests for bluemonday * update tests for bluemonday * update tests for bluemonday
This commit is contained in:
		
							
								
								
									
										97
									
								
								vendor/golang.org/x/sys/unix/syscall_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										97
									
								
								vendor/golang.org/x/sys/unix/syscall_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -839,6 +839,40 @@ func (sa *SockaddrTIPC) sockaddr() (unsafe.Pointer, _Socklen, error) { | ||||
| 	return unsafe.Pointer(&sa.raw), SizeofSockaddrTIPC, nil | ||||
| } | ||||
|  | ||||
| // SockaddrL2TPIP implements the Sockaddr interface for IPPROTO_L2TP/AF_INET sockets. | ||||
| type SockaddrL2TPIP struct { | ||||
| 	Addr   [4]byte | ||||
| 	ConnId uint32 | ||||
| 	raw    RawSockaddrL2TPIP | ||||
| } | ||||
|  | ||||
| func (sa *SockaddrL2TPIP) sockaddr() (unsafe.Pointer, _Socklen, error) { | ||||
| 	sa.raw.Family = AF_INET | ||||
| 	sa.raw.Conn_id = sa.ConnId | ||||
| 	for i := 0; i < len(sa.Addr); i++ { | ||||
| 		sa.raw.Addr[i] = sa.Addr[i] | ||||
| 	} | ||||
| 	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2TPIP, nil | ||||
| } | ||||
|  | ||||
| // SockaddrL2TPIP6 implements the Sockaddr interface for IPPROTO_L2TP/AF_INET6 sockets. | ||||
| type SockaddrL2TPIP6 struct { | ||||
| 	Addr   [16]byte | ||||
| 	ZoneId uint32 | ||||
| 	ConnId uint32 | ||||
| 	raw    RawSockaddrL2TPIP6 | ||||
| } | ||||
|  | ||||
| func (sa *SockaddrL2TPIP6) sockaddr() (unsafe.Pointer, _Socklen, error) { | ||||
| 	sa.raw.Family = AF_INET6 | ||||
| 	sa.raw.Conn_id = sa.ConnId | ||||
| 	sa.raw.Scope_id = sa.ZoneId | ||||
| 	for i := 0; i < len(sa.Addr); i++ { | ||||
| 		sa.raw.Addr[i] = sa.Addr[i] | ||||
| 	} | ||||
| 	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2TPIP6, nil | ||||
| } | ||||
|  | ||||
| func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { | ||||
| 	switch rsa.Addr.Family { | ||||
| 	case AF_NETLINK: | ||||
| @@ -889,25 +923,58 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { | ||||
| 		return sa, nil | ||||
|  | ||||
| 	case AF_INET: | ||||
| 		pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa)) | ||||
| 		sa := new(SockaddrInet4) | ||||
| 		p := (*[2]byte)(unsafe.Pointer(&pp.Port)) | ||||
| 		sa.Port = int(p[0])<<8 + int(p[1]) | ||||
| 		for i := 0; i < len(sa.Addr); i++ { | ||||
| 			sa.Addr[i] = pp.Addr[i] | ||||
| 		proto, err := GetsockoptInt(fd, SOL_SOCKET, SO_PROTOCOL) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
|  | ||||
| 		switch proto { | ||||
| 		case IPPROTO_L2TP: | ||||
| 			pp := (*RawSockaddrL2TPIP)(unsafe.Pointer(rsa)) | ||||
| 			sa := new(SockaddrL2TPIP) | ||||
| 			sa.ConnId = pp.Conn_id | ||||
| 			for i := 0; i < len(sa.Addr); i++ { | ||||
| 				sa.Addr[i] = pp.Addr[i] | ||||
| 			} | ||||
| 			return sa, nil | ||||
| 		default: | ||||
| 			pp := (*RawSockaddrInet4)(unsafe.Pointer(rsa)) | ||||
| 			sa := new(SockaddrInet4) | ||||
| 			p := (*[2]byte)(unsafe.Pointer(&pp.Port)) | ||||
| 			sa.Port = int(p[0])<<8 + int(p[1]) | ||||
| 			for i := 0; i < len(sa.Addr); i++ { | ||||
| 				sa.Addr[i] = pp.Addr[i] | ||||
| 			} | ||||
| 			return sa, nil | ||||
| 		} | ||||
| 		return sa, nil | ||||
|  | ||||
| 	case AF_INET6: | ||||
| 		pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa)) | ||||
| 		sa := new(SockaddrInet6) | ||||
| 		p := (*[2]byte)(unsafe.Pointer(&pp.Port)) | ||||
| 		sa.Port = int(p[0])<<8 + int(p[1]) | ||||
| 		sa.ZoneId = pp.Scope_id | ||||
| 		for i := 0; i < len(sa.Addr); i++ { | ||||
| 			sa.Addr[i] = pp.Addr[i] | ||||
| 		proto, err := GetsockoptInt(fd, SOL_SOCKET, SO_PROTOCOL) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
|  | ||||
| 		switch proto { | ||||
| 		case IPPROTO_L2TP: | ||||
| 			pp := (*RawSockaddrL2TPIP6)(unsafe.Pointer(rsa)) | ||||
| 			sa := new(SockaddrL2TPIP6) | ||||
| 			sa.ConnId = pp.Conn_id | ||||
| 			sa.ZoneId = pp.Scope_id | ||||
| 			for i := 0; i < len(sa.Addr); i++ { | ||||
| 				sa.Addr[i] = pp.Addr[i] | ||||
| 			} | ||||
| 			return sa, nil | ||||
| 		default: | ||||
| 			pp := (*RawSockaddrInet6)(unsafe.Pointer(rsa)) | ||||
| 			sa := new(SockaddrInet6) | ||||
| 			p := (*[2]byte)(unsafe.Pointer(&pp.Port)) | ||||
| 			sa.Port = int(p[0])<<8 + int(p[1]) | ||||
| 			sa.ZoneId = pp.Scope_id | ||||
| 			for i := 0; i < len(sa.Addr); i++ { | ||||
| 				sa.Addr[i] = pp.Addr[i] | ||||
| 			} | ||||
| 			return sa, nil | ||||
| 		} | ||||
| 		return sa, nil | ||||
|  | ||||
| 	case AF_VSOCK: | ||||
| 		pp := (*RawSockaddrVM)(unsafe.Pointer(rsa)) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user