Changes in uspace/srv/net/dnsrsrv/transport.c [26de91a:02a09ed] in mainline

File:

• uspace/srv/net/dnsrsrv/transport.c (modified) (6 diffs)

uspace/srv/net/dnsrsrv/transport.c

@@ -158 +158 @@
         assert(fibril_mutex_is_locked(&treq_lock));
 
-        list_foreach(treq_list, lreq, trans_req_t, treq) {
+        list_foreach(treq_list, link) {
+                trans_req_t *treq = list_get_instance(link, trans_req_t, lreq);
+
                 if (treq->req->id == resp->id) {
                         /* Match */
@@ -182 +184 @@
 {
         trans_req_t *treq = NULL;
-        struct sockaddr *saddr = NULL;
-        socklen_t saddrlen;
         
         void *req_data;
@@ -191 +191 @@
                 goto error;
         
-        rc = inet_addr_sockaddr(&dns_server_addr, DNS_SERVER_PORT,
-            &saddr, &saddrlen);
-        if (rc != EOK) {
-                assert(rc == ENOMEM);
+        struct sockaddr_in addr;
+        struct sockaddr_in6 addr6;
+        uint16_t af =
+            inet_addr_sockaddr_in(&dns_server_addr, &addr, &addr6);
+        
+        struct sockaddr *address;
+        socklen_t addrlen;
+        
+        switch (af) {
+        case AF_INET:
+                addr.sin_port = htons(DNS_SERVER_PORT);
+                address = (struct sockaddr *) &addr;
+                addrlen = sizeof(addr);
+                break;
+        case AF_INET6:
+                addr6.sin6_port = htons(DNS_SERVER_PORT);
+                address = (struct sockaddr *) &addr6;
+                addrlen = sizeof(addr6);
+                break;
+        default:
+                rc = EAFNOSUPPORT;
                 goto error;
         }
@@ -202 +219 @@
         while (ntry < REQ_RETRY_MAX) {
                 rc = sendto(transport_fd, req_data, req_size, 0,
-                    saddr, saddrlen);
+                    (struct sockaddr *) address, addrlen);
                 if (rc != EOK)
                         goto error;
@@ -241 +258 @@
         treq_destroy(treq);
         free(req_data);
-        free(saddr);
         return EOK;
         
@@ -249 +265 @@
         
         free(req_data);
-        free(saddr);
         return rc;
 }