Changeset 3a0a4d8 in mainline for uspace/app

Timestamp:

2013-09-12T07:54:05Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (6 diffs)
• bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• corecfg/Makefile (added)
• corecfg/corecfg.c (added)
• devctl/devctl.c (modified) (7 diffs)
• df/Makefile (added)
• df/df.c (added)
• dnsres/dnsres.c (modified) (1 diff)
• edit/sheet.c (modified) (4 diffs)
• init/init.c (modified) (1 diff)
• klog/klog.c (modified) (1 diff)
• mixerctl/Makefile (added)
• mixerctl/mixerctl.c (added)
• netecho/netecho.c (modified) (3 diffs)
• nettest1/nettest.c (modified) (8 diffs)
• nettest1/nettest.h (modified) (1 diff)
• nettest1/nettest1.c (modified) (3 diffs)
• nettest2/nettest2.c (modified) (3 diffs)
• nettest3/nettest3.c (modified) (1 diff)
• nterm/conn.c (modified) (1 diff)
• ping/ping.c (modified) (14 diffs)
• ping6/ping6.c (modified) (14 diffs)
• tester/mm/common.c (modified) (2 diffs)
• trace/trace.c (modified) (1 diff)
• usbinfo/dump.c (modified) (1 diff)
• usbinfo/hid.c (modified) (1 diff)
• wavplay/Makefile (added)
• wavplay/dplay.c (added)
• wavplay/dplay.h (added)
• wavplay/drec.c (added)
• wavplay/drec.h (added)
• wavplay/main.c (added)
• wavplay/wave.c (added)
• wavplay/wave.h (added)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -63 +63 @@
 static bool should_quit = false;
 static bool dash_represents_stdin = false;
+static unsigned int lineno = 0;
+static bool number = false;
+static bool last_char_was_newline = false;
 
 static console_ctrl_t *console = NULL;
@@ -75 +78 @@
         { "hex", no_argument, 0, 'x' },
         { "stdin", no_argument, 0, 's' },
+        { "number", no_argument, 0, 'n' },
         { 0, 0, 0, 0 }
 };
@@ -95 +99 @@
                 "  -m, --more       Pause after each screen full\n"
                 "  -x, --hex        Print bytes as hex values\n"
-                "  -s  --stdin      Treat `-' in file list as standard input\n"
+                "  -s, --stdin      Treat `-' in file list as standard input\n"
+                "  -n, --number     Number all output lines\n"
                 "Currently, %s is under development, some options don't work.\n",
                 cmdname, cmdname);
@@ -153 +158 @@
 static void paged_char(wchar_t c)
 {
+        if (last_char_was_newline && number) {
+                lineno++;
+                printf("%6u  ", lineno);
+        }
         putchar(c);
+        last_char_was_newline = c == '\n';
         if (paging_enabled) {
                 chars_remaining--;
@@ -306 +316 @@
         should_quit = false;
         console = console_init(stdin, stdout);
+        number = false;
+        lineno = 0;
+        /* This enables printing of the first number. */
+        last_char_was_newline = true;
+
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:s", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -347 +362 @@
                         dash_represents_stdin = true;
                         break;
+                case 'n':
+                        number = true;
+                        break;
                 }
         }

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -74 +74 @@
         get_mtab_list(&mtab_list);
 
-        list_foreach(mtab_list, cur) {
-                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
-                    link);
-
+        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
                 if (old_ent)
                         free(old_ent);

uspace/app/devctl/devctl.c

@@ -35 +35 @@
 #include <devman.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +45 @@
 #define MAX_NAME_LENGTH 1024
 
-char name[MAX_NAME_LENGTH];
-char drv_name[MAX_NAME_LENGTH];
+static char name[MAX_NAME_LENGTH];
+static char drv_name[MAX_NAME_LENGTH];
+static bool verbose = false;
+
+static const char *drv_state_str(driver_state_t state)
+{
+        const char *sstate;
+
+        switch (state) {
+        case DRIVER_NOT_STARTED:
+                sstate = "not started";
+                break;
+        case DRIVER_STARTING:
+                sstate = "starting";
+                break;
+        case DRIVER_RUNNING:
+                sstate = "running";
+                break;
+        default:
+                sstate = "unknown";
+        }
+
+        return sstate;
+}
 
 static int fun_subtree_print(devman_handle_t funh, int lvl)
@@ -52 +75 @@
         devman_handle_t *cfuns;
         size_t count, i;
+        unsigned int score;
         int rc;
         int j;
@@ -74 +98 @@
                 printf("%s : %s\n", name, drv_name);
 
+        if (verbose) {
+                for (i = 0; true; i++) {
+                        rc = devman_fun_get_match_id(funh, i, name, MAX_NAME_LENGTH,
+                            &score);
+                        if (rc != EOK)
+                                break;
+
+                        for (j = 0; j < lvl; j++)
+                                printf("    ");
+
+                        printf("    %u %s\n", score, name);
+                }
+        }
+
         rc = devman_fun_get_child(funh, &devh);
         if (rc == ENOENT)
@@ -159 +197 @@
 }
 
