Changeset 0c2d9bb in mainline for uspace/srv/net/dnsrsrv/transport.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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

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, link) {
-                trans_req_t *treq = list_get_instance(link, trans_req_t, lreq);
-
+        list_foreach(treq_list, lreq, trans_req_t, treq) {
                 if (treq->req->id == resp->id) {
                         /* Match */
@@ -184 +182 @@
 {
         trans_req_t *treq = NULL;
+        struct sockaddr *saddr = NULL;
+        socklen_t saddrlen;
         
         void *req_data;
@@ -191 +191 @@
                 goto error;
         
-        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;
+        rc = inet_addr_sockaddr(&dns_server_addr, DNS_SERVER_PORT,
+            &saddr, &saddrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
                 goto error;
         }
@@ -219 +202 @@
         while (ntry < REQ_RETRY_MAX) {
                 rc = sendto(transport_fd, req_data, req_size, 0,
-                    (struct sockaddr *) address, addrlen);
+                    saddr, saddrlen);
                 if (rc != EOK)
                         goto error;
@@ -258 +241 @@
         treq_destroy(treq);
         free(req_data);
+        free(saddr);
         return EOK;
         
@@ -265 +249 @@
         
         free(req_data);
+        free(saddr);
         return rc;
 }