Changeset 6843a9c in mainline for uspace/srv/net/inetsrv/icmp_std.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/inetsrv/icmp_std.h (moved) (moved from uspace/lib/c/include/net/icmp_api.h ) (2 diffs)

uspace/srv/net/inetsrv/icmp_std.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup inet
  * @{
  */
-
-/** @file
- * ICMP module application interface.
+/**
+ * @file ICMP standard definitions
+ *
  */
 
-#ifndef LIBC_ICMP_API_H_
-#define LIBC_ICMP_API_H_
+#ifndef ICMP_STD_H_
+#define ICMP_STD_H_
 
-#include <net/socket_codes.h>
-#include <net/inet.h>
 #include <sys/types.h>
-#include <sys/time.h>
-#include <adt/measured_strings.h>
-#include <net/ip_codes.h>
-#include <net/icmp_codes.h>
-#include <net/icmp_common.h>
-#include <async.h>
 
-/** @name ICMP module application interface
- * This interface is used by other application modules.
- */
-/*@{*/
+#define IP_PROTO_ICMP 1
 
-extern int icmp_echo_msg(async_sess_t *, size_t, mseconds_t, ip_ttl_t, ip_tos_t,
-    int, const struct sockaddr *, socklen_t);
+/** Type of service used for ICMP */
+#define ICMP_TOS        0
 
-/*@}*/
+/** ICMP message type */
+enum icmp_type {
+        ICMP_ECHO_REPLY   = 0,
+        ICMP_ECHO_REQUEST = 8
+};
+
+/** ICMP Echo Request or Reply message header */
+typedef struct {
+        /** ICMP message type */
+        uint8_t type;
+        /** Code (0) */
+        uint8_t code;
+        /** Internet checksum of the ICMP message */
+        uint16_t checksum;
+        /** Indentifier */
+        uint16_t ident;
+        /** Sequence number */
+        uint16_t seq_no;
+} icmp_echo_t;
 
 #endif