+static int drv_list(void)
+{
+        devman_handle_t *devs;
+        devman_handle_t *drvs;
+        driver_state_t state;
+        const char *sstate;
+        size_t ndrvs;
+        size_t ndevs;
+        size_t i;
+        int rc;
+
+        rc = devman_get_drivers(&drvs, &ndrvs);
+        if (rc != EOK)
+                return rc;
+
+        for (i = 0; i < ndrvs; i++) {
+                devs = NULL;
+
+                rc = devman_driver_get_name(drvs[i], drv_name, MAX_NAME_LENGTH);
+                if (rc != EOK)
+                        goto skip;
+                rc = devman_driver_get_state(drvs[i], &state);
+                if (rc != EOK)
+                        goto skip;
+                rc = devman_driver_get_devices(drvs[i], &devs, &ndevs);
+                if (rc != EOK)
+                        goto skip;
+
+                sstate = drv_state_str(state);
+
+                printf("%-11s %3zu %s\n", sstate, ndevs, drv_name);
+skip:
+                free(devs);
+        }
+        free(drvs);
+
+        return EOK;
+}
+
+static int drv_show(char *drvname)
+{
+        devman_handle_t *devs;
+        devman_handle_t drvh;
+        devman_handle_t funh;
+        driver_state_t state;
+        const char *sstate;
+        unsigned int score;
+        size_t ndevs;
+        size_t i;
+        int rc;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK)
+                return rc;
+
+        devs = NULL;
+
+        rc = devman_driver_get_name(drvh, drv_name, MAX_NAME_LENGTH);
+        if (rc != EOK)
+                return rc;
+
+        rc = devman_driver_get_state(drvh, &state);
+        if (rc != EOK)
+                return rc;
+
+        rc = devman_driver_get_devices(drvh, &devs, &ndevs);
+        if (rc != EOK)
+                return rc;
+
+        sstate = drv_state_str(state);
+
+        printf("Driver: %s\n", drv_name);
+        printf("State: %s\n", sstate);
+
+        printf("Attached devices:\n");
+
+        for (i = 0; i < ndevs; i++) {
+                rc = devman_dev_get_parent(devs[i], &funh);
+                if (rc != EOK)
+                        goto error;
+
+                rc = devman_fun_get_path(funh, name, MAX_NAME_LENGTH);
+                if (rc != EOK)
+                        goto error;
+                printf("\t%s\n", name);
+        }
+
+        printf("Match IDs:\n");
+
+        for (i = 0; true; i++) {
+                rc = devman_driver_get_match_id(drvh, i, name, MAX_NAME_LENGTH,
+                    &score);
+                if (rc != EOK)
+                        break;
+
+                printf("\t%u %s\n", score, name);
+        }
+
+error:
+        free(devs);
+
+        return EOK;
+}
+
+static int drv_load(const char *drvname)
+{
+        int rc;
+        devman_handle_t drvh;
+
+        rc = devman_driver_get_handle(drvname, &drvh);
+        if (rc != EOK) {
+                printf("Failed resolving driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        rc = devman_driver_load(drvh);
+        if (rc != EOK) {
+                printf("Failed loading driver '%s' (%d).\n", drvname, rc);
+                return rc;
+        }
+
+        return EOK;
+}
+
 static void print_syntax(void)
 {
-        printf("syntax: devctl [(online|offline) <function>]\n");
+        printf("syntax:\n");
+        printf("\tdevctl\n");
+        printf("\tdevctl online <function>]\n");
+        printf("\tdevctl offline <function>]\n");
+        printf("\tdevctl list-drv\n");
+        printf("\tdevctl show-drv <driver-name>\n");
+        printf("\tdevctl load-drv <driver-name>\n");
 }
 
@@ -168 +336 @@
         int rc;
 
-        if (argc == 1) {
+        if (argc == 1 || argv[1][0] == '-') {
+                if (argc > 1) {
+                        if (str_cmp(argv[1], "-v") == 0) {
+                                verbose = true;
+                        } else {
+                                printf(NAME ": Invalid argument '%s'\n", argv[1]);
+                                print_syntax();
+                                return 1;
+                        }
+                }
                 rc = fun_tree_print();
                 if (rc != EOK)
@@ -194 +371 @@
                         return 2;
                 }
+        } else if (str_cmp(argv[1], "list-drv") == 0) {
+                rc = drv_list();
+                if (rc != EOK)
+                        return 2;
+        } else if (str_cmp(argv[1], "show-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_show(argv[2]);
+                if (rc != EOK) {
+                        return 2;
+                }
+        } else if (str_cmp(argv[1], "load-drv") == 0) {
+                if (argc < 3) {
+                        printf(NAME ": Argument missing.\n");
+                        print_syntax();
+                        return 1;
+                }
+
+                rc = drv_load(argv[2]);
+                if (rc != EOK)
+                        return 2;
         } else {
                 printf(NAME ": Invalid argument '%s'.\n", argv[1]);

uspace/app/dnsres/dnsres.c

@@ -36 +36 @@
 #include <inet/addr.h>
 #include <inet/dnsr.h>
+#include <net/socket_codes.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#define NAME "dnsres"
+#define NAME  "dnsres"
 
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " <host-name>\n");
+        printf("Syntax: %s [-4|-6] <host-name>\n", NAME);
 }
 
 int main(int argc, char *argv[])
 {
-        int rc;
-        dnsr_hostinfo_t *hinfo;
-        char *hname;
-        char *saddr;
-
-        if (argc != 2) {
+        if ((argc < 2) || (argc > 3)) {
                 print_syntax();
                 return 1;
         }
-
-        hname = argv[1];
-
-        rc = dnsr_name2host(hname, &hinfo);
+        
+        uint16_t af;
+        char *hname;
+        
+        if (str_cmp(argv[1], "-4") == 0) {
+                if (argc < 3) {
+                        print_syntax();
+                        return 1;
+                }
+                
+                af = AF_INET;
+                hname = argv[2];
+        } else if (str_cmp(argv[1], "-6") == 0) {
+                if (argc < 3) {
+                        print_syntax();
+                        return 1;
+                }
+                
+                af = AF_INET6;
+                hname = argv[2];
+        } else {
+                af = 0;
+                hname = argv[1];
+        }
+        
+        dnsr_hostinfo_t *hinfo;
+        int rc = dnsr_name2host(hname, &hinfo, af);
         if (rc != EOK) {
-                printf(NAME ": Error resolving '%s'.\n", argv[1]);
-                return 1;
+                printf("%s: Error resolving '%s'.\n", NAME, hname);
+                return rc;
         }
-
+        
+        char *saddr;
         rc = inet_addr_format(&hinfo->addr, &saddr);
         if (rc != EOK) {
                 dnsr_hostinfo_destroy(hinfo);
-                printf(NAME ": Out of memory.\n");
-                return 1;
+                printf("%s: Error formatting address.\n", NAME);
+                return rc;
         }
-
+        
         printf("Host name: %s\n", hname);
+        
         if (str_cmp(hname, hinfo->cname) != 0)
                 printf("Canonical name: %s\n", hinfo->cname);
+        
         printf("Address: %s\n", saddr);
-
+        
         dnsr_hostinfo_destroy(hinfo);
         free(saddr);
-
+        
         return 0;
 }

uspace/app/edit/sheet.c

@@ -105 +105 @@
         char *ipp;
         size_t sz;
-        tag_t *tag;
         char *newp;
 
@@ -128 +127 @@
         /* Adjust tags. */
 
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off > pos->b_off)
                         tag->b_off += sz;
@@ -154 +151 @@
         char *spp;
         size_t sz;
-        tag_t *tag;
         char *newp;
         size_t shrink_size;
@@ -165 +161 @@
 
         /* Adjust tags. */
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off >= epos->b_off)
                         tag->b_off -= sz;

uspace/app/init/init.c

@@ -384 +384 @@
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
+        srv_start("/srv/hound");
         
         int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);

