Changeset 89ac5513 in mainline for uspace/lib/c/include/inet

Timestamp:

2013-06-23T19:54:53Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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.

Location:

uspace/lib/c/include/inet

Files:

• addr.h (added)
• dnsr.h (added)
• inet.h (modified) (1 diff)
• inetcfg.h (modified) (1 diff)
• inetping.h (modified) (2 diffs)
• iplink.h (modified) (4 diffs)
• iplink_srv.h (modified) (2 diffs)

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

@@ -36 +36 @@
 #define LIBC_INET_INET_H_
 
+#include <inet/addr.h>
 #include <sys/types.h>
 
 #define INET_TTL_MAX 255
-
-typedef struct {
-        uint32_t ipv4;
-} inet_addr_t;
 
 typedef struct {

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

@@ -38 +38 @@
 #include <inet/inet.h>
 #include <sys/types.h>
-
-/** Network address */
-typedef struct {
-        /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
-} inet_naddr_t;
 
 /** Address object info */

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

@@ -40 +40 @@
 
 typedef struct {
-        inet_addr_t src;
-        inet_addr_t dest;
+        uint32_t src;
+        uint32_t dest;
         uint16_t seq_no;
         void *data;
@@ -53 +53 @@
 extern int inetping_init(inetping_ev_ops_t *);
 extern int inetping_send(inetping_sdu_t *);
-extern int inetping_get_srcaddr(inet_addr_t *, inet_addr_t *);
-
+extern int inetping_get_srcaddr(uint32_t, uint32_t *);
 
 #endif

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;
+        uint32_t lsrc;
         /** Local destination address */
-        iplink_addr_t ldest;
+        uint32_t ldest;
         /** Serialized IP packet */
         void *data;
@@ -61 +58 @@
         size_t size;
 } iplink_sdu_t;
+
+/** IPv6 link Service Data Unit */
+typedef struct {
+        /** Target MAC address */
+        uint64_t hwaddr;
+        /** Serialized IP packet */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_sdu6_t;
 
 typedef struct iplink_ev_ops {
@@ -69 +76 @@
 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_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 *);
 

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

@@ -51 +51 @@
 } iplink_srv_t;
 
-typedef struct {
-        uint32_t ipv4;
-} iplink_srv_addr_t;
-
 /** IP link Service Data Unit */
 typedef struct {
         /** Local source address */
-        iplink_srv_addr_t lsrc;
+        uint32_t lsrc;
         /** Local destination address */
-        iplink_srv_addr_t ldest;
+        uint32_t ldest;
         /** Serialized IP packet */
         void *data;
@@ -72 +68 @@
         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 *);
+        int (*addr_add)(iplink_srv_t *, uint32_t);
+        int (*addr_remove)(iplink_srv_t *, uint32_t);
 } iplink_ops_t;