Changeset 1ffa73b in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2011-01-10T16:33:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b207803

Parents:

863d45e (diff), 6610565b (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 development/ changes

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (11 diffs)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -47 +47 @@
 #include <net/modules.h>
 #include <net/device.h>
-#include <netif_interface.h>
 #include <nil_interface.h>
 #include <il_interface.h>
@@ -53 +52 @@
 #include <net/packet.h>
 #include <packet_remote.h>
+#include <netif_remote.h>
 #include <nil_local.h>
 
@@ -113 +113 @@
                 case NET_NIL_DEVICE_STATE:
                         rc = nil_device_state_msg_local(0,
-                            IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
+                            IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall));
                         ipc_answer_0(iid, (sysarg_t) rc);
                         break;
@@ -119 +119 @@
                 case NET_NIL_RECEIVED:
                         rc = packet_translate_remote(nildummy_globals.net_phone,
-                            &packet, IPC_GET_PACKET(icall));
+                            &packet, IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
+                                    IPC_GET_DEVICE(*icall), packet, 0);
                         }
                         ipc_answer_0(iid, (sysarg_t) rc);
@@ -375 +375 @@
 
 int nil_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+    ipc_call_t *call, ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
@@ -391 +391 @@
         
         case NET_NIL_DEVICE:
-                return nildummy_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                return nildummy_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
         
         case NET_NIL_SEND:
                 rc = packet_translate_remote(nildummy_globals.net_phone,
-                    &packet, IPC_GET_PACKET(call));
+                    &packet, IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return nildummy_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                return nildummy_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         
         case NET_NIL_PACKET_SPACE:
-                rc = nildummy_packet_space_message(IPC_GET_DEVICE(call),
+                rc = nildummy_packet_space_message(IPC_GET_DEVICE(*call),
                     &addrlen, &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         
         case NET_NIL_ADDR:
-                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
                 if (rc != EOK)
                         return rc;
@@ -421 +421 @@
         
         case NET_NIL_BROADCAST_ADDR:
-                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
                 if (rc != EOK)
                         return rc;
@@ -427 +427 @@
         
         case IPC_M_CONNECT_TO_ME:
-                return nildummy_register_message(NIL_GET_PROTO(call),
-                    IPC_GET_PHONE(call));
+                return nildummy_register_message(NIL_GET_PROTO(*call),
+                    IPC_GET_PHONE(*call));
         }
         
@@ -449 +449 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -460 +460 @@
                 /* Process the message */
                 int res = nil_module_message_standalone(NAME, callid, &call,
-                    &answer, &answer_count);
+                    &answer, &count);
                 
                 /*
@@ -471 +471 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }