Changeset 47f5a77 in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2013-07-17T08:46:06Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (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/udp/sock.c (modified) (5 diffs)

uspace/srv/net/udp/sock.c

@@ -265 +265 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_send()");
         
+        uint8_t *buffer = calloc(UDP_FRAGMENT_SIZE, 1);
+        if (buffer == NULL) {
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+        
         struct sockaddr_in6 *addr6 = NULL;
         struct sockaddr_in *addr;
@@ -276 +282 @@
                 if (rc != EOK) {
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
                 
@@ -357 +363 @@
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sock_sendto: Failed to "
                             "determine local address.");
-                        return;
+                        goto out;
                 }
                 
@@ -379 +385 @@
                         length = UDP_FRAGMENT_SIZE;
                 
-                uint8_t buffer[UDP_FRAGMENT_SIZE];
                 int rc = async_data_write_finalize(wcallid, buffer, length);
                 if (rc != EOK) {
@@ -425 +430 @@
         if (addr6 != NULL)
                 free(addr6);
+        
+        free(buffer);
 }