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

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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 (moved) (moved from uspace/lib/net/include/net_hardware.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup libc
  * @{
  */
-
 /** @file
- * Hardware types according to the on-line IANA - Address Resolution Protocol
- * (ARP) Parameters
- * http://www.iana.org/assignments/arp-parameters/arp-parameters.xml,
- * cited January 14 2009.
  */
 
-#ifndef LIBNET_NET_HARDWARE_H_
-#define LIBNET_NET_HARDWARE_H_
+#ifndef LIBC_INET_INET_H_
+#define LIBC_INET_INET_H_
 
 #include <sys/types.h>
 
-/** Network interface layer type type definition. */
-typedef uint8_t hw_type_t;
+#define INET_TTL_MAX 255
 
-/** @name Network interface layer types definitions */
-/*@{*/
+typedef struct {
+        uint32_t ipv4;
+} inet_addr_t;
 
-/** Ethernet (10Mb) hardware type. */
-#define HW_ETHER                1
+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;
+
+extern int inet_init(uint8_t, inet_ev_ops_t *);
+extern int inet_send(inet_dgram_t *, uint8_t, inet_df_t);
+extern int inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *);
 
 #endif
@@ -58 +68 @@
 /** @}
  */
-