Changeset 695b6ff in mainline for uspace/lib/c

Timestamp:

2013-09-12T21:26:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b8b1adb1, ddd0499d

Parents:

4a90582

Message:

Crude DHCP client prototype.

Location:

uspace/lib/c

Files:

• generic/inet.c (modified) (1 diff)
• generic/inet/addr.c (modified) (1 diff)
• include/inet/addr.h (modified) (1 diff)
• include/inet/inet.h (modified) (2 diffs)
• include/ipc/socket.h (modified) (1 diff)
• include/net/socket_codes.h (modified) (1 diff)

uspace/lib/c/generic/inet.c

@@ -111 +111 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INET_SEND, dgram->tos, ttl, df,
-            &answer);
+        aid_t req = async_send_4(exch, INET_SEND, dgram->iplink, dgram->tos,
+            ttl, df, &answer);
         
         int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));

uspace/lib/c/generic/inet/addr.c

@@ -47 +47 @@
         #error The architecture must be either big-endian or little-endian.
 #endif
+
+const addr32_t addr32_broadcast_all_hosts = 0xffffffff;
 
 const addr48_t addr48_broadcast = {

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

@@ -68 +68 @@
 } inet_naddr_t;
 
+extern const addr32_t addr32_broadcast_all_hosts;
 extern const addr48_t addr48_broadcast;
 

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

@@ -37 +37 @@
 
 #include <inet/addr.h>
+#include <ipc/loc.h>
 #include <sys/types.h>
 
@@ -42 +43 @@
 
 typedef struct {
+        /** Local IP link service ID (optional) */
+        service_id_t iplink;
         inet_addr_t src;
         inet_addr_t dest;

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

@@ -198 +198 @@
 #define SOCKET_GET_OPT_NAME(call) \
         ({ \
-                int opt_name = (int) IPC_GET_ARG4(call); \
+                int opt_name = (int) IPC_GET_ARG2(call); \
                 opt_name; \
         })

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