uspace/app/klog/klog.c

@@ -206 +206 @@
         klog_length = size / sizeof(wchar_t);
         
-        rc = physmem_map((void *) faddr, pages,
-            AS_AREA_READ | AS_AREA_CACHEABLE, (void *) &klog);
+        rc = physmem_map(faddr, pages, AS_AREA_READ | AS_AREA_CACHEABLE,
+            (void *) &klog);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to map klog\n", NAME);

uspace/app/netecho/netecho.c

@@ -225 +225 @@
         uint8_t address_buf[sizeof(struct sockaddr_in6)];
 
-        socklen_t addrlen;
+        socklen_t addrlen = sizeof(struct sockaddr_in6);
         int socket_id;
         ssize_t rcv_size;
@@ -240 +240 @@
         if (type == SOCK_STREAM) {
                 /* Accept a socket if a stream socket is used */
-                addrlen = sizeof(address_buf);
                 if (verbose)
                         printf("accept()\n");
@@ -280 +279 @@
                                 case AF_INET6:
                                         port = ntohs(address_in6->sin6_port);
-                                        address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
+                                        address_start = (uint8_t *) address_in6->sin6_addr.s6_addr;
                                         break;
                                 default:

uspace/app/nettest1/nettest.c

@@ -41 +41 @@
 #include "print_error.h"
 
-
 /** Creates new sockets.
  *
@@ -52 +51 @@
  * @return Other error codes as defined for the socket() function.
  */
-int sockets_create(int verbose, int *socket_ids, int sockets, int family, sock_type_t type)
-{
-        int index;
-
+int sockets_create(int verbose, int *socket_ids, unsigned int sockets,
+    uint16_t family, sock_type_t type)
+{
         if (verbose)
                 printf("Create\t");
-                
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
                 socket_ids[index] = socket(family, type, 0);
                 if (socket_ids[index] < 0) {
-                        printf("Socket %d (%d) error:\n", index, socket_ids[index]);
+                        printf("Socket %u (%d) error:\n", index, socket_ids[index]);
                         socket_print_error(stderr, socket_ids[index], "Socket create: ", "\n");
                         return socket_ids[index];
                 }
+                
                 if (verbose)
                         print_mark(index);
@@ -83 +82 @@
  * @return Other error codes as defined for the closesocket() function.
  */
-int sockets_close(int verbose, int *socket_ids, int sockets)
-{
-        int index;
-        int rc;
-
+int sockets_close(int verbose, int *socket_ids, unsigned int sockets)
+{
         if (verbose)
                 printf("\tClose\t");
-
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
-                rc = closesocket(socket_ids[index]);
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
+                int rc = closesocket(socket_ids[index]);
                 if (rc != EOK) {
-                        printf("Socket %d (%d) error:\n", index, socket_ids[index]);
+                        printf("Socket %u (%d) error:\n", index, socket_ids[index]);
                         socket_print_error(stderr, rc, "Socket close: ", "\n");
                         return rc;
                 }
+                
                 if (verbose)
                         print_mark(index);
@@ -117 +114 @@
  * @return Other error codes as defined for the connect() function.
  */
-int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
-{
-        int index;
-        int rc;
-
+int sockets_connect(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t addrlen)
+{
         if (verbose)
                 printf("\tConnect\t");
@@ -127 +122 @@
         fflush(stdout);
         
-        for (index = 0; index < sockets; index++) {
-                rc = connect(socket_ids[index], address, addrlen);
+        for (unsigned int index = 0; index < sockets; index++) {
+                int rc = connect(socket_ids[index], address, addrlen);
                 if (rc != EOK) {
                         socket_print_error(stderr, rc, "Socket connect: ", "\n");
                         return rc;
                 }
-                if (verbose)
-                        print_mark(index);
-        }
-        
-        return EOK;
-}
-
-/** Sends data via sockets.
- *
- * @param[in] verbose A value indicating whether to print out verbose information.
- * @param[in] socket_ids A field of stored socket identifiers.
- * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @param[in] address The destination host address to send data to.
- * @param[in] addrlen The length of the destination address in bytes.
- * @param[in] data The data to be sent.
- * @param[in] size The data size in bytes.
- * @param[in] messages The number of datagrams per socket to be sent.
+                
+                if (verbose)
+                        print_mark(index);
+        }
+        
+        return EOK;
+}
+
+/** Send data via sockets.
+ *
+ * @param[in] verbose    Print out verbose information.
+ * @param[in] socket_ids Stored socket identifiers.
+ * @param[in] sockets    Number of sockets.
+ * @param[in] address    Destination host address to send data to.
+ * @param[in] addrlen    Length of the destination address in bytes.
+ * @param[in] data       Data to be sent.
+ * @param[in] size       Size of the data in bytes.
+ * @param[in] messages   Number of datagrams per socket to be sent.
+ * @param[in] type       Socket type.
+ *
  * @return EOK on success.
  * @return Other error codes as defined for the sendto() function.
- */
-int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
-{
-        int index;
-        int message;
-        int rc;
-
+ *
+ */
+int sockets_sendto(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t addrlen, char *data, size_t size,
+    unsigned int messages, sock_type_t type)
+{
         if (verbose)
                 printf("\tSendto\t");
-
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
-                for (message = 0; message < messages; message++) {
-                        rc = sendto(socket_ids[index], data, size, 0, address, addrlen);
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
+                for (unsigned int message = 0; message < messages; message++) {
+                        int rc;
+                        
+                        switch (type) {
+                        case SOCK_STREAM:
+                                rc = send(socket_ids[index], data, size, 0);
+                                break;
+                        case SOCK_DGRAM:
+                                rc = sendto(socket_ids[index], data, size, 0, address, addrlen);
+                                break;
+                        default:
+                                rc = EINVAL;
+                        }
+                        
                         if (rc != EOK) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
                                 socket_print_error(stderr, rc, "Socket send: ", "\n");
                                 return rc;
                         }
                 }
-                if (verbose)
-                        print_mark(index);
-        }
-        
-        return EOK;
-}
-
-/** Receives data via sockets.
- *
- * @param[in] verbose A value indicating whether to print out verbose information.
- * @param[in] socket_ids A field of stored socket identifiers.
- * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @param[in] address The source host address of received datagrams.
- * @param[in,out] addrlen The maximum length of the source address in bytes. The actual size of the source address is set instead.
- * @param[out] data The received data.
- * @param[in] size The maximum data size in bytes.
- * @param[in] messages The number of datagrams per socket to be received.
+                
+                if (verbose)
+                        print_mark(index);
+        }
+        
+        return EOK;
+}
+
+/** Receive data via sockets.
+ *
+ * @param[in]     verbose    Print out verbose information.
+ * @param[in]     socket_ids Stored socket identifiers.
+ * @param[in]     sockets    Number of sockets.
+ * @param[in]     address    Source host address of received datagrams.
+ * @param[in,out] addrlen    Maximum length of the source address in bytes.
+ *                           The actual size of the source address is set.
+ * @param[out]    data       Received data.
+ * @param[in]     size       Maximum data size in bytes.
+ * @param[in]     messages   Number of datagrams per socket to be received.
+ *
  * @return EOK on success.
  * @return Other error codes as defined for the recvfrom() function.
- */
-int sockets_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
-{
-        int value;
-        int index;
-        int message;
-
+ *
+ */
+int sockets_recvfrom(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t *addrlen, char *data, size_t size,
+    unsigned int messages)
+{
         if (verbose)
                 printf("\tRecvfrom\t");
@@ -204 +216 @@
         fflush(stdout);
         
-        for (index = 0; index < sockets; index++) {
-                for (message = 0; message < messages; message++) {
-                        value = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
-                        if (value < 0) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
-                                socket_print_error(stderr, value, "Socket receive: ", "\n");
-                                return value;
-                        }
-                }
-                if (verbose)
-                        print_mark(index);
-        }
-        return EOK;
-}
-
-/** Sends and receives data via sockets.
+        for (unsigned int index = 0; index < sockets; index++) {
+                for (unsigned int message = 0; message < messages; message++) {
+                        int rc = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
+                        if (rc < 0) {
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
+                                socket_print_error(stderr, rc, "Socket receive: ", "\n");
+                                return rc;
+                        }
+                }
+                
+                if (verbose)
+                        print_mark(index);
+        }
+        
+        return EOK;
+}
+
+/** Send and receive data via sockets.
  *
  * Each datagram is sent and a reply read consequently.
  * The next datagram is sent after the reply is received.
  *
- * @param[in] verbose A value indicating whether to print out verbose information.
- * @param[in] socket_ids A field of stored socket identifiers.
- * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @param[in,out] address The destination host address to send data to. The source host address of received datagrams is set instead.
- * @param[in] addrlen The length of the destination address in bytes.
- * @param[in,out] data The data to be sent. The received data are set instead.
- * @param[in] size The data size in bytes.
- * @param[in] messages The number of datagrams per socket to be received.
+ * @param[in]     verbose    Print out verbose information.
+ * @param[in]     socket_ids Stored socket identifiers.
+ * @param[in]     sockets    Number of sockets.
+ * @param[in,out] address    Destination host address to send data to.
+ *                           The source host address of received datagrams is set.
+ * @param[in]     addrlen    Length of the destination address in bytes.
+ * @param[in,out] data       Data to be sent. The received data are set.
+ * @param[in]     size       Size of the data in bytes.
+ * @param[in]     messages   Number of datagrams per socket to be received.
+ * @param[in]     type       Socket type.
+ *
  * @return EOK on success.
  * @return Other error codes as defined for the recvfrom() function.
- */
-int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
-{
-        int value;
-        int index;
-        int message;
-        int rc;
-
+ *
+ */
+int sockets_sendto_recvfrom(int verbose, int *socket_ids, unsigned int sockets,
+    struct sockaddr *address, socklen_t *addrlen, char *data,
+    size_t size, unsigned int messages, sock_type_t type)
+{
         if (verbose)
                 printf("\tSendto and recvfrom\t");
-
-        fflush(stdout);
-        
-        for (index = 0; index < sockets; index++) {
-                for (message = 0; message < messages; message++) {
-                        rc = sendto(socket_ids[index], data, size, 0, address, *addrlen);
+        
+        fflush(stdout);
+        
+        for (unsigned int index = 0; index < sockets; index++) {
+                for (unsigned int message = 0; message < messages; message++) {
+                        int rc;
+                        
+                        switch (type) {
+                        case SOCK_STREAM:
+                                rc = send(socket_ids[index], data, size, 0);
+                                break;
+                        case SOCK_DGRAM:
+                                rc = sendto(socket_ids[index], data, size, 0, address, *addrlen);
+                                break;
+                        default:
+                                rc = EINVAL;
+                        }
+                        
                         if (rc != EOK) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
                                 socket_print_error(stderr, rc, "Socket send: ", "\n");
                                 return rc;
                         }
-                        value = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
-                        if (value < 0) {
-                                printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message);
-                                socket_print_error(stderr, value, "Socket receive: ", "\n");
-                                return value;
-                        }
-                }
+                        
+                        rc = recvfrom(socket_ids[index], data, size, 0, address, addrlen);
+                        if (rc < 0) {
+                                printf("Socket %u (%d), message %u error:\n",
+                                    index, socket_ids[index], message);
+                                socket_print_error(stderr, rc, "Socket receive: ", "\n");
+                                return rc;
+                        }
+                }
+                
                 if (verbose)
                         print_mark(index);
@@ -274 +306 @@
  *
  * @param[in] index The index of the mark to be printed.
- */
-void print_mark(int index)
+ *
+ */
+void print_mark(unsigned int index)
 {
         if ((index + 1) % 10)
@@ -281 +314 @@
         else
                 printf("|");
+        
         fflush(stdout);
 }

uspace/app/nettest1/nettest.h

@@ -40 +40 @@
 #include <net/socket.h>
 
-extern void print_mark(int);
-extern int sockets_create(int, int *, int, int, sock_type_t);
-extern int sockets_close(int, int *, int);
-extern int sockets_connect(int, int *, int, struct sockaddr *, socklen_t);
-extern int sockets_sendto(int, int *, int, struct sockaddr *, socklen_t, char *, int, int);
-extern int sockets_recvfrom(int, int *, int, struct sockaddr *, socklen_t *, char *, int, int);
-extern int sockets_sendto_recvfrom(int, int *, int, struct sockaddr *, socklen_t *, char *, int, int);
+extern void print_mark(unsigned int);
+extern int sockets_create(int, int *, unsigned int, uint16_t, sock_type_t);
+extern int sockets_close(int, int *, unsigned int);
+extern int sockets_connect(int, int *, unsigned int, struct sockaddr *,
+    socklen_t);
+extern int sockets_sendto(int, int *, unsigned int, struct sockaddr *,
+    socklen_t, char *, size_t, unsigned int, sock_type_t);
+extern int sockets_recvfrom(int, int *, unsigned int, struct sockaddr *,
+    socklen_t *, char *, size_t, unsigned int);
+extern int sockets_sendto_recvfrom(int, int *, unsigned int, struct sockaddr *,
+    socklen_t *, char *, size_t, unsigned int, sock_type_t);
 
 #endif

uspace/app/nettest1/nettest1.c

@@ -253 +253 @@
         
         rc = sockets_sendto_recvfrom(verbose, socket_ids, nsockets, address,
-            &addrlen, data, size, nmessages);
+            &addrlen, data, size, nmessages, type);
         if (rc != EOK)
                 return rc;
@@ -278 +278 @@
         
         rc = sockets_sendto(verbose, socket_ids, nsockets, address, addrlen,
-            data, size, nmessages);
+            data, size, nmessages, type);
         if (rc != EOK)
                 return rc;
@@ -335 +335 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, family);
                 
                 if (rc != EOK) {

uspace/app/nettest2/nettest2.c

@@ -271 +271 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, family);
                 
                 if (rc != EOK) {
@@ -375 +375 @@
         
         rc = sockets_sendto_recvfrom(verbose, socket_ids, sockets, address,
-            &addrlen, data, size, messages);
+            &addrlen, data, size, messages, type);
         if (rc != EOK)
                 return rc;
@@ -399 +399 @@
         
         rc = sockets_sendto(verbose, socket_ids, sockets, address, addrlen,
-            data, size, messages);
+            data, size, messages, type);
         if (rc != EOK)
                 return rc;

uspace/app/nettest3/nettest3.c

@@ -78 +78 @@
                 if (rc != EOK) {
                         /* Try interpreting as a host name */
-                        rc = dnsr_name2host(argv[1], &hinfo);
+                        rc = dnsr_name2host(argv[1], &hinfo, AF_INET);
                         if (rc != EOK) {
                                 printf("Error resolving host '%s'.\n", argv[1]);

uspace/app/nterm/conn.c

@@ -84 +84 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, 0);
                 
                 if (rc != EOK) {

uspace/app/ping/ping.c

@@ -42 +42 @@
 #include <inet/inetping.h>
 #include <io/console.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
+#include <str_error.h>
 #include <sys/types.h>
 
@@ -54 +57 @@
 #define PING_TIMEOUT (1000 * 1000)
 
+typedef enum {
+        RECEIVED_NONE,
+        RECEIVED_SUCCESS,
+        RECEIVED_INTERRUPT
+} received_t;
+
+static received_t received;
+static FIBRIL_CONDVAR_INITIALIZE(received_cv);
+static FIBRIL_MUTEX_INITIALIZE(received_lock);
+
+static bool quit = false;
+static FIBRIL_CONDVAR_INITIALIZE(quit_cv);
+static FIBRIL_MUTEX_INITIALIZE(quit_lock);
+
 static int ping_ev_recv(inetping_sdu_t *);
-
-static bool done = false;
-static FIBRIL_CONDVAR_INITIALIZE(done_cv);
-static FIBRIL_MUTEX_INITIALIZE(done_lock);
 
 static inetping_ev_ops_t ev_ops = {
@@ -67 +80 @@
 static addr32_t dest;
 
-static bool ping_repeat = false;
+static bool repeat_forever = false;
+static size_t repeat_count = 1;
+
+static const char *short_options = "rn:";
 
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <host>\n");
-}
-
-static void ping_signal_done(void)
-{
-        fibril_mutex_lock(&done_lock);
-        done = true;
-        fibril_mutex_unlock(&done_lock);
-        fibril_condvar_broadcast(&done_cv);
+        printf("Syntax: %s [-n <count>|-r] <host>\n", NAME);
+}
+
+static void ping_signal_received(received_t value)
+{
+        fibril_mutex_lock(&received_lock);
+        received = value;
+        fibril_mutex_unlock(&received_lock);
+        fibril_condvar_broadcast(&received_cv);
+}
+
+static void ping_signal_quit(void)
+{
+        fibril_mutex_lock(&quit_lock);
+        quit = true;
+        fibril_mutex_unlock(&quit_lock);
+        fibril_condvar_broadcast(&quit_cv);
 }
 
@@ -105 +129 @@
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         
-        if (!ping_repeat)
-                ping_signal_done();
+        ping_signal_received(RECEIVED_SUCCESS);
         
         free(asrc);
@@ -116 +139 @@
 {
         inetping_sdu_t sdu;
-        int rc;
-
+        
         sdu.src = src;
         sdu.dest = dest;
@@ -123 +145 @@
         sdu.data = (void *) "foo";
         sdu.size = 3;
-
-        rc = inetping_send(&sdu);
-        if (rc != EOK) {
-                printf(NAME ": Failed sending echo request (%d).\n", rc);
-                return rc;
-        }
-
-        return EOK;
+        
+        int rc = inetping_send(&sdu);
+        if (rc != EOK)
+                printf("Failed sending echo request: %s (%d).\n",
+                    str_error(rc), rc);
+        
+        return rc;
 }
 
@@ -136 +157 @@
 {
         uint16_t seq_no = 0;
-
+        
+        while ((repeat_count--) || (repeat_forever)) {
+                fibril_mutex_lock(&received_lock);
+                received = RECEIVED_NONE;
+                fibril_mutex_unlock(&received_lock);
+                
+                (void) ping_send(++seq_no);
+                
+                fibril_mutex_lock(&received_lock);
+                int rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                    PING_TIMEOUT);
+                received_t recv = received;
+                fibril_mutex_unlock(&received_lock);
+                
+                if ((rc == ETIMEOUT) || (recv == RECEIVED_NONE))
+                        printf("Echo request timed out (seq. no %u)\n", seq_no);
+                
+                if (recv == RECEIVED_INTERRUPT)
+                        break;
+                
+                if ((repeat_count > 0) || (repeat_forever)) {
+                        fibril_mutex_lock(&received_lock);
+                        rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                            PING_DELAY);
+                        recv = received;
+                        fibril_mutex_unlock(&received_lock);
+                        
+                        if (recv == RECEIVED_INTERRUPT)
+                                break;
+                }
+        }
+        
+        ping_signal_quit();
+        return 0;
+}
+
+static int input_fibril(void *arg)
+{
+        console_ctrl_t *con = console_init(stdin, stdout);
+        
         while (true) {
-                fibril_mutex_lock(&done_lock);
-                if (done) {
-                        fibril_mutex_unlock(&done_lock);
-                        return 0;
-                }
-                fibril_mutex_unlock(&done_lock);
-
-                (void) ping_send(++seq_no);
-                async_usleep(PING_DELAY);
-        }
-
-        return 0;
-}
-
-static int input_fibril(void *arg)
-{
-        console_ctrl_t *con;
-        cons_event_t ev;
-
-        con = console_init(stdin, stdout);
-        printf("[Press Ctrl-Q to quit]\n");
-
-        while (true) {
+                cons_event_t ev;
                 if (!console_get_event(con, &ev))
                         break;
-
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
-                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
+                
+                if ((ev.type == CEV_KEY) && (ev.ev.key.type == KEY_PRESS) &&
+                    ((ev.ev.key.mods & (KM_ALT | KM_SHIFT)) == 0) &&
+                    ((ev.ev.key.mods & KM_CTRL) != 0)) {
                         /* Ctrl+key */
                         if (ev.ev.key.key == KC_Q) {
-                                ping_signal_done();
-                                return 0;
+                                ping_signal_received(RECEIVED_INTERRUPT);
+                                break;
                         }
                 }
         }
-
+        
         return 0;
 }
@@ -184 +222 @@
         char *adest = NULL;
         char *sdest = NULL;
-        int rc;
-        int argi;
-
-        rc = inetping_init(&ev_ops);
-        if (rc != EOK) {
-                printf(NAME ": Failed connecting to internet ping service "
-                    "(%d).\n", rc);
-                goto error;
-        }
-
-        argi = 1;
-        if (argi < argc && str_cmp(argv[argi], "-r") == 0) {
-                ping_repeat = true;
-                ++argi;
-        } else {
-                ping_repeat = false;
-        }
-
-        if (argc - argi != 1) {
+        
+        int rc = inetping_init(&ev_ops);
+        if (rc != EOK) {
+                printf("Failed connecting to internet ping service: "
+                    "%s (%d).\n", str_error(rc), rc);
+                goto error;
+        }
+        
+        int c;
+        while ((c = getopt(argc, argv, short_options)) != -1) {
+                switch (c) {
+                case 'r':
+                        repeat_forever = true;
+                        break;
+                case 'n':
+                        rc = str_size_t(optarg, NULL, 10, true, &repeat_count);
+                        if (rc != EOK) {
+                                printf("Invalid repeat count.\n");
+                                print_syntax();
+                                goto error;
+                        }
+                        break;
+                default:
+                        printf("Unknown option passed.\n");
+                        print_syntax();
+                        goto error;
+                }
+        }
+        
+        if (optind >= argc) {
+                printf("IP address or host name not supplied.\n");
                 print_syntax();
                 goto error;
         }
-
+        
         /* Parse destination address */
         inet_addr_t dest_addr;
-        rc = inet_addr_parse(argv[argi], &dest_addr);
+        rc = inet_addr_parse(argv[optind], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo);
+                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
                 if (rc != EOK) {
-                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
+                        printf("Error resolving host '%s'.\n", argv[optind]);
                         goto error;
                 }
@@ -223 +273 @@
         uint16_t af = inet_addr_get(&dest_addr, &dest, NULL);
         if (af != AF_INET) {
-                printf(NAME ": Destination '%s' is not an IPv4 address.\n",
-                    argv[argi]);
+                printf("Destination '%s' is not an IPv4 address.\n",
+                    argv[optind]);
                 goto error;
         }
@@ -231 +281 @@
         rc = inetping_get_srcaddr(dest, &src);
         if (rc != EOK) {
-                printf(NAME ": Failed determining source address.\n");
+                printf("Failed determining source address.\n");
                 goto error;
         }
@@ -240 +290 @@
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -246 +296 @@
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -253 +303 @@
                 rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
                 if (rc < 0) {
-                        printf(NAME ": Out of memory.\n");
+                        printf("Out of memory.\n");
                         goto error;
                 }
@@ -260 +310 @@
                 adest = NULL;
         }
-
-        printf("Sending ICMP echo request from %s to %s.\n",
+        
+        printf("Sending ICMP echo request from %s to %s (Ctrl+Q to quit)\n",
             asrc, sdest);
-
-        fid_t fid;
-
-        if (ping_repeat) {
-                fid = fibril_create(transmit_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating transmit fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-
-                fid = fibril_create(input_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating input fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-        } else {
-                ping_send(1);
-        }
-
-        fibril_mutex_lock(&done_lock);
-        rc = EOK;
-        while (!done && rc != ETIMEOUT) {
-                rc = fibril_condvar_wait_timeout(&done_cv, &done_lock,
-                        ping_repeat ? 0 : PING_TIMEOUT);
-        }
-        fibril_mutex_unlock(&done_lock);
-
-        if (rc == ETIMEOUT) {
-                printf(NAME ": Echo request timed out.\n");
-                goto error;
-        }
-
+        
+        fid_t fid = fibril_create(transmit_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating transmit fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fid = fibril_create(input_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating input fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fibril_mutex_lock(&quit_lock);
+        while (!quit)
+                fibril_condvar_wait(&quit_cv, &quit_lock);
+        fibril_mutex_unlock(&quit_lock);
+        
         free(asrc);
         free(adest);

uspace/app/ping6/ping6.c

@@ -42 +42 @@
 #include <inet/inetping6.h>
 #include <io/console.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
+#include <str_error.h>
 #include <sys/types.h>
 
@@ -54 +57 @@
 #define PING_TIMEOUT (1000 * 1000)
 
+typedef enum {
+        RECEIVED_NONE,
+        RECEIVED_SUCCESS,
+        RECEIVED_INTERRUPT
+} received_t;
+
+static received_t received;
+static FIBRIL_CONDVAR_INITIALIZE(received_cv);
+static FIBRIL_MUTEX_INITIALIZE(received_lock);
+
+static bool quit = false;
+static FIBRIL_CONDVAR_INITIALIZE(quit_cv);
+static FIBRIL_MUTEX_INITIALIZE(quit_lock);
+
 static int ping_ev_recv(inetping6_sdu_t *);
-
-static bool done = false;
-static FIBRIL_CONDVAR_INITIALIZE(done_cv);
-static FIBRIL_MUTEX_INITIALIZE(done_lock);
 
 static inetping6_ev_ops_t ev_ops = {
@@ -67 +80 @@
 static addr128_t dest;
 
-static bool ping_repeat = false;
+static bool repeat_forever = false;
+static size_t repeat_count = 1;
+
+static const char *short_options = "rn:";
 
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " [-r] <host>\n");
-}
-
-static void ping_signal_done(void)
-{
-        fibril_mutex_lock(&done_lock);
-        done = true;
-        fibril_mutex_unlock(&done_lock);
-        fibril_condvar_broadcast(&done_cv);
+        printf("Syntax: %s [-n <count>|-r] <host>\n", NAME);
+}
+
+static void ping_signal_received(received_t value)
+{
+        fibril_mutex_lock(&received_lock);
+        received = value;
+        fibril_mutex_unlock(&received_lock);
+        fibril_condvar_broadcast(&received_cv);
+}
+
+static void ping_signal_quit(void)
+{
+        fibril_mutex_lock(&quit_lock);
+        quit = true;
+        fibril_mutex_unlock(&quit_lock);
+        fibril_condvar_broadcast(&quit_cv);
 }
 
@@ -105 +129 @@
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         
-        if (!ping_repeat)
-                ping_signal_done();
+        ping_signal_received(RECEIVED_SUCCESS);
         
         free(asrc);
@@ -116 +139 @@
 {
         inetping6_sdu_t sdu;
-        int rc;
-
+        
         addr128(src, sdu.src);
         addr128(dest, sdu.dest);
@@ -123 +145 @@
         sdu.data = (void *) "foo";
         sdu.size = 3;
-
-        rc = inetping6_send(&sdu);
-        if (rc != EOK) {
-                printf(NAME ": Failed sending echo request (%d).\n", rc);
-                return rc;
-        }
-
-        return EOK;
+        
+        int rc = inetping6_send(&sdu);
+        if (rc != EOK)
+                printf("Failed sending echo request: %s (%d).\n",
+                    str_error(rc), rc);
+        
+        return rc;
 }
 
@@ -136 +157 @@
 {
         uint16_t seq_no = 0;
-
+        
+        while ((repeat_count--) || (repeat_forever)) {
+                fibril_mutex_lock(&received_lock);
+                received = RECEIVED_NONE;
+                fibril_mutex_unlock(&received_lock);
+                
+                (void) ping_send(++seq_no);
+                
+                fibril_mutex_lock(&received_lock);
+                int rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                    PING_TIMEOUT);
+                received_t recv = received;
+                fibril_mutex_unlock(&received_lock);
+                
+                if ((rc == ETIMEOUT) || (recv == RECEIVED_NONE))
+                        printf("Echo request timed out (seq. no %u)\n", seq_no);
+                
+                if (recv == RECEIVED_INTERRUPT)
+                        break;
+                
+                if ((repeat_count > 0) || (repeat_forever)) {
+                        fibril_mutex_lock(&received_lock);
+                        rc = fibril_condvar_wait_timeout(&received_cv, &received_lock,
+                            PING_DELAY);
+                        recv = received;
+                        fibril_mutex_unlock(&received_lock);
+                        
+                        if (recv == RECEIVED_INTERRUPT)
+                                break;
+                }
+        }
+        
+        ping_signal_quit();
+        return 0;
+}
+
+static int input_fibril(void *arg)
+{
+        console_ctrl_t *con = console_init(stdin, stdout);
+        
         while (true) {
-                fibril_mutex_lock(&done_lock);
-                if (done) {
-                        fibril_mutex_unlock(&done_lock);
-                        return 0;
-                }
-                fibril_mutex_unlock(&done_lock);
-
-                (void) ping_send(++seq_no);
-                async_usleep(PING_DELAY);
-        }
-
-        return 0;
-}
-
-static int input_fibril(void *arg)
-{
-        console_ctrl_t *con;
-        cons_event_t ev;
-
-        con = console_init(stdin, stdout);
-        printf("[Press Ctrl-Q to quit]\n");
-
-        while (true) {
+                cons_event_t ev;
                 if (!console_get_event(con, &ev))
                         break;
-
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
-                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
+                
+                if ((ev.type == CEV_KEY) && (ev.ev.key.type == KEY_PRESS) &&
+                    ((ev.ev.key.mods & (KM_ALT | KM_SHIFT)) == 0) &&
+                    ((ev.ev.key.mods & KM_CTRL) != 0)) {
                         /* Ctrl+key */
                         if (ev.ev.key.key == KC_Q) {
-                                ping_signal_done();
-                                return 0;
+                                ping_signal_received(RECEIVED_INTERRUPT);
+                                break;
                         }
                 }
         }
-
+        
         return 0;
 }
@@ -184 +222 @@
         char *adest = NULL;
         char *sdest = NULL;
-        int rc;
-        int argi;
-
-        rc = inetping6_init(&ev_ops);
-        if (rc != EOK) {
-                printf(NAME ": Failed connecting to internet ping service "
-                    "(%d).\n", rc);
-                goto error;
-        }
-
-        argi = 1;
-        if (argi < argc && str_cmp(argv[argi], "-r") == 0) {
-                ping_repeat = true;
-                ++argi;
-        } else {
-                ping_repeat = false;
-        }
-
-        if (argc - argi != 1) {
+        
+        int rc = inetping6_init(&ev_ops);
+        if (rc != EOK) {
+                printf("Failed connecting to internet ping service: "
+                    "%s (%d).\n", str_error(rc), rc);
+                goto error;
+        }
+        
+        int c;
+        while ((c = getopt(argc, argv, short_options)) != -1) {
+                switch (c) {
+                case 'r':
+                        repeat_forever = true;
+                        break;
+                case 'n':
+                        rc = str_size_t(optarg, NULL, 10, true, &repeat_count);
+                        if (rc != EOK) {
+                                printf("Invalid repeat count.\n");
+                                print_syntax();
+                                goto error;
+                        }
+                        break;
+                default:
+                        printf("Unknown option passed.\n");
+                        print_syntax();
+                        goto error;
+                }
+        }
+        
+        if (optind >= argc) {
+                printf("IP address or host name not supplied.\n");
                 print_syntax();
                 goto error;
         }
-
+        
         /* Parse destination address */
         inet_addr_t dest_addr;
-        rc = inet_addr_parse(argv[argi], &dest_addr);
+        rc = inet_addr_parse(argv[optind], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo);
+                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
                 if (rc != EOK) {
-                        printf(NAME ": Error resolving host '%s'.\n", argv[argi]);
+                        printf("Error resolving host '%s'.\n", argv[optind]);
                         goto error;
                 }
@@ -223 +273 @@
         uint16_t af = inet_addr_get(&dest_addr, NULL, &dest);
         if (af != AF_INET6) {
-                printf(NAME ": Destination '%s' is not an IPv6 address.\n",
-                    argv[argi]);
+                printf("Destination '%s' is not an IPv6 address.\n",
+                    argv[optind]);
                 goto error;
         }
@@ -231 +281 @@
         rc = inetping6_get_srcaddr(dest, src);
         if (rc != EOK) {
-                printf(NAME ": Failed determining source address.\n");
+                printf("Failed determining source address.\n");
                 goto error;
         }
@@ -240 +290 @@
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -246 +296 @@
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
+                printf("Out of memory.\n");
                 goto error;
         }
@@ -253 +303 @@
                 rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
                 if (rc < 0) {
-                        printf(NAME ": Out of memory.\n");
+                        printf("Out of memory.\n");
                         goto error;
                 }
@@ -260 +310 @@
                 adest = NULL;
         }
-
-        printf("Sending ICMP echo request from %s to %s.\n",
+        
+        printf("Sending ICMP echo request from %s to %s (Ctrl+Q to quit)\n",
             asrc, sdest);
-
-        fid_t fid;
-
-        if (ping_repeat) {
-                fid = fibril_create(transmit_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating transmit fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-
-                fid = fibril_create(input_fibril, NULL);
-                if (fid == 0) {
-                        printf(NAME ": Failed creating input fibril.\n");
-                        goto error;
-                }
-
-                fibril_add_ready(fid);
-        } else {
-                ping_send(1);
-        }
-
-        fibril_mutex_lock(&done_lock);
-        rc = EOK;
-        while (!done && rc != ETIMEOUT) {
-                rc = fibril_condvar_wait_timeout(&done_cv, &done_lock,
-                        ping_repeat ? 0 : PING_TIMEOUT);
-        }
-        fibril_mutex_unlock(&done_lock);
-
-        if (rc == ETIMEOUT) {
-                printf(NAME ": Echo request timed out.\n");
-                goto error;
-        }
-
+        
+        fid_t fid = fibril_create(transmit_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating transmit fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fid = fibril_create(input_fibril, NULL);
+        if (fid == 0) {
+                printf("Failed creating input fibril.\n");
+                goto error;
+        }
+        
+        fibril_add_ready(fid);
+        
+        fibril_mutex_lock(&quit_lock);
+        while (!quit)
+                fibril_condvar_wait(&quit_cv, &quit_lock);
+        fibril_mutex_unlock(&quit_lock);
+        
         free(asrc);
         free(adest);

uspace/app/tester/mm/common.c

@@ -84 +84 @@
 }
 
-static bool overlap_match(link_t *link, void *addr, size_t size)
-{
-        mem_block_t *block = list_get_instance(link, mem_block_t, link);
-        
+static bool overlap_match(mem_block_t *block, void *addr, size_t size)
+{
         /* Entry block control structure <mbeg, mend) */
         uint8_t *mbeg = (uint8_t *) block;
@@ -125 +123 @@
         bool fnd = false;
         
-        list_foreach(mem_blocks, link) {
-                if (overlap_match(link, addr, size)) {
+        list_foreach(mem_blocks, link, mem_block_t, block) {
+                if (overlap_match(block, addr, size)) {
                         fnd = true;
                         break;

uspace/app/trace/trace.c

@@ -724 +724 @@
         o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STAT, o);
+        o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_STATFS, o);
 
         proto_register(SERVICE_VFS, p);

uspace/app/usbinfo/dump.c

@@ -103 +103 @@
 void dump_match_ids(match_id_list_t *matches, const char *line_prefix)
 {
-        list_foreach(matches->ids, link) {
-                match_id_t *match = list_get_instance(link, match_id_t, link);
-
+        list_foreach(matches->ids, link, match_id_t, match) {
                 printf("%s%3d %s\n", line_prefix, match->score, match->id);
         }

uspace/app/usbinfo/hid.c

@@ -100 +100 @@
         printf("%sParsed HID report descriptor for interface %d\n",
             get_indent(0), iface_no);
-        list_foreach(report->reports, report_it) {
-                usb_hid_report_description_t *description = list_get_instance(
-                    report_it, usb_hid_report_description_t, reports_link);
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, description) {
                 printf("%sReport %d (type %d)\n", get_indent(1),
                     (int) description->report_id,
                     (int) description->type);
-                list_foreach(description->report_items, item_it) {
-                        usb_hid_report_field_t *field = list_get_instance(
-                            item_it, usb_hid_report_field_t, ritems_link);
+                list_foreach(description->report_items, ritems_link,
+                    usb_hid_report_field_t, field) {
                         printf("%sUsage page = 0x%04x    Usage = 0x%04x\n",
                             get_indent(2),