Changeset 46c20c8 in mainline for uspace/lib/c/include/net/inet.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/inet.h (moved) (moved from uspace/lib/libc/arch/ia32/include/istate.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2009 Lukas Mejdrech
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup debug
- * @{
- */
-/** @file
+/** @addtogroup libc
+ *  @{
  */
 
-#ifndef LIBC_ia32__ISTATE_H_
-#define LIBC_ia32__ISTATE_H_
+/** @file
+ *  Internet common definitions.
+ */
+
+#ifndef LIBC_INET_H_
+#define LIBC_INET_H_
 
 #include <sys/types.h>
+#include <byteorder.h>
 
-/** Interrupt context.
- *
- * This is a copy of the kernel definition with which it must be kept in sync.
+/** Type definition of the socket address.
+ * @see sockaddr
  */
-typedef struct istate {
-        uint32_t eax;
-        uint32_t ecx;
-        uint32_t edx;
-        uint32_t ebp;
+typedef struct sockaddr         sockaddr_t;
 
-        uint32_t gs;
-        uint32_t fs;
-        uint32_t es;
-        uint32_t ds;
+/** Type definition of the address information.
+ * @see addrinfo
+ */
+typedef struct addrinfo         addrinfo_t;
 
-        uint32_t error_word;
-        uint32_t eip;
-        uint32_t cs;
-        uint32_t eflags;
-        uint32_t stack[];
-} istate_t;
+/** Socket address. */
+struct sockaddr {
+        /** Address family. @see socket.h */
+        uint16_t sa_family;
+        /** 14 byte protocol address. */
+        uint8_t sa_data[14];
+};
 
-static inline uintptr_t istate_get_pc(istate_t *istate)
-{
-        return istate->eip;
-}
-
-static inline uintptr_t istate_get_fp(istate_t *istate)
-{
-        return istate->ebp;
-}
+extern int inet_ntop(uint16_t, const uint8_t *, char *, size_t);
+extern int inet_pton(uint16_t, const char *, uint8_t *);
 
 #endif