| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 406ffb5 commit 967e843
3 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -160,8 +160,8 @@ def _have_socket_qipcrtr(): | |||
| 160 | 160 | ||
| 161 | 161 | def _have_socket_vsock(): | |
| 162 | 162 | """Check whether AF_VSOCK sockets are supported on this host.""" | |
| 163 | - ret = get_cid() is not None | ||
| 164 | - return ret | ||
| 163 | + cid = get_cid() | ||
| 164 | + return (cid is not None) | ||
| 165 | 165 | ||
| 166 | 166 | ||
| 167 | 167 | def _have_socket_bluetooth(): | |
@@ -520,8 +520,6 @@ def clientTearDown(self): | |||
| 520 | 520 | @unittest.skipIf(WSL, 'VSOCK does not work on Microsoft WSL') | |
| 521 | 521 | @unittest.skipUnless(HAVE_SOCKET_VSOCK, | |
| 522 | 522 | 'VSOCK sockets required for this test.') | |
| 523 | - @unittest.skipUnless(get_cid() != 2, | ||
| 524 | - "This test can only be run on a virtual guest.") | ||
| 525 | 523 | class ThreadedVSOCKSocketStreamTest(unittest.TestCase, ThreadableTest): | |
| 526 | 524 | ||
| 527 | 525 | def __init__(self, methodName='runTest'): | |
@@ -543,6 +541,9 @@ def clientSetUp(self): | |||
| 543 | 541 | self.cli = socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) | |
| 544 | 542 | self.addCleanup(self.cli.close) | |
| 545 | 543 | cid = get_cid() | |
| 544 | + if cid in (socket.VMADDR_CID_HOST, socket.VMADDR_CID_ANY): | ||
| 545 | + # gh-119461: Use the local communication address (loopback) | ||
| 546 | + cid = socket.VMADDR_CID_LOCAL | ||
| 546 | 547 | self.cli.connect((cid, VSOCKPORT)) | |
| 547 | 548 | ||
| 548 | 549 | def testStream(self): | |
@@ -2515,6 +2516,7 @@ def testVSOCKConstants(self): | |||
| 2515 | 2516 | socket.SO_VM_SOCKETS_BUFFER_MAX_SIZE | |
| 2516 | 2517 | socket.VMADDR_CID_ANY | |
| 2517 | 2518 | socket.VMADDR_PORT_ANY | |
| 2519 | + socket.VMADDR_CID_LOCAL | ||
| 2518 | 2520 | socket.VMADDR_CID_HOST | |
| 2519 | 2521 | socket.VM_SOCKETS_INVALID_VERSION | |
| 2520 | 2522 | socket.IOCTL_VM_SOCKETS_GET_LOCAL_CID | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + Add ``socket.VMADDR_CID_LOCAL`` constant. Patch by Victor Stinner. | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7596,6 +7596,7 @@ socket_exec(PyObject *m) | |||
| 7596 | 7596 | ADD_INT_CONST(m, "SO_VM_SOCKETS_BUFFER_MAX_SIZE", 2); | |
| 7597 | 7597 | ADD_INT_CONST(m, "VMADDR_CID_ANY", 0xffffffff); | |
| 7598 | 7598 | ADD_INT_CONST(m, "VMADDR_PORT_ANY", 0xffffffff); | |
| 7599 | + ADD_INT_CONST(m, "VMADDR_CID_LOCAL", 1); | ||
| 7599 | 7600 | ADD_INT_CONST(m, "VMADDR_CID_HOST", 2); | |
| 7600 | 7601 | ADD_INT_CONST(m, "VM_SOCKETS_INVALID_VERSION", 0xffffffff); | |
| 7601 | 7602 | ADD_INT_CONST(m, "IOCTL_VM_SOCKETS_GET_LOCAL_CID", _IO(7, 0xb9)); | |
| Back | FazBrowse Home | New Git URL |
0 commit comments