Changeset 0c2d9bb in mainline for uspace/lib/c/include/types/inetping.h

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/types/inetping.h (moved) (moved from uspace/lib/c/include/inet/inetping6.h ) (2 diffs)

uspace/lib/c/include/types/inetping.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Martin Decky
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief
  */
 
-#ifndef LIBC_INET_INETPING6_H_
-#define LIBC_INET_INETPING6_H_
+#ifndef LIBC_TYPES_INETPING_H_
+#define LIBC_TYPES_INETPING_H_
 
-#include <inet/inet.h>
+#include <inet/addr.h>
 #include <sys/types.h>
 
 typedef struct {
-        addr128_t src;
-        addr128_t dest;
+        inet_addr_t src;
+        inet_addr_t dest;
         uint16_t seq_no;
         void *data;
         size_t size;
-} inetping6_sdu_t;
-
-typedef struct inetping6_ev_ops {
-        int (*recv)(inetping6_sdu_t *);
-} inetping6_ev_ops_t;
-
-extern int inetping6_init(inetping6_ev_ops_t *);
-extern int inetping6_send(inetping6_sdu_t *);
-extern int inetping6_get_srcaddr(addr128_t, addr128_t);
+} inetping_sdu_t;
 
 #endif