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

Timestamp:

2010-10-06T22:58:18Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ae972834

Parents:

49d871ea (diff), d9e2e0e (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 from lp:~jakub/helenos/net.

This merge continues with the overhaul of the networking subsystem and procedes
towards the ultimate goal of getting rid of the current lib socket. The current
lib socket mixes code which should either belong to libc, libnet or directly to
the packet server. By moving generic non-networking and client networking code
out of the current lib socket, I am preparing to merge the rest of it to lib net
and the packet server and fix ticket #257 for the modular builds. When this is
done, we can talk of moving some of the networking client code back to a
dedicated client library, but we can just as well keep it in lib C, similar to
how we have file system client code there.

File:

• uspace/lib/c/include/net/inet.h (moved) (moved from uspace/lib/socket/include/net_byteorder.h ) (1 diff)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup net
+/** @addtogroup libc
  *  @{
  */
 
 /** @file
- *  Host - network byte order manipulation functions.
+ *  Internet common definitions.
  */
 
-#ifndef __NET_BYTEORDER_H__
-#define __NET_BYTEORDER_H__
+#ifndef LIBC_INET_H_
+#define LIBC_INET_H_
 
+#include <sys/types.h>
 #include <byteorder.h>
-#include <sys/types.h>
 
+/** Type definition of the socket address.
+ * @see sockaddr
+ */
+typedef struct sockaddr         sockaddr_t;
 
-/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian).
- *  @param[in] number The number in the host byte order to be converted.
- *  @returns The number in the network byte order.
+/** Type definition of the address information.
+ * @see addrinfo
  */
-#define htons(number)           host2uint16_t_be(number)
+typedef struct addrinfo         addrinfo_t;
 
-/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian).
- *  @param[in] number The number in the host byte order to be converted.
- *  @returns The number in the network byte order.
- */
-#define htonl(number)           host2uint32_t_be(number)
+/** Socket address. */
+struct sockaddr {
+        /** Address family. @see socket.h */
+        uint16_t sa_family;
+        /** 14 byte protocol address. */
+        uint8_t sa_data[14];
+};
 
-/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order.
- *  @param[in] number The number in the network byte order to be converted.
- *  @returns The number in the host byte order.
- */
-#define ntohs(number)   uint16_t_be2host(number)
-
-/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order.
- *  @param[in] number The number in the network byte order to be converted.
- *  @returns The number in the host byte order.
- */
-#define ntohl(number)           uint32_t_be2host(number)
+extern int inet_ntop(uint16_t, const uint8_t *, char *, size_t);
+extern int inet_pton(uint16_t, const char *, uint8_t *);
 
 #endif