Changeset 97c7682 in mainline for uspace/lib/c/include/inet/iplink_srv.h

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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 mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/c/include/inet/iplink_srv.h (moved) (moved from uspace/lib/c/include/adt/measured_strings.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup libc
- *  @{
+ * @{
+ */
+/** @file
  */
 
-/** @file
- * Character string with measured length.
- * The structure has been designed for serialization of character strings
- * between modules.
- */
+#ifndef LIBC_INET_IPLINK_SRV_H_
+#define LIBC_INET_IPLINK_SRV_H_
 
-#ifndef LIBC_MEASURED_STRINGS_H_
-#define LIBC_MEASURED_STRINGS_H_
+#include <async.h>
+#include <fibril_synch.h>
+#include <bool.h>
+#include <sys/types.h>
 
-#include <sys/types.h>
-#include <async.h>
+struct iplink_ops;
 
-/** Type definition of the character string with measured length.
- * @see measured_string
- */
-typedef struct measured_string measured_string_t;
+typedef struct {
+        fibril_mutex_t lock;
+        bool connected;
+        struct iplink_ops *ops;
+        void *arg;
+        async_sess_t *client_sess;
+} iplink_srv_t;
 
-/** Character string with measured length.
- *
- * This structure has been designed for serialization of character strings
- * between modules.
- */
-struct measured_string {
-        /** Character string data. */
-        uint8_t *value;
-        /** Character string length. */
-        size_t length;
-};
+typedef struct {
+        uint32_t ipv4;
+} iplink_srv_addr_t;
 
-extern measured_string_t *measured_string_create_bulk(const uint8_t *, size_t);
-extern measured_string_t *measured_string_copy(measured_string_t *);
+/** IP link Service Data Unit */
+typedef struct {
+        /** Local source address */
+        iplink_srv_addr_t lsrc;
+        /** Local destination address */
+        iplink_srv_addr_t ldest;
+        /** Serialized IP packet */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_srv_sdu_t;
 
-extern int measured_strings_receive(measured_string_t **, uint8_t **, size_t);
-extern int measured_strings_reply(const measured_string_t *, size_t);
+typedef struct iplink_ops {
+        int (*open)(iplink_srv_t *);
+        int (*close)(iplink_srv_t *);
+        int (*send)(iplink_srv_t *, iplink_srv_sdu_t *);
+        int (*get_mtu)(iplink_srv_t *, size_t *);
+        int (*addr_add)(iplink_srv_t *, iplink_srv_addr_t *);
+        int (*addr_remove)(iplink_srv_t *, iplink_srv_addr_t *);
+} iplink_ops_t;
 
-extern int measured_strings_return(async_exch_t *, measured_string_t **,
-    uint8_t **, size_t);
-extern int measured_strings_send(async_exch_t *, const measured_string_t *,
-    size_t);
+extern void iplink_srv_init(iplink_srv_t *);
+
+extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
+extern int iplink_ev_recv(iplink_srv_t *, iplink_srv_sdu_t *);
 
 #endif