Changeset dd0c8a0 in mainline for uspace/lib/c/include/inet/iplink.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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.

File:

• uspace/lib/c/include/inet/iplink.h (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <async.h>
 #include <sys/types.h>
+#include <inet/addr.h>
 
 struct iplink_ev_ops;
@@ -46 +47 @@
 } iplink_t;
 
-typedef struct {
-        uint32_t ipv4;
-} iplink_addr_t;
-
-/** IP link Service Data Unit */
+/** IPv4 link Service Data Unit */
 typedef struct {
         /** Local source address */
-        iplink_addr_t lsrc;
+        addr32_t src;
         /** Local destination address */
-        iplink_addr_t ldest;
+        addr32_t dest;
         /** Serialized IP packet */
         void *data;
@@ -62 +59 @@
 } iplink_sdu_t;
 
+/** IPv6 link Service Data Unit */
+typedef struct {
+        /** Local MAC destination address */
+        addr48_t dest;
+        /** Serialized IP packet */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_sdu6_t;
+
+/** Internet link receive Service Data Unit */
+typedef struct {
+        /** Serialized datagram */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_recv_sdu_t;
+
 typedef struct iplink_ev_ops {
-        int (*recv)(iplink_t *, iplink_sdu_t *);
+        int (*recv)(iplink_t *, iplink_recv_sdu_t *, uint16_t);
 } iplink_ev_ops_t;
 
@@ -69 +84 @@
 extern void iplink_close(iplink_t *);
 extern int iplink_send(iplink_t *, iplink_sdu_t *);
-extern int iplink_addr_add(iplink_t *, iplink_addr_t *);
-extern int iplink_addr_remove(iplink_t *, iplink_addr_t *);
+extern int iplink_send6(iplink_t *, iplink_sdu6_t *);
+extern int iplink_addr_add(iplink_t *, inet_addr_t *);
+extern int iplink_addr_remove(iplink_t *, inet_addr_t *);
 extern int iplink_get_mtu(iplink_t *, size_t *);
+extern int iplink_get_mac48(iplink_t *, addr48_t *);
 
 #endif