Changeset 330df83 in mainline for uspace/lib/c

Timestamp:

2013-07-19T20:42:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

f4cbf9dd

Parents:

8a8a08d1 (diff), cd18cd1 (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 with mainline changes.

Location:

uspace/lib/c

Files:

• generic/dnsr.c (modified) (2 diffs)
• generic/inet/addr.c (modified) (1 diff)
• generic/net/socket_parse.c (modified) (1 diff)
• include/inet/addr.h (modified) (1 diff)
• include/inet/dnsr.h (modified) (1 diff)

uspace/lib/c/generic/dnsr.c

@@ -67 +67 @@
 }
 
-int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo)
+int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, uint16_t af)
 {
         dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
@@ -76 +76 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, DNSR_NAME2HOST, &answer);
+        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) af,
+            &answer);
         
         int rc = async_data_write_start(exch, name, str_size(name));

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

@@ -260 +260 @@
 }
 
+int inet_naddr_compare(const inet_naddr_t *naddr, const inet_addr_t *addr)
+{
+        if (naddr->family != addr->family)
+                return 0;
+        
+        switch (naddr->family) {
+        case AF_INET:
+                return (naddr->addr == addr->addr);
+        case AF_INET6:
+                return addr128_compare(naddr->addr6, addr->addr6);
+        default:
+                return 0;
+        }
+}
+
 int inet_naddr_compare_mask(const inet_naddr_t *naddr, const inet_addr_t *addr)
 {

uspace/lib/c/generic/net/socket_parse.c

@@ -53 +53 @@
 int socket_parse_address_family(const char *name, int *af)
 {
-        if (str_lcmp(name, "AF_INET", 7) == 0) {
-                *af = AF_INET;
+        if (str_lcmp(name, "AF_INET6", 8) == 0) {
+                *af = AF_INET6;
                 return EOK;
         }
         
-        if (str_lcmp(name, "AF_INET6", 8) == 0) {
-                *af = AF_INET6;
+        if (str_lcmp(name, "AF_INET", 7) == 0) {
+                *af = AF_INET;
                 return EOK;
         }

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

@@ -97 +97 @@
 extern int inet_addr_is_any(const inet_addr_t *);
 
+extern int inet_naddr_compare(const inet_naddr_t *, const inet_addr_t *);
 extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *);
 

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

@@ -51 +51 @@
 
 extern int dnsr_init(void);
-extern int dnsr_name2host(const char *, dnsr_hostinfo_t **);
+extern int dnsr_name2host(const char *, dnsr_hostinfo_t **, uint16_t);
 extern void dnsr_hostinfo_destroy(dnsr_hostinfo_t *);
 extern int dnsr_get_srvaddr(inet_addr_t *);