Changeset dd0c8a0 in mainline for uspace/lib/c/include/net/socket_codes.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/socket_codes.h (modified) (3 diffs)

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

@@ -45 +45 @@
 
 enum {
-        AF_UNKNOWN = 0,
-        AF_INET,        /* IPv4 address */
-        AF_INET6        /* IPv6 address */
+        AF_NONE = 0,
+        AF_INET,  /* IPv4 address */
+        AF_INET6  /* IPv6 address */
 };
 
@@ -53 +53 @@
 
 /** @name Protocol families definitions
- *  Same as address families.
+ * Same as address families.
  */
 /*@{*/
 
-#define PF_INET         AF_INET
-#define PF_INET6        AF_INET6
+#define PF_INET   AF_INET
+#define PF_INET6  AF_INET6
 
 /*@}*/
@@ -75 +75 @@
 typedef int32_t socklen_t;
 
+/* Socket options */
+
+enum {
+        SOL_SOCKET = 1,
+
+        /* IP link to transmit on */
+        SO_IPLINK
+};
+
 #endif