Changeset c2a6983 in mainline for uspace/lib/c/include/net

Timestamp:

2013-10-13T20:59:33Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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

Location:

uspace/lib/c/include/net

Files:

• ip_codes.h (deleted)
• socket.h (modified) (1 diff)
• socket_codes.h (modified) (1 diff)

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

@@ -57 +57 @@
 extern int connect(int, const struct sockaddr *, socklen_t);
 extern int closesocket(int);
-extern int send(int, void *, size_t, int);
+extern int send(int, const void *, size_t, int);
 extern int sendto(int, const void *, size_t, int, const struct sockaddr *,
     socklen_t);

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

@@ -75 +75 @@
 typedef int32_t socklen_t;
 
+/* Socket options */
+
+enum {
+        SOL_SOCKET = 1,
+
+        /* IP link to transmit on */
+        SO_IPLINK
+};
+
 #endif