Changeset 6843a9c in mainline for uspace/srv/net/ethip/atrans.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/net/ethip/atrans.h (moved) (moved from uspace/lib/net/include/icmp_client.h ) (2 diffs)

uspace/srv/net/ethip/atrans.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup inet
  * @{
  */
-
-/** @file
- * ICMP client interface.
+/**
+ * @file
+ * @brief
  */
 
-#ifndef LIBNET_ICMP_CLIENT_H_
-#define LIBNET_ICMP_CLIENT_H_
+#ifndef ATRANS_H_
+#define ATRANS_H_
 
-#include <net/icmp_codes.h>
-#include <net/packet.h>
+#include <inet/iplink_srv.h>
+#include "ethip.h"
 
-extern int icmp_client_process_packet(packet_t *, icmp_type_t *, icmp_code_t *,
-    icmp_param_t *, icmp_param_t *);
-extern size_t icmp_client_header_length(packet_t *);
+extern int atrans_add(iplink_srv_addr_t *, mac48_addr_t *);
+extern int atrans_remove(iplink_srv_addr_t *);
+extern int atrans_lookup(iplink_srv_addr_t *, mac48_addr_t *);
+extern int atrans_wait_timeout(suseconds_t);
 
 #endif