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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/inet.h (modified) (1 diff)

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

@@ -37 +37 @@
 
 #include <inet/addr.h>
+#include <ipc/loc.h>
 #include <sys/types.h>
-
-#define INET_TTL_MAX 255
-
-typedef struct {
-        inet_addr_t src;
-        inet_addr_t dest;
-        uint8_t tos;
-        void *data;
-        size_t size;
-} inet_dgram_t;
-
-typedef struct {
-        int (*recv)(inet_dgram_t *);
-} inet_ev_ops_t;
-
-typedef enum {
-        INET_DF = 1
-} inet_df_t;
+#include <types/inet.h>
 
 extern int inet_init(uint8_t, inet_ev_ops_t *);