Changeset 048cd69 in mainline for uspace/lib/c/include/inet

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/c/include/inet

Files:

• addr.h (modified) (2 diffs)
• endpoint.h (moved) (moved from uspace/lib/c/include/adt/char_map.h ) (2 diffs)
• iplink.h (modified) (3 diffs)
• tcp.h (added)
• udp.h (added)

uspace/lib/c/include/inet/addr.h

@@ -37 +37 @@
 
 #include <stdint.h>
-#include <net/in.h>
-#include <net/in6.h>
-#include <net/socket.h>
 
 typedef uint32_t addr32_t;
@@ -126 +123 @@
 extern void inet_addr_set(addr32_t, inet_addr_t *);
 extern void inet_naddr_set(addr32_t, uint8_t, inet_naddr_t *);
-extern void inet_sockaddr_in_addr(const sockaddr_in_t *, inet_addr_t *);
 
 extern void inet_addr_set6(addr128_t, inet_addr_t *);
 extern void inet_naddr_set6(addr128_t, uint8_t, inet_naddr_t *);
-extern void inet_sockaddr_in6_addr(const sockaddr_in6_t *, inet_addr_t *);
-
-extern uint16_t inet_addr_sockaddr_in(const inet_addr_t *, sockaddr_in_t *,
-    sockaddr_in6_t *);
-
-extern ip_ver_t ipver_from_af(int af);
-extern int inet_addr_sockaddr(const inet_addr_t *, uint16_t, sockaddr_t **,
-    socklen_t *);
 
 #endif

uspace/lib/c/include/inet/endpoint.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup libc
- *  @{
+ * @{
+ */
+/** @file
  */
 
-/** @file
- *  Character string to integer map.
+#ifndef LIBC_INET_ASSOC_H_
+#define LIBC_INET_ASSOC_H_
+
+#include <stdint.h>
+#include <inet/addr.h>
+#include <loc.h>
+
+/** Internet port number ranges
+ *
+ * Port number ranges per RFC 6335 section 6 (Port Number Ranges.
+ * Technically port zero is a system port. But since it is reserved,
+ * we will use it as a special value denoting no port is specified
+ * and we will exclude it from the system port range to disallow
+ * ever assigning it.
  */
-
-#ifndef LIBC_CHAR_MAP_H_
-#define LIBC_CHAR_MAP_H_
-
-#include <libarch/types.h>
-
-/** Invalid assigned value used also if an&nbsp;entry does not exist. */
-#define CHAR_MAP_NULL  (-1)
-
-/** Type definition of the character string to integer map.
- *  @see char_map
- */
-typedef struct char_map char_map_t;
-
-/** Character string to integer map item.
- *
- * This structure recursivelly contains itself as a character by character tree.
- * The actually mapped character string consists of all the parent characters
- * and the actual one.
- */
-struct char_map {
-        /** Actually mapped character. */
-        uint8_t c;
-        /** Stored integral value. */
-        int value;
-        /** Next character array size. */
-        int size;
-        /** First free position in the next character array. */
-        int next;
-        /** Next character array. */
-        char_map_t **items;
-        /** Consistency check magic value. */
-        int magic;
+enum inet_port_ranges {
+        /** Special value meaning no specific port */
+        inet_port_any = 0,
+        /** Lowest system port (a.k.a. well known port) */
+        inet_port_sys_lo = 1,
+        /** Highest system port (a.k.a. well known port) */
+        inet_port_sys_hi = 1023,
+        /** Lowest user port (a.k.a. registered port) */
+        inet_port_user_lo = 1024,
+        /** Highest user port (a.k.a. registered port) */
+        inet_port_user_hi = 49151,
+        /** Lowest dynamic port (a.k.a. private or ephemeral port) */
+        inet_port_dyn_lo = 49152,
+        /** Highest dynamic port (a.k.a. private or ephemeral port) */
+        inet_port_dyn_hi = 65535
 };
 
-extern int char_map_initialize(char_map_t *);
-extern void char_map_destroy(char_map_t *);
-extern int char_map_exclude(char_map_t *, const uint8_t *, size_t);
-extern int char_map_add(char_map_t *, const uint8_t *, size_t, const int);
-extern int char_map_find(const char_map_t *, const uint8_t *, size_t);
-extern int char_map_update(char_map_t *, const uint8_t *, size_t, const int);
+/** Internet endpoint (address-port pair), a.k.a. socket */
+typedef struct {
+        inet_addr_t addr;
+        uint16_t port;
+} inet_ep_t;
+
+/** Internet endpoint pair */
+typedef struct {
+        service_id_t local_link;
+        inet_ep_t local;
+        inet_ep_t remote;
+} inet_ep2_t;
+
+extern void inet_ep_init(inet_ep_t *);
+extern void inet_ep2_init(inet_ep2_t *);
 
 #endif

uspace/lib/c/include/inet/iplink.h

@@ -44 +44 @@
         async_sess_t *sess;
         struct iplink_ev_ops *ev_ops;
+        void *arg;
 } iplink_t;
 
@@ -81 +82 @@
 } iplink_ev_ops_t;
 
-extern int iplink_open(async_sess_t *, iplink_ev_ops_t *, iplink_t **);
+extern int iplink_open(async_sess_t *, iplink_ev_ops_t *, void *, iplink_t **);
 extern void iplink_close(iplink_t *);
 extern int iplink_send(iplink_t *, iplink_sdu_t *);
@@ -90 +91 @@
 extern int iplink_get_mac48(iplink_t *, addr48_t *);
 extern int iplink_set_mac48(iplink_t *, addr48_t);
+extern void *iplink_get_userptr(iplink_t *);
 
 #endif