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

Timestamp:

2010-11-02T22:38:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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/socket/generic/icmp_api.c ) (1 diff)

uspace/lib/net/include/generic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
- *  @{
+/** @addtogroup libnet
+ * @{
  */
 
 /** @file
- *  ICMP application interface implementation.
- *  @see icmp_api.h
+ * Generic communication interfaces for networking.
  */
 
+#ifndef LIBNET_GENERIC_H_
+#define LIBNET_GENERIC_H_
+
 #include <async.h>
-
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 
-#include <sys/types.h>
+#include <net/device.h>
+#include <adt/measured_strings.h>
+#include <net/packet.h>
 
-#include <net_modules.h>
-#include <icmp_api.h>
-#include <inet.h>
-#include <ip_codes.h>
-#include <socket_codes.h>
-#include <icmp_messages.h>
+extern int generic_device_state_msg_remote(int, int, device_id_t, int,
+    services_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_ref *,
+    char **);
+extern int generic_packet_size_req_remote(int, int, device_id_t,
+    packet_dimension_ref);
+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_ref, size_t, measured_string_ref *, char **);
 
-int icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen){
-        aid_t message_id;
-        ipcarg_t result;
-
-        if(addrlen <= 0){
-                return EINVAL;
-        }
-        message_id = async_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl, tos, (ipcarg_t) dont_fragment, NULL);
-        // send the address
-        async_data_write_start(icmp_phone, addr, (size_t) addrlen);
-        // timeout version may cause inconsistency - there is also an inner timer
-        // return async_wait_timeout(message_id, &result, timeout);
-        async_wait_for(message_id, &result);
-        return (int) result;
-}
+#endif
 
 /** @}