gh-92658: AF_HYPERV is only supported on Windows (#93192)

vstinner · web-flow · commit 08e4e887f2d4 · 2022-05-25T04:44:57.000+02:00
Only build the AF_HYPERV support on Windows for the _socket extension.
FreeBSD defines the AF_HYPERV macro but doesn't have the SOCKADDR_HV
type.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -1582,7 +1582,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
     }
 #endif /* HAVE_SOCKADDR_ALG */
 
-#ifdef AF_HYPERV
+#ifdef HAVE_AF_HYPERV
     case AF_HYPERV:
     {
         SOCKADDR_HV *a = (SOCKADDR_HV *) addr;
@@ -2407,7 +2407,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
         return 1;
     }
 #endif /* HAVE_SOCKADDR_ALG */
-#ifdef AF_HYPERV
+#ifdef HAVE_AF_HYPERV
     case AF_HYPERV:
     {
         switch (s->sock_proto) {
@@ -2476,7 +2476,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
             return 0;
         }
     }
-#endif /* AF_HYPERV */
+#endif /* HAVE_AF_HYPERV */
 
     /* More cases here... */
 
@@ -2626,13 +2626,13 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
         return 1;
     }
 #endif /* HAVE_SOCKADDR_ALG */
-#ifdef AF_HYPERV
+#ifdef HAVE_AF_HYPERV
     case AF_HYPERV:
     {
         *len_ret = sizeof (SOCKADDR_HV);
         return 1;
     }
-#endif /* AF_HYPERV */
+#endif /* HAVE_AF_HYPERV */
 
     /* More cases here... */
 
@@ -7460,7 +7460,7 @@ PyInit__socket(void)
     /* Linux LLC */
     PyModule_AddIntMacro(m, AF_LLC);
 #endif
-#ifdef AF_HYPERV
+#ifdef HAVE_AF_HYPERV
     /* Hyper-V sockets */
     PyModule_AddIntMacro(m, AF_HYPERV);
 
@@ -7481,7 +7481,7 @@ PyInit__socket(void)
     PyModule_AddStringConstant(m, "HV_GUID_CHILDREN", "90DB8B89-0D35-4F79-8CE9-49EA0AC8B7CD");
     PyModule_AddStringConstant(m, "HV_GUID_LOOPBACK", "E0E16197-DD56-4A10-9195-5EE7A155A838");
     PyModule_AddStringConstant(m, "HV_GUID_PARENT", "A42E7CDA-D03F-480C-9CC2-A4DE20ABB878");
-#endif /* AF_HYPERV */
+#endif /* HAVE_AF_HYPERV */
 
 #ifdef USE_BLUETOOTH
     PyModule_AddIntMacro(m, AF_BLUETOOTH);
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
@@ -249,6 +249,11 @@ typedef int SOCKET_T;
 #define PyLong_AsSocket_t(fd) (SOCKET_T)PyLong_AsLongLong(fd)
 #endif
 
+// AF_HYPERV is only supported on Windows
+#if defined(AF_HYPERV) && defined(MS_WINDOWS)
+#  define HAVE_AF_HYPERV
+#endif
+
 /* Socket address */
 typedef union sock_addr {
     struct sockaddr_in in;
@@ -297,7 +302,7 @@ typedef union sock_addr {
 #ifdef HAVE_LINUX_TIPC_H
     struct sockaddr_tipc tipc;
 #endif
-#ifdef AF_HYPERV
+#ifdef HAVE_AF_HYPERV
     SOCKADDR_HV hv;
 #endif
 } sock_addr_t;

Original file line number	Diff line number	Diff line change
`@@ -1582,7 +1582,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)`
`1582`	`1582`	`}`
`1583`	`1583`	`#endif /* HAVE_SOCKADDR_ALG */`
`1584`	`1584`
`1585`		`-#ifdef AF_HYPERV`
	`1585`	`+#ifdef HAVE_AF_HYPERV`
`1586`	`1586`	`case AF_HYPERV:`
`1587`	`1587`	`{`
`1588`	`1588`	`SOCKADDR_HV a = (SOCKADDR_HV ) addr;`
`@@ -2407,7 +2407,7 @@ getsockaddrarg(PySocketSockObject s, PyObject args,`
`2407`	`2407`	`return 1;`
`2408`	`2408`	`}`
`2409`	`2409`	`#endif /* HAVE_SOCKADDR_ALG */`
`2410`		`-#ifdef AF_HYPERV`
	`2410`	`+#ifdef HAVE_AF_HYPERV`
`2411`	`2411`	`case AF_HYPERV:`
`2412`	`2412`	`{`
`2413`	`2413`	`switch (s->sock_proto) {`
`@@ -2476,7 +2476,7 @@ getsockaddrarg(PySocketSockObject s, PyObject args,`
`2476`	`2476`	`return 0;`
`2477`	`2477`	`}`
`2478`	`2478`	`}`
`2479`		`-#endif /* AF_HYPERV */`
	`2479`	`+#endif /* HAVE_AF_HYPERV */`
`2480`	`2480`
`2481`	`2481`	`/* More cases here... */`
`2482`	`2482`
`@@ -2626,13 +2626,13 @@ getsockaddrlen(PySocketSockObject s, socklen_t len_ret)`
`2626`	`2626`	`return 1;`
`2627`	`2627`	`}`
`2628`	`2628`	`#endif /* HAVE_SOCKADDR_ALG */`
`2629`		`-#ifdef AF_HYPERV`
	`2629`	`+#ifdef HAVE_AF_HYPERV`
`2630`	`2630`	`case AF_HYPERV:`
`2631`	`2631`	`{`
`2632`	`2632`	`*len_ret = sizeof (SOCKADDR_HV);`
`2633`	`2633`	`return 1;`
`2634`	`2634`	`}`
`2635`		`-#endif /* AF_HYPERV */`
	`2635`	`+#endif /* HAVE_AF_HYPERV */`
`2636`	`2636`
`2637`	`2637`	`/* More cases here... */`
`2638`	`2638`
`@@ -7460,7 +7460,7 @@ PyInit__socket(void)`
`7460`	`7460`	`/* Linux LLC */`
`7461`	`7461`	`PyModule_AddIntMacro(m, AF_LLC);`
`7462`	`7462`	`#endif`
`7463`		`-#ifdef AF_HYPERV`
	`7463`	`+#ifdef HAVE_AF_HYPERV`
`7464`	`7464`	`/* Hyper-V sockets */`
`7465`	`7465`	`PyModule_AddIntMacro(m, AF_HYPERV);`
`7466`	`7466`
`@@ -7481,7 +7481,7 @@ PyInit__socket(void)`
`7481`	`7481`	`PyModule_AddStringConstant(m, "HV_GUID_CHILDREN", "90DB8B89-0D35-4F79-8CE9-49EA0AC8B7CD");`
`7482`	`7482`	`PyModule_AddStringConstant(m, "HV_GUID_LOOPBACK", "E0E16197-DD56-4A10-9195-5EE7A155A838");`
`7483`	`7483`	`PyModule_AddStringConstant(m, "HV_GUID_PARENT", "A42E7CDA-D03F-480C-9CC2-A4DE20ABB878");`
`7484`		`-#endif /* AF_HYPERV */`
	`7484`	`+#endif /* HAVE_AF_HYPERV */`
`7485`	`7485`
`7486`	`7486`	`#ifdef USE_BLUETOOTH`
`7487`	`7487`	`PyModule_AddIntMacro(m, AF_BLUETOOTH);`