瀏覽代碼

[ipv6] Rename sin_{family,port} to sin6_{family,port} in struct sockaddr_in6

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 10 年之前
父節點
當前提交
0350682865
共有 3 個檔案被更改,包括 5 行新增5 行删除
  1. 2
    2
      src/include/ipxe/in.h
  2. 1
    1
      src/net/icmpv6.c
  3. 2
    2
      src/net/ipv6.c

+ 2
- 2
src/include/ipxe/in.h 查看文件

@@ -82,9 +82,9 @@ struct sockaddr_in6 {
82 82
 	 *
83 83
 	 * Always set to @c AF_INET6 for IPv6 addresses
84 84
 	 */
85
-	sa_family_t sin_family;
85
+	sa_family_t sin6_family;
86 86
 	/** TCP/IP port (part of struct @c sockaddr_tcpip) */
87
-	uint16_t 	sin_port;
87
+	uint16_t sin6_port;
88 88
         uint32_t        sin6_flowinfo;  /* Flow number */
89 89
         struct in6_addr sin6_addr;      /* 128-bit destination address */
90 90
         uint32_t        sin6_scope_id;  /* Scope ID */

+ 1
- 1
src/net/icmpv6.c 查看文件

@@ -47,7 +47,7 @@ int icmp6_send_solicit ( struct net_device *netdev, struct in6_addr *src __unuse
47 47
 	nsolicit->csum = tcpip_chksum ( nsolicit, sizeof ( *nsolicit ) );
48 48
 
49 49
 	/* Solicited multicast address */
50
-	st_dest.sin6.sin_family = AF_INET6;
50
+	st_dest.sin6.sin6_family = AF_INET6;
51 51
 	st_dest.sin6.sin6_addr.in6_u.u6_addr8[0] = 0xff;
52 52
 	st_dest.sin6.sin6_addr.in6_u.u6_addr8[2] = 0x02;
53 53
 	st_dest.sin6.sin6_addr.in6_u.u6_addr16[1] = 0x0000;

+ 2
- 2
src/net/ipv6.c 查看文件

@@ -332,10 +332,10 @@ static int ipv6_rx ( struct io_buffer *iobuf,
332 332
 
333 333
 	/* Construct socket address */
334 334
 	memset ( &src, 0, sizeof ( src ) );
335
-	src.sin6.sin_family = AF_INET6;
335
+	src.sin6.sin6_family = AF_INET6;
336 336
 	src.sin6.sin6_addr = ip6hdr->src;
337 337
 	memset ( &dest, 0, sizeof ( dest ) );
338
-	dest.sin6.sin_family = AF_INET6;
338
+	dest.sin6.sin6_family = AF_INET6;
339 339
 	dest.sin6.sin6_addr = ip6hdr->dest;
340 340
 
341 341
 	/* Strip header */

Loading…
取消
儲存