Changeset 89c57b6 in mainline for uspace/lib/c/include/net/modules.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/c/include/net/modules.h (moved) (moved from uspace/lib/socket/generic/icmp_api.c ) (1 diff)

uspace/lib/c/include/net/modules.h

@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
- *  @{
+/** @addtogroup libc
+ * @{
  */
 
 /** @file
- *  ICMP application interface implementation.
- *  @see icmp_api.h
+ * Generic module functions.
+ *
+ * @todo MAKE IT POSSIBLE TO REMOVE THIS FILE VIA EITHER REPLACING PART OF ITS
+ * FUNCTIONALITY OR VIA INTEGRATING ITS FUNCTIONALITY MORE TIGHTLY WITH THE REST
+ * OF THE SYSTEM.
  */
 
+#ifndef LIBC_MODULES_H_
+#define LIBC_MODULES_H_
+
 #include <async.h>
+#include <ipc/services.h>
+#include <sys/time.h>
 
-#include <ipc/ipc.h>
-#include <ipc/services.h>
+/** Connect to the needed module function type definition.
+ *
+ * @param[in] need The needed module service.
+ *
+ * @return The phone of the needed service.
+ *
+ */
+typedef int connect_module_t(services_t need);
 
-#include <sys/types.h>
+extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t);
+extern int bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
+    async_client_conn_t);
+extern int bind_service_timeout(services_t, sysarg_t, sysarg_t, sysarg_t,
+    async_client_conn_t, suseconds_t);
+extern int connect_to_service(services_t);
+extern int connect_to_service_timeout(services_t, suseconds_t);
+extern int data_reply(void *, size_t);
+extern void refresh_answer(ipc_call_t *, size_t *);
 
-#include <net_modules.h>
-#include <icmp_api.h>
-#include <inet.h>
-#include <ip_codes.h>
-#include <socket_codes.h>
-#include <icmp_messages.h>
-
-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
 
 /** @}