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

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

@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
+/** @addtogroup libc
  *  @{
  */
 
 /** @file
- *  ICMP common interface implementation.
- *  @see icmp_common.h
+ * Internet protocol numbers according to the on-line IANA - Assigned Protocol
+ * numbers:
+ *
+ * http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml
  */
 
-#include <async.h>
-#include <ipc/services.h>
+#ifndef LIBC_IP_PROTOCOLS_H_
+#define LIBC_IP_PROTOCOLS_H_
 
-#include <net_modules.h>
-#include <icmp_common.h>
-#include <icmp_messages.h>
+/** @name IP protocols definitions */
+/*@{*/
 
-int icmp_connect_module(services_t service, suseconds_t timeout){
-        int phone;
+#define IPPROTO_ICMP    1
+#define IPPROTO_TCP     6
+#define IPPROTO_UDP     17
 
-        phone = connect_to_service_timeout(SERVICE_ICMP, timeout);
-        if(phone >= 0){
-                async_req_0_0(phone, NET_ICMP_INIT);
-        }
-        return phone;
-}
+/*@}*/
+
+#endif
 
 /** @}