Commit 7844d50c authored by ZhangGuoDong's avatar ZhangGuoDong Committed by Steve French
Browse files

smb: move smb_sockaddr_in and smb_sockaddr_in6 to common/smb2pdu.h 



Rename 4 places:

  - iface_info_ipv4 -> smb_sockaddr_in
  - iface_info_ipv6 -> smb_sockaddr_in6
  - IPv4address -> IPv4Address
  - IPv6address -> IPv6Address

Then move duplicate definitions to common header file.

Co-developed-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarZhangGuoDong <zhangguodong@kylinos.cn>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent cd311445

fs/smb/client/smb2ops.c

+4 −4
Original line number Diff line number Diff line
@@ -624,8 +624,8 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, 
	struct network_interface_info_ioctl_rsp *p;

	struct sockaddr_in *addr4;

	struct sockaddr_in6 *addr6;

	struct iface_info_ipv4 *p4;

	struct iface_info_ipv6 *p6;

	struct smb_sockaddr_in *p4;

	struct smb_sockaddr_in6 *p6;

	struct cifs_server_iface *info = NULL, *iface = NULL, *niface = NULL;

	struct cifs_server_iface tmp_iface;

	ssize_t bytes_left;
@@ -685,7 +685,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, 
		 */

		case INTERNETWORK:

			addr4 = (struct sockaddr_in *)&tmp_iface.sockaddr;

			p4 = (struct iface_info_ipv4 *)p->Buffer;

			p4 = (struct smb_sockaddr_in *)p->Buffer;

			addr4->sin_family = AF_INET;

			memcpy(&addr4->sin_addr, &p4->IPv4Address, 4);
@@ -697,7 +697,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, 
			break;

		case INTERNETWORKV6:

			addr6 =	(struct sockaddr_in6 *)&tmp_iface.sockaddr;

			p6 = (struct iface_info_ipv6 *)p->Buffer;

			p6 = (struct smb_sockaddr_in6 *)p->Buffer;

			addr6->sin6_family = AF_INET6;

			memcpy(&addr6->sin6_addr, &p6->IPv6Address, 16);

fs/smb/client/smb2pdu.h

+0 −13
Original line number Diff line number Diff line
@@ -279,19 +279,6 @@ struct network_interface_info_ioctl_rsp { 
	__u8 Buffer[126];

} __packed;



struct iface_info_ipv4 {

	__be16 Port;

	__be32 IPv4Address;

	__be64 Reserved;

} __packed;



struct iface_info_ipv6 {

	__be16 Port;

	__be32 FlowInfo;

	__u8   IPv6Address[16];

	__be32 ScopeId;

} __packed;



#define NO_FILE_ID 0xFFFFFFFFFFFFFFFFULL /* general ioctls to srv not to file */



struct compress_ioctl {

fs/smb/common/smb2pdu.h

+15 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,21 @@ struct smb2_ioctl_rsp { 
	__u8   Buffer[];

} __packed;



/* See MS-SMB2 2.2.32.5.1.1 */

struct smb_sockaddr_in {

	__be16 Port;

	__be32 IPv4Address;

	__u8   Reserved[8];

} __packed;



/* See MS-SMB2 2.2.32.5.1.2 */

struct smb_sockaddr_in6 {

	__be16 Port;

	__be32 FlowInfo;

	__u8   IPv6Address[16];

	__be32 ScopeId;

} __packed;



/* this goes in the ioctl buffer when doing FSCTL_SET_ZERO_DATA */

struct file_zero_data_information {

	__le64	FileOffset;

fs/smb/server/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -7900,7 +7900,7 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn, 
			idev = __in_dev_get_rtnl(netdev);

			if (!idev)

				continue;

			sockaddr_storage->addr4.IPv4address =

			sockaddr_storage->addr4.IPv4Address =

						idev_ipv4_address(idev);

			nbytes += sizeof(struct network_interface_info_ioctl_rsp);

			ipv4_set = true;
@@ -7908,7 +7908,7 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn, 
		} else {

			struct inet6_dev *idev6;

			struct inet6_ifaddr *ifa;

			__u8 *ipv6_addr = sockaddr_storage->addr6.IPv6address;

			__u8 *ipv6_addr = sockaddr_storage->addr6.IPv6Address;



			sockaddr_storage->Family = cpu_to_le16(INTERNETWORKV6);

			sockaddr_storage->addr6.Port = 0;

fs/smb/server/smb2pdu.h

+0 −13
Original line number Diff line number Diff line
@@ -138,19 +138,6 @@ struct create_posix_rsp { 


#define SMB2_0_IOCTL_IS_FSCTL 0x00000001



struct smb_sockaddr_in {

	__be16 Port;

	__be32 IPv4address;

	__u8 Reserved[8];

} __packed;



struct smb_sockaddr_in6 {

	__be16 Port;

	__be32 FlowInfo;

	__u8 IPv6address[16];

	__be32 ScopeId;

} __packed;



#define INTERNETWORK	0x0002

#define INTERNETWORKV6	0x0017