qmsk.net: comparison qmsk/net/socket/address.pyx

equal deleted inserted replaced

-:19d212c948e0
+:f6e8d5e37998
 cimport qmsk.net.libc as libc
+cimport qmsk.net.py as py
 from qmsk.net.socket.address cimport *
 cimport qmsk.net.socket.platform as platform
 '127.0.0.1'
 >>> sa.port
 80
 >>> str(sa)
 '127.0.0.1:80'
->>> str(sockaddr_in())
-'0.0.0.0:0'
+>>> sockaddr_in('2001::5')
+Traceback (most recent call last):
+...
+NameError: Invalid network address for specified address family: '2001::5'
 """
 # the struct sockaddr_in
 cdef platform.sockaddr_in sockaddr
 Construct using given literal IPv4 address and TCP/UDP port
 addr        - IPv4 address, defaults to INADDR_ANY (0.0.0.0)
 port        - TCP/UDP port, defaults to 0 (ephemeral)
 """
+# zero
+libc.memset(&self.sockaddr, 0, sizeof(self.sockaddr))
 # store our family
 # XXX: this should be a class attribute...
 self._init_family(platform.AF_INET)
 """
 def __get__ (self) :
 return platform.ntohs(self.sockaddr.sin_port)
+def __cmp__ (self, other_obj) :
+"""
+A sockaddr_in is equal to any other sockaddr_in which has the same addr and port
+>>> assert sockaddr_in() == sockaddr_in()
+>>> assert sockaddr_in('127.0.0.1', 80) == sockaddr_in('127.0.0.1', 80)
+>>> addr = sockaddr_in(); assert addr == addr
+"""
+if not isinstance(other_obj, sockaddr_in) :
+return <object> py.Py_NotImplemented
+cdef sockaddr_in other = other_obj
+cdef platform.sockaddr_in *sa1 = &self.sockaddr, *sa2 = &other.sockaddr
+if other is self :
+return 0
+return (
+libc.memcmp(<void *> &sa1.sin_port, <void *> &sa2.sin_port, sizeof(sa1.sin_port))
+or  libc.memcmp(<void *> &sa1.sin_addr, <void *> &sa2.sin_addr, sizeof(sa1.sin_addr))
+)
 def __str__ (self) :
 """
 Return the literal ASCII representation for this sockaddr as an '<addr>:<port> string
+>>> str(sockaddr_in())
+'0.0.0.0:0'
 """
 # format
 return "%s:%s" % self.getnameinfo()
 '::1'
 >>> sa6.port
 80
 >>> str(sa6)
 '[::1]:80'
->>> str(sockaddr_in6())
-'[::]:0'
 """
 cdef platform.sockaddr_in6 sockaddr
-def __init__ (self, object addr=None, platform.in_port_t port=0) :
+def __init__ (self, object addr=None, platform.in_port_t port=0, unsigned int scope_id = 0) :
 """
 Construct using given literal IPv6 address and TCP/UDP port
 addr        - IPv6 address, defaults to platform.in6addr_any (::)
 port        - TCP/UDP port, defaults to 0 (ephemeral)
-"""
+scope_id    - (optional) scope ID representing interface index for link-local addresses
+"""
+# zero
+libc.memset(&self.sockaddr, 0, sizeof(self.sockaddr))
 # store our family
 # XXX: this should be a class attribute...
 self._init_family(platform.AF_INET6)
 else :
 # set as INADDR_ANY
 self.sockaddr.sin6_addr = platform.in6addr_any
+# scope ID
+self.sockaddr.sin6_scope_id = scope_id
 cdef int _get_sockaddr (self, platform.sockaddr **sa_ptr, platform.socklen_t *sa_len) except -1 :
 if sa_ptr :
 sa_ptr[0] = <platform.sockaddr *> &self.sockaddr
 if sa_len :
 libc.memcpy(&self.sockaddr, sa, sa_len)
 property port :
 """
-The integer port number
+The integer port number.
+This will represent it correctly in host byte order.
 """
 def __get__ (self) :
 return platform.ntohs(self.sockaddr.sin6_port)
+property flowinfo :
+"""
+The integer flowinfo
+XXX: byteorder?
+"""
+def __get__ (self) :
+return self.sockaddr.sin6_flowinfo
+property scope_id :
+"""
+The scope ID - corresponds to an interface index for link-scope addresses.
+This should be in host byte order...
+"""
+def __get__ (self) :
+return self.sockaddr.sin6_scope_id
+def __cmp__ (self, other_obj) :
+"""
+A sockaddr_in6 is equal to any other sockaddr_in6 which has the same addr, port and scope ID.
+XXX: flowinfo?
+XXX: A sockaddr_in6 is also equal to a sockaddr_in if the sockaddr_in6 represents the given v4-mapped address.
+>>> assert sockaddr_in6() == sockaddr_in6()
+>>> assert sockaddr_in6('0:0:0::1', 80) == sockaddr_in6('::1', 80)
+>>> assert sockaddr_in6('::127.0.0.1') == sockaddr_in('127.0.0.1')
+"""
+if not isinstance(other_obj, sockaddr_in6) :
+return <object> py.Py_NotImplemented
+cdef sockaddr_in6 other = other_obj
+cdef platform.sockaddr_in6 *sa1 = &self.sockaddr, *sa2 = &other.sockaddr
+if other is self :
+return 0
+return (
+libc.memcmp(<void *> &sa1.sin6_port,        <void *> &sa2.sin6_port,        sizeof(sa1.sin6_port))
+or  libc.memcmp(<void *> &sa1.sin6_addr,        <void *> &sa2.sin6_addr,        sizeof(sa1.sin6_addr))
+or  libc.memcmp(<void *> &sa1.sin6_scope_id,    <void *> &sa2.sin6_scope_id,    sizeof(sa1.sin6_scope_id))
+)
 def __str__ (self) :
 """
 Return the literal ASCII representation for this sockaddr as a '[<addr>]:<port> string
-"""
+>>> str(sockaddr_in6())
-# format
+'[::]:0'
-return "[%s]:%s" % self.getnameinfo()
+>>> str(sockaddr_in6('2001:0::05:1'))
+'[2001::5:1]'
+>>> str(sockaddr_in6('fe80::abcd', scope_id=5))
+'[fe80::abcd%5]'
+"""
+addr, port = self.getnameinfo()
+scope_id = self.scope_id
+# format with scope_id
+return "[%s%s]:%s" % (
+addr,
+"%%%d" % scope_id if scope_id else "",
+port
+)
 # mapping of AF -> sockaddr, user-modifyable
 SOCKADDR_BY_FAMILY = {
 platform.AF_INET:   sockaddr_in,
 platform.AF_INET6:  sockaddr_in6,

changeset 22	f6e8d5e37998
parent 20	0e4933d5862e
child 23	15d8bb96b8d4