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

equal deleted inserted replaced

-:a1091632a8a7
+:c44754cc1ffe
 cdef parse_buf (void **buf_ptr, size_t *buf_len, object buf, int optional = 0) :
 cdef libc.ssize_t tmp_len
 if buf is not None :
 # XXX: test that except works right
+# XXX: this complains about const...
 py.PyObject_AsCharBuffer(buf, <char **> buf_ptr, &tmp_len)
 # XXX: ensure that this is >= 0
 buf_len[0] = tmp_len
 # trap
 if self.fd < 0 :
 raise_errno('socket')
+def fileno (self) :
+"""
+Returns the OS-level file desriptor for this socket as an integer
+"""
+return self.fd
 def bind (self, sockaddr addr) :
 """
 Bind this socket to the given local socket address. The given sockaddr should be of the same or a
 compatible address family.
 """
 Accept a connection, dequeueing the first pending connection and returning a new sock object for it. This
 socket must be a connection-based socket (SOCK_STREAM/SOCK_SEQPACKET) and in the passive listening mode
 (.listen()).
-This returns a (sock, sockaddr) tuple:
+This returns a (sock, src_addr) tuple:
 sock        - the newly created sock, corresponding to the incoming connection
-sockaddr    - the remote address of the incoming connection
+src_addr    - the remote address of the incoming connection
 """
 # prep the sockaddr that we will return
 cdef platform.sockaddr_storage ss
 cdef platform.socklen_t ss_len = sizeof(ss)
-cdef socket_t sock_fd
 # accept()
-sock_fd = platform.accept(self.fd, <platform.sockaddr *> &ss, &ss_len)
+cdef socket_t sock_fd = platform.accept(self.fd, <platform.sockaddr *> &ss, &ss_len)
 if sock_fd < 0 :
 raise_errno('accept')
 try :
 platform.close(sock_fd)
 raise
 # prep the new addr
-sock_addr = build_sockaddr(<platform.sockaddr *> &ss, ss_len)
+cdef sockaddr src_addr = build_sockaddr(<platform.sockaddr *> &ss, ss_len)
-return sock_obj, sock_addr
+return sock_obj, src_addr
 def send (self, object buf, int flags = 0) :
 """
 Transmit a message to the connected remote endpoint.
 if ret < 0 :
 raise_errno('writev')
 else :
 return ret
+def recv (self, size_t len, int flags = 0) :
+"""
+Recieve a message, reading and returning at most `len` bytes.
+len         - size of buffer to use for recv
+flags       - (optional) MSG_* flags to use for recv()
+Returns the recieved data as a newly allocated string of the correct length.
+"""
+# alloc a new return str
+# XXX: len overflow...
+cdef object str = py.PyString_FromStringAndSize(NULL, len)
+cdef char *buf = py.PyString_AS_STRING(str)
+# recv()
+cdef libc.ssize_t ret = platform.recv(self.fd, buf, len, flags)
+if ret < 0 :
+raise_errno('recv')
+# XXX: figure out how to call _PyString_Resize
+return str[:ret]
+def recvfrom (self, size_t len, int flags = 0) :
+"""
+Recieve a message, reading at most `len` bytes, also returning the source address.
+len         - size of buffer to use for recv
+flags       - (optional) MSG_* flags to use for recvfrom()
+Returns the recieved data and the source address as a (buf, src_addr) tuple :
+buf         - a newly allocated string containing the recieved data, of the correct length
+src_addr    - the source address the message was recieved from
+"""
+# alloc a new return str
+# XXX: len overflow...
+cdef object str = py.PyString_FromStringAndSize(NULL, len)
+cdef char *buf = py.PyString_AS_STRING(str)
+# prep the sockaddr that we will return
+cdef platform.sockaddr_storage ss
+cdef platform.socklen_t ss_len = sizeof(ss)
+# recvfrom()
+cdef libc.ssize_t ret = platform.recvfrom(self.fd, buf, len, flags, <platform.sockaddr *> &ss, &ss_len)
+if ret < 0 :
+raise_errno('recv')
+# prep the new addr
+cdef sock_addr = build_sockaddr(<platform.sockaddr *> &ss, ss_len)
+# XXX: figure out how to call _PyString_Resize
+return str[:ret], sock_addr
+def recvmsg (self, bint recv_addr = True, object iov_lens = None, size_t control_len = 0, int flags = 0) :
+"""
+Recieve a message along with some extra data.
+recv_addr   - ask for and return a sockaddr for the source address of the message?
+lenv        - (optional) sequence of buffer sizes to use for the message data iov
+control_len - (optional) amount of auxiliary data to recieve
+flags       - (optional) flags to pass to recvmsg()
+Returns a (name, iov, control, flags) tuple :
+name        - the source address of the message, or None
+iov         - sequence of strings containing the recieved data, each at most lenv[x] bytes long
+control     - string containing recieved control message, if any
+flags       - recieved flags
+"""
+cdef platform.msghdr msg
+libc.memset(&msg, 0, sizeof(msg))
+# prep the sockaddr that we will return
+cdef platform.sockaddr_storage ss
+# ask for a name?
+if recv_addr :
+msg.msg_name = <void *> &ss
+msg.msg_namelen = sizeof(ss)
+# build iov?
+if iov_lens :
+# XXX: implement
+pass
+# build control buffer?
+if control_len :
+# XXX: implement
+pass
+# recvmsg()
+cdef libc.ssize_t ret = platform.recvmsg(self.fd, &msg, flags)
+if ret < 0 :
+raise_errno('recvmsg')
+# name?
+cdef sockaddr name = None
+if msg.msg_name and msg.msg_namelen :
+name = build_sockaddr(<platform.sockaddr *> msg.msg_name, msg.msg_namelen)
+# iov?
+cdef object iov = None
+if ret :
+assert msg.msg_iov and msg.msg_iovlen
+# XXX: implement
+pass
+# control?
+cdef object control = None
+if msg.msg_control and msg.msg_controllen :
+# XXX: implement
+pass
+return name, iov, control, msg.msg_flags
 def shutdown (self, how) :
 """
 Shutdown part of a full-duplex connection.

changeset 14	c44754cc1ffe
parent 13	a1091632a8a7
child 15	8e7037cc05c7