Changeset 19a4f73 in mainline for uspace/lib/c

Timestamp:

2013-06-20T15:21:48Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a2e3ee6

Parents:

3e66428

Message:

udp: use new network address infrastructure (towards IPv6 support)

Location:

uspace/lib/c

Files:

• generic/inet.c (modified) (1 diff)
• generic/inet/addr2.c (modified) (2 diffs)
• include/inet/addr2.h (modified) (2 diffs)
• include/inet/inet.h (modified) (2 diffs)
• include/net/in.h (modified) (2 diffs)
• include/net/ip_protocols.h (modified) (1 diff)

uspace/lib/c/generic/inet.c

@@ -144 +144 @@
 }
 
+int inet2_get_srcaddr(inet2_addr_t *remote, uint8_t tos, inet2_addr_t *local)
+{
+        uint32_t remote_addr;
+        int rc = inet2_addr_pack(remote, &remote_addr);
+        if (rc != EOK)
+                return rc;
+        
+        async_exch_t *exch = async_exchange_begin(inet_sess);
+        
+        sysarg_t local_addr;
+        rc = async_req_2_1(exch, INET_GET_SRCADDR, (sysarg_t) remote_addr,
+            tos, &local_addr);
+        
+        async_exchange_end(exch);
+        
+        if (rc != EOK)
+                return rc;
+        
+        inet2_addr_unpack(local_addr, local);
+        return EOK;
+}
+
 static void inet_ev_recv(ipc_callid_t callid, ipc_call_t *call)
 {

uspace/lib/c/generic/inet/addr2.c

@@ -40 +40 @@
 #include <stdio.h>
 
+// TODO temporarily
+#include <assert.h>
+
+static inet2_addr_t inet2_addr_any = {
+        .family = AF_INET,
+        .addr = {0, 0, 0, 0}
+};
+
+static inet2_addr_t inet2_addr6_any = {
+        .family = AF_INET6,
+        .addr = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+};
+
 /** Parse network address family.
  *
@@ -336 +349 @@
 }
 
-int inet2_addr_is_empty(inet2_addr_t *addr)
-{
-        return (addr->family == 0);
+int inet2_addr_is_any(inet2_addr_t *addr)
+{
+        return ((addr->family == 0) ||
+            (inet2_addr_compare(addr, &inet2_addr_any)) ||
+            (inet2_addr_compare(addr, &inet2_addr6_any)));
+}
+
+void inet_inet2(inet_addr_t *addr, inet2_addr_t *addr2)
+{
+        // TODO temporarily
+        inet2_addr_unpack(addr->ipv4, addr2);
+}
+
+void inet2_inet(inet2_addr_t *addr2, inet_addr_t *addr)
+{
+        // TODO temporarily
+        assert(addr2->family == AF_INET);
+        inet2_addr_pack(addr2, &addr->ipv4);
 }
 

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

@@ -38 +38 @@
 #include <stdint.h>
 #include <net/in.h>
+#include <inet/addr.h>
 
 #define INET2_ADDR_SIZE  16
@@ -84 +85 @@
 
 extern int inet2_addr_compare(inet2_addr_t *, inet2_addr_t *);
-extern int inet2_addr_is_empty(inet2_addr_t *);
+extern int inet2_addr_is_any(inet2_addr_t *);
+
+extern void inet_inet2(inet_addr_t *, inet2_addr_t *);
+extern void inet2_inet(inet2_addr_t *, inet_addr_t *);
 
 #endif

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

@@ -37 +37 @@
 
 #include <inet/addr.h>
+#include <inet/addr2.h>
 #include <sys/types.h>
 
@@ -60 +61 @@
 extern int inet_send(inet_dgram_t *, uint8_t, inet_df_t);
 extern int inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *);
+extern int inet2_get_srcaddr(inet2_addr_t *, uint8_t, inet2_addr_t *);
 
 #endif

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

@@ -47 +47 @@
 #define INADDR_ANY 0
 
-/** Type definition of the INET address.
- * @see in_addr
- */
-typedef struct in_addr in_addr_t;
-
-/** Type definition of the INET socket address.
- * @see sockaddr_in
- */
-typedef struct sockaddr_in      sockaddr_in_t;
-
 /** INET address. */
-struct in_addr {
+typedef struct in_addr {
         /** 4 byte IP address. */
         uint32_t s_addr;
-};
+} in_addr_t;
 
 /** INET socket address.
  * @see sockaddr
  */
-struct sockaddr_in {
+typedef struct sockaddr_in {
         /** Address family. Should be AF_INET. */
         uint16_t sin_family;
@@ -72 +62 @@
         uint16_t sin_port;
         /** Internet address. */
-        struct in_addr sin_addr;
+        in_addr_t sin_addr;
         /** Padding to meet the sockaddr size. */
         uint8_t sin_zero[8];
-};
+} sockaddr_in_t;
 
 #endif

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

@@ -44 +44 @@
 /*@{*/
 
-#define IPPROTO_ICMP    1
-#define IPPROTO_TCP     6
-#define IPPROTO_UDP     17
+#define IPPROTO_ICMP    1
+#define IPPROTO_TCP     6
+#define IPPROTO_UDP     17
+#define IPPROTO_ICMPV6  58
 
 /*@}*/