sockets: use new iovec interface

kernel-src/include/kernel/iovec.h

@@ -47,12 +47,12 @@ int iovec_iterator_copy_from_buffer(iovec_iterator_t *iovec_iterator, void *buff
 // copies byte_count bytes from the iovec_iterator into the ringbuffer
 // returns the number of bytes copied
 // NOTE: the iovec can have userspace addresses. in this case, the copy can possibly fail by returning RINGBUFFER_USER_COPY_FAILED
-size_t iovec_iterator_copy_to_ringbuffer(iovec_iterator_t *iovec_iterator, ringbuffer_t *ringbuffer, size_t byte_count);
+size_t iovec_iterator_write_to_ringbuffer(iovec_iterator_t *iovec_iterator, ringbuffer_t *ringbuffer, size_t byte_count);
 
 // copies byte_count bytes from the ringbuffer into the iovec_iterator
 // returns the number of bytes copied
 // NOTE: the iovec can have userspace addresses. in this case, the copy can possibly fail with RINGBUFFER_USER_COPY_FAILED
-size_t iovec_iterator_copy_from_ringbuffer(iovec_iterator_t *iovec_iterator, ringbuffer_t *ringbuffer, size_t byte_count);
+size_t iovec_iterator_read_from_ringbuffer(iovec_iterator_t *iovec_iterator, ringbuffer_t *ringbuffer, size_t byte_count);
 
 // copies byte_count bytes from the ringbuffer into the iovec_iterator, without moving the ringbuffer read pointer
 // returns the number of bytes copied

kernel-src/include/kernel/net.h

@@ -78,7 +78,7 @@ void udp_process(netdev_t *netdev, void *buffer, uint32_t ip);
 void arp_process(netdev_t *netdev, void *buffer);
 void tcp_process(netdev_t *netdev, void *buffer, ipv4frame_t *ipv4frame);
 int arp_lookup(netdev_t *netdev, uint32_t ip, mac_t *mac);
-int udp_sendpacket(void *buffer, size_t packetsize, uint32_t ip, uint16_t srcport, uint16_t dstport, netdev_t *broadcastdev);
+int udp_sendpacket(iovec_iterator_t *iovec_iterator, size_t packetsize, uint32_t ip, uint16_t srcport, uint16_t dstport, netdev_t *broadcastdev);
 int ipv4_sendpacket(void *buffer, size_t packetsize, uint32_t ip, int proto, netdev_t *broadcastdev);
 size_t ipv4_getmtu(uint32_t ip);
 uint32_t ipv4_getnetdevip(uint32_t ip);

kernel-src/include/kernel/sock.h

@@ -39,7 +39,7 @@ typedef struct {
 
 typedef struct {
 	sockaddr_t *addr;
-	void *buffer;
+	iovec_iterator_t iovec_iterator;
 	size_t count;
 	uintmax_t flags;
 	size_t donecount;
@@ -79,6 +79,53 @@ typedef struct {
 #define SOCKET_TYPE_TCP 2
 #define SOCKFS_SOCKET_FROM_NODE(nodep) (((socketnode_t *)(nodep))->socket)
 
+static inline int socket_read(socket_t *socket, void *buffer, size_t size, uintmax_t flags, size_t *bytes_read) {
+	sockdesc_t desc = {
+		.addr = NULL,
+		.count = size,
+		.flags = flags,
+		.donecount = 0,
+		.ctrl = NULL,
+		.ctrllen = 0
+	};
+
+	iovec_t iovec = {
+		.addr = buffer,
+		.len = size
+	};
+
+	iovec_iterator_init(&desc.iovec_iterator, &iovec, 1);
+
+	int e = socket->ops->recv(socket, &desc);
+
+	*bytes_read = desc.donecount;
+
+	return e;
+}
+
+static inline int socket_write(socket_t *socket, void *buffer, size_t size, uintmax_t flags, size_t *bytes_written) {
+	sockdesc_t desc = {
+		.addr = NULL,
+		.count = size,
+		.flags = flags,
+		.donecount = 0,
+		.ctrl = NULL,
+		.ctrllen = 0
+	};
+
+	iovec_t iovec = {
+		.addr = buffer,
+		.len = size
+	};
+
+	iovec_iterator_init(&desc.iovec_iterator, &iovec, 1);
+
+	int e = socket->ops->send(socket, &desc);
+
+	*bytes_written = desc.donecount;
+	return e;
+}
+
 static inline int sock_convertaddress(sockaddr_t *sockaddr, abisockaddr_t *abisockaddr) {
 	switch (abisockaddr->type) {
 		case AF_INET: