--- a/qmsk/net/socket/addr.pyx Sun Aug 16 19:22:02 2009 +0300
+++ b/qmsk/net/socket/addr.pyx Sun Aug 16 20:18:39 2009 +0300
@@ -1,44 +1,46 @@
cimport libc
-from addr cimport *
+from qmsk.net.socket.addr cimport *
+
+cimport qmsk.net.socket.platform as platform
cdef class sockaddr :
- cdef void _init_family (self, libc.sa_family_t family=libc.AF_UNSPEC) :
+ cdef void _init_family (self, platform.sa_family_t family=platform.AF_UNSPEC) :
self.family = family
# XXX:use size_t
- cdef int _get_sockaddr (self, libc.sockaddr **sa_ptr, libc.socklen_t *sa_len) except -1 :
+ cdef int _get_sockaddr (self, platform.sockaddr **sa_ptr, platform.socklen_t *sa_len) except -1 :
"""
Get the sockaddr pointer and sockaddr length for this address
"""
raise NotImplementedError()
- cdef libc.sockaddr* _get_sockaddr_ptr (self) except NULL :
+ cdef platform.sockaddr* _get_sockaddr_ptr (self) except NULL :
"""
Get the sockaddr pointer
"""
- cdef libc.sockaddr *sa
- cdef libc.socklen_t sa_len
+ cdef platform.sockaddr *sa
+ cdef platform.socklen_t sa_len
self._get_sockaddr(&sa, &sa_len)
return sa
- cdef libc.socklen_t _get_sockaddr_len (self) except -1 :
+ cdef platform.socklen_t _get_sockaddr_len (self) except -1 :
"""
Get the sockaddr len
"""
- cdef libc.sockaddr *sa
- cdef libc.socklen_t sa_len
+ cdef platform.sockaddr *sa
+ cdef platform.socklen_t sa_len
self._get_sockaddr(&sa, &sa_len)
return sa_len
- cdef int _set_sockaddr (self, libc.sockaddr *sa, size_t sa_len) except -1 :
+ cdef int _set_sockaddr (self, platform.sockaddr *sa, size_t sa_len) except -1 :
"""
Set the sockaddr value for this address; sa_len must match!
"""
@@ -50,17 +52,17 @@
Returns a (host, serv) tuple for this address à la getnameinfo
"""
- cdef libc.sockaddr *sa
- cdef libc.socklen_t sa_len
+ cdef platform.sockaddr *sa
+ cdef platform.socklen_t sa_len
# XXX: take as args?
- cdef int flags = libc.NI_NUMERICHOST | libc.NI_NUMERICSERV
+ cdef int flags = platform.NI_NUMERICHOST | platform.NI_NUMERICSERV
# get our abstract sockaddr
self._get_sockaddr(&sa, &sa_len)
# get nice text format
- return libc.getnameinfo(sa, sa_len, flags)
+ return platform.getnameinfo(sa, sa_len, flags)
property addr :
"""
@@ -106,9 +108,9 @@
"""
# the struct sockaddr_in
- cdef libc.sockaddr_in sockaddr
+ cdef platform.sockaddr_in sockaddr
- def __init__ (self, object addr=None, libc.in_port_t port=0) :
+ def __init__ (self, object addr=None, platform.in_port_t port=0) :
"""
Construct using given literal IPv4 address and TCP/UDP port
@@ -118,33 +120,33 @@
# store our family
# XXX: this should be a class attribute...
- self._init_family(libc.AF_INET)
+ self._init_family(platform.AF_INET)
# constant af
self.sockaddr.sin_family = self.family
# set the sin_port
- self.sockaddr.sin_port = libc.htons(port)
+ self.sockaddr.sin_port = platform.htons(port)
if addr :
# set the sin_addr
# this automatically converts the addr from str -> char *
- libc.inet_pton(self.family, addr, &self.sockaddr.sin_addr)
+ platform.inet_pton(self.family, addr, &self.sockaddr.sin_addr)
else :
# set as INADDR_ANY
- self.sockaddr.sin_addr.s_addr = libc.INADDR_ANY
+ self.sockaddr.sin_addr.s_addr = platform.INADDR_ANY
- cdef int _get_sockaddr (self, libc.sockaddr **sa_ptr, libc.socklen_t *sa_len) except -1 :
+ cdef int _get_sockaddr (self, platform.sockaddr **sa_ptr, platform.socklen_t *sa_len) except -1 :
if sa_ptr :
- sa_ptr[0] = <libc.sockaddr *> &self.sockaddr
+ sa_ptr[0] = <platform.sockaddr *> &self.sockaddr
if sa_len :
sa_len[0] = sizeof(self.sockaddr)
return 0
- cdef int _set_sockaddr (self, libc.sockaddr *sa, size_t sa_len) except -1 :
+ cdef int _set_sockaddr (self, platform.sockaddr *sa, size_t sa_len) except -1 :
assert sa_len == sizeof(self.sockaddr)
libc.memcpy(&self.sockaddr, sa, sa_len)
@@ -155,7 +157,7 @@
"""
def __get__ (self) :
- return libc.ntohs(self.sockaddr.sin_port)
+ return platform.ntohs(self.sockaddr.sin_port)
def __str__ (self) :
"""
@@ -180,45 +182,45 @@
'[::]:0'
"""
- cdef libc.sockaddr_in6 sockaddr
+ cdef platform.sockaddr_in6 sockaddr
- def __init__ (self, object addr=None, libc.in_port_t port=0) :
+ def __init__ (self, object addr=None, platform.in_port_t port=0) :
"""
Construct using given literal IPv6 address and TCP/UDP port
- addr - IPv6 address, defaults to in6addr_any (::)
+ addr - IPv6 address, defaults to platform.in6addr_any (::)
port - TCP/UDP port, defaults to 0 (ephemeral)
"""
# store our family
# XXX: this should be a class attribute...
- self._init_family(libc.AF_INET6)
+ self._init_family(platform.AF_INET6)
# constant af
self.sockaddr.sin6_family = self.family
# set the sin_port
- self.sockaddr.sin6_port = libc.htons(port)
+ self.sockaddr.sin6_port = platform.htons(port)
if addr :
# set the sin_addr
# this automatically converts the addr from str -> char *
- libc.inet_pton(self.family, addr, &self.sockaddr.sin6_addr)
+ platform.inet_pton(self.family, addr, &self.sockaddr.sin6_addr)
else :
# set as INADDR_ANY
- self.sockaddr.sin6_addr = libc.in6addr_any
+ self.sockaddr.sin6_addr = platform.in6addr_any
- cdef int _get_sockaddr (self, libc.sockaddr **sa_ptr, libc.socklen_t *sa_len) except -1 :
+ cdef int _get_sockaddr (self, platform.sockaddr **sa_ptr, platform.socklen_t *sa_len) except -1 :
if sa_ptr :
- sa_ptr[0] = <libc.sockaddr *> &self.sockaddr
+ sa_ptr[0] = <platform.sockaddr *> &self.sockaddr
if sa_len :
sa_len[0] = sizeof(self.sockaddr)
return 0
- cdef int _set_sockaddr (self, libc.sockaddr *sa, size_t sa_len) except -1 :
+ cdef int _set_sockaddr (self, platform.sockaddr *sa, size_t sa_len) except -1 :
assert sa_len == sizeof(self.sockaddr)
libc.memcpy(&self.sockaddr, sa, sa_len)
@@ -229,7 +231,7 @@
"""
def __get__ (self) :
- return libc.ntohs(self.sockaddr.sin6_port)
+ return platform.ntohs(self.sockaddr.sin6_port)
def __str__ (self) :
@@ -242,12 +244,12 @@
# mapping of AF -> sockaddr, user-modifyable
SOCKADDR_BY_FAMILY = {
- libc.AF_INET: sockaddr_in,
- libc.AF_INET6: sockaddr_in6,
+ platform.AF_INET: sockaddr_in,
+ platform.AF_INET6: sockaddr_in6,
}
# build a sockaddr from the given sockaddr struct, based on sa_family
-cdef sockaddr build_sockaddr (libc.sockaddr *sa, size_t sa_len) :
+cdef sockaddr build_sockaddr (platform.sockaddr *sa, size_t sa_len) :
# lookup correct class to use
addr_type = SOCKADDR_BY_FAMILY[sa.sa_family]
@@ -261,7 +263,7 @@
cdef class addrinfo :
- cdef _init_addrinfo (self, libc.addrinfo *ai) :
+ cdef _init_addrinfo (self, platform.addrinfo *ai) :
#ai.flags = c_ai.ai_flags
self.family = ai.ai_family
self.socktype = ai.ai_socktype
@@ -272,7 +274,7 @@
def __str__ (self) :
return "family=%d, socktype=%d, protocol=%d, addr=%s, canonname=%s" % (self.family, self.socktype, self.protocol, self.addr, self.canonname)
-cdef addrinfo build_addrinfo (libc.addrinfo *c_ai) :
+cdef addrinfo build_addrinfo (platform.addrinfo *c_ai) :
cdef addrinfo ai = addrinfo()
ai._init_addrinfo(c_ai)
@@ -295,13 +297,13 @@
self.hostname = str(hostname)
self.service = str(service)
- cpdef getaddrinfo (self, int family, int socktype, int protocol = 0, int flags = libc.AI_PASSIVE) :
+ cpdef getaddrinfo (self, int family, int socktype, int protocol = 0, int flags = platform.AI_PASSIVE) :
"""
Look up our hostname/service using the given socket parameters, and return a sequence of addrinfo objects.
"""
# XXX: Cython doesn't support proper compound value literals...
- cdef libc.addrinfo hints
+ cdef platform.addrinfo hints
libc.memset(&hints, 0, sizeof(hints))
hints.ai_flags = flags
@@ -309,7 +311,7 @@
hints.ai_socktype = socktype
hints.ai_protocol = protocol
- cdef libc.addrinfo *res, *r
+ cdef platform.addrinfo *res, *r
cdef int err
cdef object ret = []
@@ -323,12 +325,12 @@
service = self.service
# operate!
- err = libc.c_getaddrinfo(hostname, service, &hints, &res)
+ err = platform.c_getaddrinfo(hostname, service, &hints, &res)
try :
if err :
# XXX: raise a GAIError
- raise Exception(libc.gai_strerror(err))
+ raise Exception(platform.gai_strerror(err))
# gather results
r = res
@@ -342,7 +344,7 @@
return ret
finally :
- libc.c_freeaddrinfo(res)
+ platform.c_freeaddrinfo(res)
def __str__ (self) :
return "hostname=%s, service=%s" % (self.hostname, self.service)