Skip to content

add enet packet free callback #18

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add enet packet free callback #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83f541
add enet packet free callback
NotAFile Dec 8, 2019
3276068
add test-case for packet-free-callback
NotAFile Dec 8, 2019
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
19 changes: 19 additions & 0 deletions enet.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import atexit
from cpython cimport bool
from libc.stdint cimport uintptr_t

cdef extern from "Python.h":
cdef void Py_INCREF(object o)
cdef void Py_DECREF(object o)

cdef extern from "enet/types.h":
ctypedef unsigned char enet_uint8
ctypedef unsigned short enet_uint16
Expand Down Expand Up @@ -30,6 +34,7 @@ cdef extern from "enet/enet.h":
ctypedef struct ENetEvent

ctypedef int (__cdecl *ENetInterceptCallback) (ENetHost *host, ENetEvent *event) except -1 # __cdecl is standard on unix and overwriten for win32
ctypedef void (__cdecl *ENetPacketFreeCallback) (ENetPacket *)

ctypedef struct ENetAddress:
enet_uint32 host
Expand All @@ -46,6 +51,8 @@ cdef extern from "enet/enet.h":
enet_uint32 flags
enet_uint8 *data
size_t dataLength
ENetPacketFreeCallback freeCallback
void* userData

ctypedef enum ENetPeerState:
ENET_PEER_STATE_DISCONNECTED = 0
Expand Down Expand Up @@ -307,6 +314,12 @@ cdef class Address:
def __set__(self, value):
self._enet_address.port = value

cdef void __cdecl _packet_free_callback(ENetPacket* packet) with gil:
cdef object func = <object>packet.userData
func()
# the packet is about to be destroyed, so decrease the refcount
Py_DECREF(func)

cdef class Packet:
"""
Packet (str dataContents, int flags)
Expand Down Expand Up @@ -359,6 +372,12 @@ cdef class Packet:
else:
return False

def set_free_callback(self, func):
self._enet_packet.freeCallback = _packet_free_callback
Py_INCREF(func)
# we're storing a reference, and need to INCREF accordingly
self._enet_packet.userData = <void*>func

property data:
def __get__(self):
if self.is_valid():
Expand Down
1 change: 1 addition & 0 deletions test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
continue
msg = bytes(bytearray([random.randint(0,255) for i in range(40)]))
packet = enet.Packet(msg)
packet.set_free_callback(lambda: print("%s: ACK %s" % (peer.address, counter)))
peer.send(0, packet)

counter += 1
Expand Down