8000 bpo-46805: Add low level UDP socket functions to asyncio by agronholm · Pull Request #31455 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-46805: Add low level UDP socket functions to asyncio #31455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 13, 2022
Merged

bpo-46805: Add low level UDP socket functions to asyncio #31455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5f1cadb
Added three new raw socket methods to asyncio
agronholm Feb 20, 2022
ef60dcf
Added news blurb
agronholm Feb 20, 2022
928742c
Fixed variable/constant references
agronholm Feb 20, 2022
ebd2353
Fixed recvfrom_into()
agronholm Feb 27, 2022
586dc65
Merge branch 'main' into fix-issue-46805
agronholm Feb 27, 2022
af18ee1
Fixed NameError
agronholm Feb 27, 2022
113b93f
Merge remote-tracking branch 'fork/fix-issue-46805' into fix-issue-46805
agronholm Feb 27, 2022
2395598
Cleanup additions/fixes
agronholm Feb 27, 2022
7b3c12b
Fixed wrong return value on BrokenPipeError
agronholm Mar 11, 2022
0cb4622
Merge branch 'main' into fix-issue-46805
agronholm Mar 11, 2022
16177df
Added item to the "improved modules" section
agronholm Mar 11, 2022
059f645
Fixed the return type description for sock_recvfrom_into()
agronholm Mar 12, 2022
7908ea6
Fixed code style
agronholm Mar 12, 2022
f907a77
Switched to automated parsing of Py_buffer
agronholm Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Switched to automated parsing of Py_buffer
  • Loading branch information
@agronholm
agronholm committed Mar 12, 2022
commit f907a77dd9847c468a744ba08d489ba1b8137f54
15 changes: 10 additions & 5 deletions Modules/clinic/overlapped.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 9 additions & 15 deletions Modules/overlapped.c
View file < 8000 button type="button" disabled role="menuitem" class="pl-5 dropdown-item btn-link" aria-label="You must be signed in and have push access to make changes."> Edit file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ typedef struct {
// A (number of bytes read, (host, port)) tuple
PyObject* result;
/* Buffer passed by the user */
Py_buffer user_buffer;
Py_buffer *user_buffer;
struct sockaddr_in6 address;
int address_length;
} read_from_into;
Expand Down Expand Up @@ -678,9 +678,6 @@ Overlapped_clear(OverlappedObject *self)
// We've received a message, free the result tuple.
Py_CLEAR(self->read_from_into.result);
}
if (self->read_from_into.user_buffer.obj) {
PyBuffer_Release(&self->read_from_into.user_buffer);
}
break;
}
case TYPE_WRITE:
Expand Down Expand Up @@ -1671,8 +1668,8 @@ Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
break;
case TYPE_READ_FROM_INTO:
Py_VISIT(self->read_from_into.result);
if (self->read_from_into.user_buffer.obj) {
Py_VISIT(&self->read_from_into.user_buffer.obj);
if (self->read_from_into.user_buffer->obj) {
Py_VISIT(&self->read_from_into.user_buffer->obj);
}
break;
}
Expand Down Expand Up @@ -1879,7 +1876,7 @@ _overlapped_Overlapped_WSARecvFrom_impl(OverlappedObject *self,
_overlapped.Overlapped.WSARecvFromInto

handle: HANDLE
buf as bufobj: object
buf as bufobj: Py_buffer
size: DWORD
flags: DWORD = 0
/
Expand All @@ -1889,9 +1886,9 @@ Start overlapped receive.

static PyObject *
_overlapped_Overlapped_WSARecvFromInto_impl(OverlappedObject *self,
HANDLE handle, PyObject *bufobj,
HANDLE handle, Py_buffer *bufobj,
DWORD size, DWORD flags)
/*[clinic end generated code: output=45fc5d883a11c4e5 input=8eacd80d50157434]*/
/*[clinic end generated code: output=30c7ea171a691757 input=4be4b08d03531e76]*/
{
DWORD nread;
WSABUF wsabuf;
Expand All @@ -1903,22 +1900,19 @@ _overlapped_Overlapped_WSARecvFromInto_impl(OverlappedObject *self,
return NULL;
}

if (!PyArg_Parse(bufobj, "y*", &self->read_from_into.user_buffer))
return NULL;

#if SIZEOF_SIZE_T > SIZEOF_LONG
if (self->read_from_into.user_buffer.len > (Py_ssize_t)ULONG_MAX) {
PyBuffer_Release(&self->read_from_into.user_buffer);
if (bufobj->len > (Py_ssize_t)ULONG_MAX) {
PyErr_SetString(PyExc_ValueError, "buffer too large");
return NULL;
}
#endif

wsabuf.buf = self->read_from_into.user_buffer.buf;
wsabuf.buf = bufobj->buf;
wsabuf.len = size;

self->type = TYPE_READ_FROM_INTO;
self->handle = handle;
self->read_from_into.user_buffer = bufobj;
memset(&self->read_from_into.address, 0, sizeof(self->read_from_into.address));
self->read_from_into.address_length = sizeof(self->read_from_into.address);

Expand Down
0