Changeset c0e74b1 in mainline for uspace/lib/c/include/net/in.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/in.h (moved) (moved from uspace/lib/socket/include/in.h ) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup net
+/** @addtogroup libc
  *  @{
  */
@@ -35 +35 @@
  */
 
-#ifndef __NET_IN_H__
-#define __NET_IN_H__
+#ifndef LIBC_IN_H_
+#define LIBC_IN_H_
 
+#include <net/inet.h>
+#include <net/ip_protocols.h>
 #include <sys/types.h>
 
-#include <ip_protocols.h>
-#include <inet.h>
-
-/** INET string address maximum length.
- */
+/** INET string address maximum length. */
 #define INET_ADDRSTRLEN         (4 * 3 + 3 + 1)
 
 /** Type definition of the INET address.
- *  @see in_addr
+ * @see in_addr
  */
 typedef struct in_addr          in_addr_t;
 
 /** Type definition of the INET socket address.
- *  @see sockaddr_in
+ * @see sockaddr_in
  */
 typedef struct sockaddr_in      sockaddr_in_t;
 
-/** INET address.
- */
-struct in_addr{
-        /** 4 byte IP address.
-         */
+/** INET address. */
+struct in_addr {
+        /** 4 byte IP address. */
         uint32_t s_addr;
 };
 
 /** INET socket address.
- *  @see sockaddr
+ * @see sockaddr
  */
-struct sockaddr_in{
-        /** Address family.
-         *  Should be AF_INET.
-         */
+struct sockaddr_in {
+        /** Address family. Should be AF_INET. */
         uint16_t sin_family;
-        /** Port number.
-         */
+        /** Port number. */
         uint16_t sin_port;
-        /** Internet address.
-         */
+        /** Internet address. */
         struct in_addr sin_addr;
-        /** Padding to meet the sockaddr size.
-         */
+        /** Padding to meet the sockaddr size. */
         uint8_t sin_zero[8];
 };