Changeset 98abd40 in mainline for uspace/srv/net/inetsrv/inetsrv.h

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/srv/net/inetsrv/inetsrv.h (modified) (2 diffs)

uspace/srv/net/inetsrv/inetsrv.h

@@ -63 +63 @@
 } inetping_client_t;
 
+/** Inetping6 Client */
+typedef struct {
+        /** Callback session */
+        async_sess_t *sess;
+        /** Session identifier */
+        uint16_t ident;
+        /** Link to client list */
+        link_t client_list;
+} inetping6_client_t;
+
 /** Address object info */
 typedef struct {
@@ -172 +182 @@
 
 typedef struct {
-        inet_addr_t src;
-        inet_addr_t dest;
+        uint32_t src;
+        uint32_t dest;
         uint16_t seq_no;
         void *data;
         size_t size;
 } inetping_sdu_t;
+
+typedef struct {
+        addr128_t src;
+        addr128_t dest;
+        uint16_t seq_no;
+        void *data;
+        size_t size;
+} inetping6_sdu_t;
 
 extern int inet_ev_recv(inet_client_t *, inet_dgram_t *);