Changeset 12d7710 in mainline for uspace/srv/net/tl/udp/udp.c

Timestamp:

2010-03-26T22:01:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1faa995

Parents:

4204ad9 (diff), eaf22d4 (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/tl/udp/udp.c (modified) (4 diffs)

uspace/srv/net/tl/udp/udp.c

@@ -419 +419 @@
         int socket_id;
         size_t addrlen;
+        size_t size;
         ipc_call_t answer;
         int answer_count;
@@ -454 +455 @@
                                 socket_id = SOCKET_GET_SOCKET_ID(call);
                                 res = socket_create(&local_sockets, app_phone, NULL, &socket_id);
-                                *SOCKET_SET_SOCKET_ID(answer) = socket_id;
-                                
+                                SOCKET_SET_SOCKET_ID(answer, socket_id);
+
                                 if(res == EOK){
                                         if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){
-                                                *SOCKET_SET_DATA_FRAGMENT_SIZE(answer) = packet_dimension->content;
+                                                SOCKET_SET_DATA_FRAGMENT_SIZE(answer, packet_dimension->content);
                                         }
-//                                      *SOCKET_SET_DATA_FRAGMENT_SIZE(answer) = MAX_UDP_FRAGMENT_SIZE;
-                                        *SOCKET_SET_HEADER_SIZE(answer) = UDP_HEADER_SIZE;
+//                                      SOCKET_SET_DATA_FRAGMENT_SIZE(answer, MAX_UDP_FRAGMENT_SIZE);
+                                        SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE);
                                         answer_count = 3;
                                 }
@@ -478 +479 @@
                                 if(res == EOK){
                                         fibril_rwlock_write_lock(&udp_globals.lock);
-                                        res = udp_sendto_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS(call), SOCKET_SET_DATA_FRAGMENT_SIZE(answer), SOCKET_GET_FLAGS(call));
+                                        res = udp_sendto_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS(call), &size, SOCKET_GET_FLAGS(call));
+                                        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size);
                                         if(res != EOK){
                                                 fibril_rwlock_write_unlock(&udp_globals.lock);
@@ -492 +494 @@
                                 fibril_rwlock_write_unlock(&udp_globals.lock);
                                 if(res > 0){
-                                        *SOCKET_SET_READ_DATA_LENGTH(answer) = res;
-                                        *SOCKET_SET_ADDRESS_LENGTH(answer) = addrlen;
+                                        SOCKET_SET_READ_DATA_LENGTH(answer, res);
+                                        SOCKET_SET_ADDRESS_LENGTH(answer, addrlen);
                                         answer_count = 3;
                                         res = EOK;