Changeset 048cd69 in mainline for uspace/lib/nettl

Timestamp:

2015-06-07T15:41:04Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

204ba47

Parents:

4d11204 (diff), c3f7d37 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge network transport layer API rewrite.

Location:

uspace/lib/nettl

Files:

• Makefile (moved) (moved from uspace/lib/net/Makefile ) (2 diffs)
• include/nettl/amap.h (added)
• include/nettl/portrng.h (moved) (moved from uspace/app/nettest1/nettest.h ) (3 diffs)
• src/amap.c (added)
• src/portrng.c (added)

uspace/lib/nettl/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2015 Jiri Svoboda
 # All rights reserved.
 #
@@ -30 +29 @@
 USPACE_PREFIX = ../..
 EXTRA_CFLAGS = -Iinclude
-LIBRARY = libnet
+LIBRARY = libnettl
 
 SOURCES = \
-        tl/socket_core.c
+        src/amap.c \
+        src/portrng.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/nettl/include/nettl/portrng.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup nettest
+/** @addtogroup libnettl
  * @{
  */
-
-/** @file
- * Networking test support functions.
+/**
+ * @file Port range allocator.
  */
 
-#ifndef NET_TEST_
-#define NET_TEST_
+#ifndef LIBNETTL_PORTRNG_H_
+#define LIBNETTL_PORTRNG_H_
 
-#include <net/socket.h>
+#include <stdbool.h>
+#include <stdint.h>
 
-extern void print_mark(unsigned int);
-extern int sockets_create(int, int *, unsigned int, uint16_t, sock_type_t);
-extern int sockets_close(int, int *, unsigned int);
-extern int sockets_connect(int, int *, unsigned int, struct sockaddr *,
-    socklen_t);
-extern int sockets_sendto(int, int *, unsigned int, struct sockaddr *,
-    socklen_t, char *, size_t, unsigned int, sock_type_t);
-extern int sockets_recvfrom(int, int *, unsigned int, struct sockaddr *,
-    socklen_t *, char *, size_t, unsigned int);
-extern int sockets_sendto_recvfrom(int, int *, unsigned int, struct sockaddr *,
-    socklen_t *, char *, size_t, unsigned int, sock_type_t);
+/** Allocated port */
+typedef struct {
+        /** Link to portrng_t.used */
+        link_t lprng;
+        /** Port number */
+        uint16_t pn;
+        /** User argument */
+        void *arg;
+} portrng_port_t;
+
+typedef struct {
+        list_t used; /* of portrng_port_t */
+} portrng_t;
+
+typedef enum {
+        pf_allow_system = 0x1
+} portrng_flags_t;
+
+extern int portrng_create(portrng_t **);
+extern void portrng_destroy(portrng_t *);
+extern int portrng_alloc(portrng_t *, uint16_t, void *,
+    portrng_flags_t, uint16_t *);
+extern int portrng_find_port(portrng_t *, uint16_t, void **);
+extern void portrng_free_port(portrng_t *, uint16_t);
+extern bool portrng_empty(portrng_t *);
 
 #endif
@@ -56 +70 @@
 /** @}
  */
-