Skip to content

python/dnet.pyx: fix incompatible-function-pointer-types for modern compiler #104

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
ofalk merged 2 commits into from
Apr 3, 2025
Merged

python/dnet.pyx: fix incompatible-function-pointer-types for modern compiler #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de57a23
python/dnet.pyx: fix incompatible-function-pointer-types for modern c…
clan Feb 19, 2025
0a74240
python/dnet.pyx: fix -Wincompatible-pointer-types reported by gcc14
clan Apr 3, 2025
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
30 changes: 15 additions & 15 deletions python/dnet.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cdef extern from "dnet.h":
cdef extern from "Python.h":
object PyBytes_FromStringAndSize(char *s, int len)
int PyBytes_Size(object o)
int PyObject_AsReadBuffer(object o, char **pp, int *lenp)
int PyObject_AsReadBuffer(object o, const void **pp, ssize_t *lenp)
int PyLong_Check(object o)
int PyLong_Check(object o)
long PyLong_AsLong(object o)
Expand Down Expand Up @@ -294,8 +294,8 @@ def ip_checksum(pkt):
"""
cdef char buf[2048]
cdef char *p
cdef int n
if PyObject_AsReadBuffer(pkt, &p, &n) == 0:
cdef ssize_t n
if PyObject_AsReadBuffer(pkt, <const void **>&p, &n) == 0:
if n < 2048:
memcpy(buf, p, n)
__ip_checksum(buf, n)
Expand All @@ -310,8 +310,8 @@ def ip_checksum(pkt):

def ip_cksum_add(buf, int sum):
cdef char *p
cdef int n
if PyObject_AsReadBuffer(buf, &p, &n) == 0:
cdef ssize_t n
if PyObject_AsReadBuffer(buf, <const void **>&p, &n) == 0:
return __ip_cksum_add(p, n, sum)
else:
raise TypeError
Expand Down Expand Up @@ -661,7 +661,7 @@ cdef extern from *:
addr_t arp_ha
ctypedef struct arp_t:
int __xxx
ctypedef int (*arp_handler)(arp_entry *entry, void *arg) except -1
ctypedef int (*arp_handler)(const arp_entry *entry, void *arg) except -1

arp_t *arp_open()
int arp_add(arp_t *arp, arp_entry *entry)
Expand All @@ -687,7 +687,7 @@ ARP_OP_REPLY = 2 # /* response giving hardware address */
ARP_OP_REVREQUEST = 3 # /* request to resolve pa given ha */
ARP_OP_REVREPLY = 4 # /* response giving protocol address */

cdef int __arp_callback(arp_entry *entry, void *arg) except -1:
cdef int __arp_callback(const arp_entry *entry, void *arg) except -1:
f, a = <object>arg
pa, ha = addr(), addr()
(<addr>pa)._addr = entry.arp_pa
Expand Down Expand Up @@ -911,7 +911,7 @@ cdef extern from *:
addr_t intf_alias_addrs[8] # XXX
ctypedef struct intf_t:
int __xxx
ctypedef int (*intf_handler)(intf_entry *entry, void *arg) except -1
ctypedef int (*intf_handler)(const intf_entry *entry, void *arg) except -1

intf_t *intf_open()
int intf_get(intf_t *intf, intf_entry *entry)
Expand All @@ -933,7 +933,7 @@ INTF_FLAG_NOARP = 0x08 # /* disable ARP */
INTF_FLAG_BROADCAST = 0x10 # /* supports broadcast (r/o) */
INTF_FLAG_MULTICAST = 0x20 # /* supports multicast (r/o) */

cdef object ifent_to_dict(intf_entry *entry):
cdef object ifent_to_dict(const intf_entry *entry):
d = {}
d['name'] = entry.intf_name
d['type'] = entry.intf_type
Expand Down Expand Up @@ -970,7 +970,7 @@ cdef dict_to_ifent(object d, intf_entry *entry):
for i from 0 <= i < entry.intf_alias_num:
entry.intf_alias_addrs[i] = (<addr>d['alias_addrs'][i])._addr

cdef int __intf_callback(intf_entry *entry, void *arg) except -1:
cdef int __intf_callback(const intf_entry *entry, void *arg) except -1:
f, a = <object>arg
ret = f(ifent_to_dict(entry), a)
if not ret:
Expand Down Expand Up @@ -1077,7 +1077,7 @@ cdef extern from *:
addr_t route_gw
ctypedef struct route_t:
int __xxx
ctypedef int (*route_handler)(route_entry *entry, void *arg) except -1
ctypedef int (*route_handler)(const route_entry *entry, void *arg) except -1

route_t *route_open()
int route_add(route_t *route, route_entry *entry)
Expand All @@ -1086,7 +1086,7 @@ cdef extern from *:
int route_loop(route_t *route, route_handler callback, void *arg)
route_t *route_close(route_t *route)

cdef int __route_callback(route_entry *entry, void *arg) except -1:
cdef int __route_callback(const route_entry *entry, void *arg) except -1:
f, a = <object>arg
dst, gw = addr(), addr()
(<addr>dst)._addr = entry.route_dst
Expand Down Expand Up @@ -1183,7 +1183,7 @@ cdef extern from *:

ctypedef struct fw_t:
int __xxx
ctypedef int (*fw_handler)(fw_rule *rule, void *arg) except -1
ctypedef int (*fw_handler)(const fw_rule *rule, void *arg) except -1

fw_t *fw_open()
int fw_add(fw_t *f, fw_rule *rule)
Expand All @@ -1197,7 +1197,7 @@ FW_OP_BLOCK = 2
FW_DIR_IN = 1
FW_DIR_OUT = 2

cdef object rule_to_dict(fw_rule *rule):
cdef object rule_to_dict(const fw_rule *rule):
d = {}
d['device'] = rule.fw_device
d['op'] = rule.fw_op
Expand Down Expand Up @@ -1235,7 +1235,7 @@ cdef dict_to_rule(object d, fw_rule *rule):
rule.fw_dport[0] = d['dport'][0]
rule.fw_dport[1] = d['dport'][1]

cdef int __fw_callback(fw_rule *rule, void *arg) except -1:
cdef int __fw_callback(const fw_rule *rule, void *arg) except -1:
f, a = <object>arg
ret = f(rule_to_dict(rule), a)
if not ret:
Expand Down