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

Timestamp:

2010-03-21T09:25:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f857a

Parents:

facebd56 (diff), 4e9aaf5 (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) (2 diffs)

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

@@ -417 +417 @@
         int app_phone = IPC_GET_PHONE(&call);
         struct sockaddr * addr;
+        int socket_id;
         size_t addrlen;
         ipc_call_t answer;
@@ -451 +452 @@
                                 break;
                         case NET_SOCKET:
-                                *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
-                                res = socket_create(&local_sockets, app_phone, NULL, SOCKET_SET_SOCKET_ID(answer));
+                                socket_id = SOCKET_GET_SOCKET_ID(call);
+                                res = socket_create(&local_sockets, app_phone, NULL, &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){