Changeset 6a44ee4 in mainline for uspace/app/ping/ping.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/app/ping/ping.c (modified) (4 diffs)

uspace/app/ping/ping.c

@@ -340 +340 @@
             config.dest_str, config.size, config.size);
         
-        int icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
-        if (icmp_phone < 0) {
+        async_sess_t *sess = icmp_connect_module();
+        if (!sess) {
                 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME,
-                    str_error(icmp_phone));
-                return icmp_phone;
+                    str_error(errno));
+                return errno;
         }
         
@@ -355 +355 @@
                             str_error(ret));
                         
-                        async_hangup(icmp_phone);
+                        async_hangup(sess);
                         return ret;
                 }
                 
                 /* Ping! */
-                int result = icmp_echo_msg(icmp_phone, config.size, config.timeout,
+                int result = icmp_echo_msg(sess, config.size, config.timeout,
                     config.ttl, config.tos, !config.fragments, config.dest_raw,
                     config.dest_len);
@@ -370 +370 @@
                             str_error(ret));
                         
-                        async_hangup(icmp_phone);
+                        async_hangup(sess);
                         return ret;
                 }
@@ -390 +390 @@
         }
         
-        async_hangup(icmp_phone);
+        async_hangup(sess);
         
         return 0;