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

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/srv/net/tl/udp/udp.c (modified) (7 diffs)

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

@@ -37 +37 @@
 
 #include <async.h>
+#include <async_obsolete.h>
 #include <fibril_synch.h>
 #include <malloc.h>
@@ -69 +70 @@
 #include "udp.h"
 #include "udp_header.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 /** UDP module name. */
@@ -299 +303 @@
         /* Notify the destination socket */
         fibril_rwlock_write_unlock(&udp_globals.lock);
-        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
+        async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED,
             (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0,
             (sysarg_t) fragments);
@@ -748 +752 @@
 {
         int res;
-        bool keep_on_going = true;
         socket_cores_t local_sockets;
         int app_phone = IPC_GET_PHONE(call);
@@ -773 +776 @@
         socket_cores_initialize(&local_sockets);
 
-        while (keep_on_going) {
+        while (true) {
 
                 /* Answer the call */
@@ -783 +786 @@
                 /* Get the next call */
                 callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        res = EHANGUP;
+                        break;
+                }
 
                 /* Process the call */
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        keep_on_going = false;
-                        res = EHANGUP;
-                        break;
-
                 case NET_SOCKET:
                         socket_id = SOCKET_GET_SOCKET_ID(call);
@@ -880 +883 @@
 
         /* Release the application phone */
-        async_hangup(app_phone);
+        async_obsolete_hangup(app_phone);
 
         /* Release all local sockets */