Changeset 89c57b6 in mainline for uspace/lib/net/include/generic.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/net/include/generic.h (moved) (moved from uspace/lib/net/include/ip_local.h ) (1 diff)

uspace/lib/net/include/generic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ip
+/** @addtogroup libnet
  * @{
  */
 
-#ifndef __NET_IP_LOCAL_H__
-#define __NET_IP_LOCAL_H__
+/** @file
+ * Generic communication interfaces for networking.
+ */
+
+#ifndef LIBNET_GENERIC_H_
+#define LIBNET_GENERIC_H_
 
 #include <async.h>
 #include <ipc/services.h>
 
-#include <ip_codes.h>
-#include <inet.h>
-#include <in.h>
-#include <socket.h>
+#include <net/device.h>
+#include <adt/measured_strings.h>
+#include <net/packet.h>
 
-extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,
+extern int generic_device_state_msg_remote(int, int, device_id_t, int,
     services_t);
-extern int ip_set_gateway_req_local(int, device_id_t, in_addr_t);
-extern int ip_packet_size_req_local(int, device_id_t, packet_dimension_ref);
-extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,
-    services_t);
-extern int ip_device_req_local(int, device_id_t, services_t);
-extern int ip_add_route_req_local(int, device_id_t, in_addr_t, in_addr_t,
-    in_addr_t);
-extern int ip_send_msg_local(int, device_id_t, packet_t, services_t,
-    services_t);
-extern int ip_get_route_req_local(int, ip_protocol_t, const struct sockaddr *,
-    socklen_t, device_id_t *, void **, size_t *);
+extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
+extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
+    uint8_t **);
+extern int generic_packet_size_req_remote(int, int, device_id_t,
+    packet_dimension_t *);
+extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
+    services_t, services_t);
+extern int generic_send_msg_remote(int, int, device_id_t, packet_id_t,
+    services_t, services_t);
+extern int generic_translate_req(int, int, device_id_t, services_t,
+    measured_string_t *, size_t, measured_string_t **, uint8_t **);
 
 #endif