Changeset c028b22 in mainline for uspace/srv/net/tl/icmp/icmp.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/icmp/icmp.c (modified) (15 diffs)

uspace/srv/net/tl/icmp/icmp.c

@@ -118 +118 @@
 
 /** Global data */
-static int phone_net = -1;
-static int phone_ip = -1;
+static async_sess_t *net_sess = NULL;
+static async_sess_t *ip_sess = NULL;
 static bool error_reporting = true;
 static bool echo_replying = true;
@@ -173 +173 @@
 static void icmp_release(packet_t *packet)
 {
-        pq_release_remote(phone_net, packet_get_id(packet));
+        pq_release_remote(net_sess, packet_get_id(packet));
 }
 
@@ -225 +225 @@
         }
         
-        return ip_send_msg(phone_ip, -1, packet, SERVICE_ICMP, error);
+        return ip_send_msg(ip_sess, -1, packet, SERVICE_ICMP, error);
 }
 
@@ -297 +297 @@
         size_t length = (size_t) addrlen;
         
-        packet_t *packet = packet_get_4_remote(phone_net, size,
+        packet_t *packet = packet_get_4_remote(net_sess, size,
             icmp_dimension.addr_len, ICMP_HEADER_SIZE + icmp_dimension.prefix,
             icmp_dimension.suffix);
@@ -595 +595 @@
         case ICMP_SKIP:
         case ICMP_PHOTURIS:
-                ip_received_error_msg(phone_ip, -1, packet,
+                ip_received_error_msg(ip_sess, -1, packet,
                     SERVICE_IP, SERVICE_ICMP);
                 return EOK;
@@ -608 +608 @@
  * @param[in]     iid   Message identifier.
  * @param[in,out] icall Message parameters.
- *
- */
-static void icmp_receiver(ipc_callid_t iid, ipc_call_t *icall)
-{
-        bool loop = true;
+ * @param[in]     arg   Local argument.
+ *
+ */
+static void icmp_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
         packet_t *packet;
         int rc;
         
-        while (loop) {
+        while (true) {
+                if (!IPC_GET_IMETHOD(*icall))
+                        break;
+                
                 switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_TL_RECEIVED:
-                        rc = packet_translate_remote(phone_net, &packet,
+                        rc = packet_translate_remote(net_sess, &packet,
                             IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
@@ -629 +632 @@
                         async_answer_0(iid, (sysarg_t) rc);
                         break;
-                case IPC_M_PHONE_HUNGUP:
-                        loop = false;
-                        continue;
                 default:
                         async_answer_0(iid, (sysarg_t) ENOTSUP);
@@ -642 +642 @@
 /** Initialize the ICMP module.
  *
- * @param[in] net_phone Network module phone.
+ * @param[in] sess Network module session.
  *
  * @return EOK on success.
@@ -648 +648 @@
  *
  */
-int tl_initialize(int net_phone)
+int tl_initialize(async_sess_t *sess)
 {
         measured_string_t names[] = {
@@ -670 +670 @@
         atomic_set(&icmp_client, 0);
         
-        phone_net = net_phone;
-        phone_ip = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP,
+        net_sess = sess;
+        ip_sess = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP,
             icmp_receiver);
-        if (phone_ip < 0)
-                return phone_ip;
-        
-        int rc = ip_packet_size_req(phone_ip, -1, &icmp_dimension);
+        if (ip_sess == NULL)
+                return ENOENT;
+        
+        int rc = ip_packet_size_req(ip_sess, -1, &icmp_dimension);
         if (rc != EOK)
                 return rc;
@@ -685 +685 @@
         /* Get configuration */
         configuration = &names[0];
-        rc = net_get_conf_req(phone_net, &configuration, count, &data);
+        rc = net_get_conf_req(net_sess, &configuration, count, &data);
         if (rc != EOK)
                 return rc;
@@ -763 +763 @@
         
         case NET_ICMP_DEST_UNREACH:
-                rc = packet_translate_remote(phone_net, &packet,
+                rc = packet_translate_remote(net_sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)
@@ -772 +772 @@
         
         case NET_ICMP_SOURCE_QUENCH:
-                rc = packet_translate_remote(phone_net, &packet,
+                rc = packet_translate_remote(net_sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)
@@ -780 +780 @@
         
         case NET_ICMP_TIME_EXCEEDED:
-                rc = packet_translate_remote(phone_net, &packet,
+                rc = packet_translate_remote(net_sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)
@@ -788 +788 @@
         
         case NET_ICMP_PARAMETERPROB:
-                rc = packet_translate_remote(phone_net, &packet,
+                rc = packet_translate_remote(net_sess, &packet,
                     IPC_GET_PACKET(*call));
                 if (rc != EOK)