Changeset 0773396 in mainline for uspace/app

Timestamp:

2013-12-25T13:05:25Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/mount/mount.c (modified) (1 diff)
• corecfg/Makefile (moved) (moved from uspace/app/ping6/Makefile ) (2 diffs)
• corecfg/corecfg.c (added)
• devctl/devctl.c (modified) (7 diffs)
• df/Makefile (moved) (moved from uspace/lib/c/arch/ia32/src/setjmp.S ) (2 diffs)
• df/df.c (added)
• dnsres/dnsres.c (modified) (4 diffs)
• download/Makefile (added)
• download/main.c (added)
• edit/sheet.c (modified) (4 diffs)
• getterm/getterm.c (modified) (2 diffs)
• inet/inet.c (modified) (2 diffs)
• init/init.c (modified) (2 diffs)
• klog/klog.c (modified) (1 diff)
• netspeed/Makefile (added)
• netspeed/netspeed.c (added)
• nettest1/nettest1.c (modified) (4 diffs)
• nettest2/nettest2.c (modified) (5 diffs)
• nettest3/nettest3.c (modified) (7 diffs)
• nterm/conn.c (modified) (5 diffs)
• ping/ping.c (modified) (8 diffs)
• ping6/ping6.c (deleted)
• sportdmp/sportdmp.c (modified) (9 diffs)
• tester/Makefile (modified) (1 diff)
• tester/mm/common.c (modified) (2 diffs)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (2 diffs)
• tester/thread/setjmp1.c (added)
• tester/thread/setjmp1.def (added)
• trace/trace.c (modified) (1 diff)
• untar/Makefile (added)
• untar/main.c (added)
• untar/tar.c (added)
• untar/tar.h (added)
• usbinfo/dump.c (modified) (1 diff)
• usbinfo/hid.c (modified) (1 diff)
• viewer/Makefile (added)
• viewer/viewer.c (added)
• wavplay/dplay.c (modified) (5 diffs)
• wavplay/drec.c (modified) (1 diff)
• wavplay/main.c (modified) (2 diffs)
• wavplay/wave.c (modified) (2 diffs)

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/corecfg/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2013 Antonin Steinhauser
+# Copyright (c) 2013 Jiri Svoboda
 # All rights reserved.
 #
@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-BINARY = ping6
+BINARY = corecfg
 
 SOURCES = \
-        ping6.c
+        corecfg.c
 
 include $(USPACE_PREFIX)/Makefile.common

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/df/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2008 Josef Cejka
+# Copyright (c) 2013 Manuele Conti
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-#include <libarch/context_offset.h>
+USPACE_PREFIX = ../..
+BINARY = df
 
-.text
-.global setjmp
-.global longjmp
+SOURCES = \
+        df.c 
 
-.type setjmp,@function
-setjmp:
-        movl 0(%esp), %eax  # save pc value into eax
-        movl 4(%esp), %edx  # address of the jmp_buf structure to save context to
-        
-        # save registers to the jmp_buf structure
-        CONTEXT_SAVE_ARCH_CORE %edx %eax
-        
-        xorl %eax, %eax     # set_jmp returns 0
-        ret
-
-.type longjmp,@function
-longjmp:
-        movl 4(%esp), %ecx  # put address of jmp_buf into ecx
-        movl 8(%esp), %eax  # put return value into eax
-        
-        # restore registers from the jmp_buf structure
-        CONTEXT_RESTORE_ARCH_CORE %ecx %edx
-        
-        movl %edx, 0(%esp)  # put saved pc on stack
-        ret
+include $(USPACE_PREFIX)/Makefile.common

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>
@@ -54 +53 @@
         }
         
-        uint16_t af;
+        uint16_t ver;
         char *hname;
         
@@ -63 +62 @@
                 }
                 
-                af = AF_INET;
+                ver = ip_v4;
                 hname = argv[2];
         } else if (str_cmp(argv[1], "-6") == 0) {
@@ -71 +70 @@
                 }
                 
-                af = AF_INET6;
+                ver = ip_v6;
                 hname = argv[2];
         } else {
-                af = 0;
+                ver = ip_any;
                 hname = argv[1];
         }
         
         dnsr_hostinfo_t *hinfo;
-        int rc = dnsr_name2host(hname, &hinfo, af);
+        int rc = dnsr_name2host(hname, &hinfo, ver);
         if (rc != EOK) {
                 printf("%s: Error resolving '%s'.\n", NAME, hname);

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/getterm/getterm.c

@@ -112 +112 @@
         reopen(&stderr, 2, term, O_WRONLY, "w");
         
-        /*
-         * FIXME: fdopen() should actually detect that we are opening a console
-         * and it should set line-buffering mode automatically.
-         */
-        setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
-        
         if (stdin == NULL)
                 return -2;
@@ -126 +120 @@
         if (stderr == NULL)
                 return -4;
+        
+        /*
+         * FIXME: fdopen() should actually detect that we are opening a console
+         * and it should set line-buffering mode automatically.
+         */
+        setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
         
         version_print(term);

uspace/app/inet/inet.c

@@ -312 +312 @@
 }
 
+static int link_list(void)
+{
+        sysarg_t *link_list;
+        inet_link_info_t linfo;
+
+        size_t count;
+        size_t i;
+        int rc;
+
+        rc = inetcfg_get_link_list(&link_list, &count);
+        if (rc != EOK) {
+                printf(NAME ": Failed getting link list.\n");
+                return rc;
+        }
+
+        printf("IP links:\n");
+        if (count > 0)
+                printf("    [Link-layer Address] [Link-Name] [Def-MTU]\n");
+
+        for (i = 0; i < count; i++) {
+                rc = inetcfg_link_get(link_list[i], &linfo);
+                if (rc != EOK) {
+                        printf("Failed getting properties of link %zu.\n",
+                            (size_t)link_list[i]);
+                        continue;
+                }
+
+                printf("    %02x:%02x:%02x:%02x:%02x:%02x %s %zu\n",
+                    linfo.mac_addr[0], linfo.mac_addr[1],
+                    linfo.mac_addr[2], linfo.mac_addr[3],
+                    linfo.mac_addr[4], linfo.mac_addr[5],
+                    linfo.name, linfo.def_mtu);
+
+                free(linfo.name);
+
+                linfo.name = NULL;
+        }
+
+        if (count == 0)
+                printf("    None\n");
+
+        free(link_list);
+
+        return EOK;
+}
+
 static int sroute_list(void)
 {
@@ -404 +450 @@
                 if (rc != EOK)
                         return 1;
+                rc = link_list();
+                if (rc != EOK)
+                        return 1;
                 return 0;
         }

uspace/app/init/init.c

@@ -360 +360 @@
         srv_start("/srv/udp");
         srv_start("/srv/dnsrsrv");
+        srv_start("/srv/dhcp");
+        srv_start("/srv/nconfsrv");
         
         srv_start("/srv/clipboard");
@@ -384 +386 @@
         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/nettest1/nettest1.c

@@ -38 +38 @@
 #include "print_error.h"
 
+#include <assert.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -59 +60 @@
 #define NETTEST1_TEXT  "Networking test 1 - sockets"
 
-static uint16_t family = AF_INET;
+static uint16_t family = AF_NONE;
 static sock_type_t type = SOCK_DGRAM;
 static size_t size = 27;
@@ -326 +327 @@
         }
         
-        char *addr_s = argv[argc - 1];
+        char *host = argv[argc - 1];
         
         /* Interpret as address */
-        inet_addr_t addr_addr;
-        rc = inet_addr_parse(addr_s, &addr_addr);
+        inet_addr_t iaddr;
+        rc = inet_addr_parse(host, &iaddr);
         
         if (rc != EOK) {
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, family);
+                rc = dnsr_name2host(host, &hinfo, ipver_from_af(family));
                 
                 if (rc != EOK) {
-                        printf("Error resolving host '%s'.\n", addr_s);
+                        printf("Error resolving host '%s'.\n", host);
                         return EINVAL;
                 }
                 
-                addr_addr = hinfo->addr;
-        }
-        
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
-        
-        if (af != family) {
+                iaddr = hinfo->addr;
+        }
+        
+        rc = inet_addr_sockaddr(&iaddr, port, &address, &addrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                printf("Out of memory.\n");
+                return ENOMEM;
+        }
+        
+        if (family == AF_NONE)
+                family = address->sa_family;
+        
+        if (address->sa_family != family) {
                 printf("Address family does not match explicitly set family.\n");
                 return EINVAL;
-        }
-        
-        /* Prepare the address buffer */
-        
-        switch (af) {
-        case AF_INET:
-                addr.sin_port = htons(port);
-                address = (struct sockaddr *) &addr;
-                addrlen = sizeof(addr);
-                break;
-        case AF_INET6:
-                addr6.sin6_port = htons(port);
-                address = (struct sockaddr *) &addr6;
-                addrlen = sizeof(addr6);
-                break;
-        default:
-                fprintf(stderr, "Address family is not supported\n");
-                return EAFNOSUPPORT;
         }
         
@@ -434 +423 @@
             &time_before));
         
+        free(address);
+        
         if (verbose)
                 printf("Exiting\n");

uspace/app/nettest2/nettest2.c

@@ -38 +38 @@
 #include "print_error.h"
 
+#include <assert.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -60 +61 @@
 #define NETTEST2_TEXT  "Networking test 2 - transfer"
 
-static uint16_t family = PF_INET;
+static uint16_t family = AF_NONE;
 static size_t size = 28;
 static bool verbose = false;
@@ -271 +272 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, family);
+                rc = dnsr_name2host(addr_s, &hinfo, ipver_from_af(family));
                 
                 if (rc != EOK) {
@@ -281 +282 @@
         }
         
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
-        
-        if (af != family) {
+        struct sockaddr *address;
+        socklen_t addrlen;
+        rc = inet_addr_sockaddr(&addr_addr, port, &address, &addrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                printf("Out of memory.\n");
+                return ENOMEM;
+        }
+        
+        if (family == AF_NONE)
+                family = address->sa_family;
+        
+        if (address->sa_family != family) {
                 printf("Address family does not match explicitly set family.\n");
                 return EINVAL;
-        }
-        
-        /* Prepare the address buffer */
-        
-        struct sockaddr *address;
-        socklen_t addrlen;
-        
-        switch (af) {
-        case AF_INET:
-                addr.sin_port = htons(port);
-                address = (struct sockaddr *) &addr;
-                addrlen = sizeof(addr);
-                break;
-        case AF_INET6:
-                addr6.sin6_port = htons(port);
-                address = (struct sockaddr *) &addr6;
-                addrlen = sizeof(addr6);
-                break;
-        default:
-                fprintf(stderr, "Address family is not supported\n");
-                return EAFNOSUPPORT;
         }
         
@@ -424 +412 @@
                 return rc;
         
+        free(address);
+        
         if (verbose)
                 printf("\nExiting\n");

uspace/app/nettest3/nettest3.c

@@ -37 +37 @@
 #include <async.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <str.h>
 
@@ -52 +53 @@
 static char buf[BUF_SIZE];
 
-static struct sockaddr_in addr;
+static struct sockaddr *address;
+static socklen_t addrlen;
 
 static uint16_t port;
@@ -62 +64 @@
         char *endptr;
         dnsr_hostinfo_t *hinfo;
+        inet_addr_t addr;
+        char *addr_s;
 
         port = 7;
@@ -69 +73 @@
 
         /* Connect to local IP address by default */
-        addr.sin_family = AF_INET;
-        addr.sin_port = htons(port);
-        addr.sin_addr.s_addr = htonl(0x7f000001);
+        inet_addr(&addr, 127, 0, 0, 1);
 
         if (argc >= 2) {
                 printf("parsing address '%s'\n", argv[1]);
-                rc = inet_pton(AF_INET, argv[1], (uint8_t *)&addr.sin_addr.s_addr);
+                rc = inet_addr_parse(argv[1], &addr);
                 if (rc != EOK) {
                         /* Try interpreting as a host name */
-                        rc = dnsr_name2host(argv[1], &hinfo, AF_INET);
+                        rc = dnsr_name2host(argv[1], &hinfo, ip_v4);
                         if (rc != EOK) {
                                 printf("Error resolving host '%s'.\n", argv[1]);
                                 return rc;
                         }
-                        
-                        uint16_t af = inet_addr_sockaddr_in(&hinfo->addr, &addr, NULL);
-                        if (af != AF_INET) {
-                                printf("Host '%s' not resolved as IPv4 address.\n", argv[1]);
-                                return rc;
-                        }
+
+                        addr = hinfo->addr;
                 }
-                printf("result: rc=%d, family=%d, addr=%x\n", rc,
-                    addr.sin_family, addr.sin_addr.s_addr);
+                rc = inet_addr_format(&addr, &addr_s);
+                if (rc != EOK) {
+                        assert(rc == ENOMEM);
+                        printf("Out of memory.\n");
+                        return rc;
+                }
+                printf("result: rc=%d, ver=%d, addr=%s\n", rc,
+                    addr.version, addr_s);
+                free(addr_s);
         }
 
         if (argc >= 3) {
                 printf("parsing port '%s'\n", argv[2]);
-                addr.sin_port = htons(strtoul(argv[2], &endptr, 10));
+                port = htons(strtoul(argv[2], &endptr, 10));
                 if (*endptr != '\0') {
                         fprintf(stderr, "Error parsing port\n");
@@ -103 +108 @@
         }
 
+        rc = inet_addr_sockaddr(&hinfo->addr, port, &address, &addrlen);
+        if (rc != EOK) {
+                printf("Out of memory.\n");
+                return rc;
+        }
+
         printf("socket()\n");
-        fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+        fd = socket(address->sa_family, SOCK_STREAM, IPPROTO_TCP);
         printf(" -> %d\n", fd);
         if (fd < 0)
@@ -110 +121 @@
 
         printf("connect()\n");
-        rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
+        rc = connect(fd, address, addrlen);
         printf(" -> %d\n", rc);
         if (rc != 0)
@@ -133 +144 @@
         printf(" -> %d\n", rc);
 
+        free(address);
+
         return 0;
 }

uspace/app/nterm/conn.c

@@ -38 +38 @@
 #include <fibril.h>
 #include <inet/dnsr.h>
+#include <net/inet.h>
 #include <net/socket.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <str_error.h>
 #include <sys/types.h>
@@ -73 +75 @@
 }
 
-int conn_open(const char *addr_s, const char *port_s)
+int conn_open(const char *host, const char *port_s)
 {
         int conn_fd = -1;
+        struct sockaddr *saddr = NULL;
+        socklen_t saddrlen;
         
         /* Interpret as address */
-        inet_addr_t addr_addr;
-        int rc = inet_addr_parse(addr_s, &addr_addr);
+        inet_addr_t iaddr;
+        int rc = inet_addr_parse(host, &iaddr);
         
         if (rc != EOK) {
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, 0);
+                rc = dnsr_name2host(host, &hinfo, ip_any);
                 
                 if (rc != EOK) {
-                        printf("Error resolving host '%s'.\n", addr_s);
+                        printf("Error resolving host '%s'.\n", host);
                         goto error;
                 }
                 
-                addr_addr = hinfo->addr;
+                iaddr = hinfo->addr;
         }
-        
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
         
         char *endptr;
@@ -105 +105 @@
         }
         
-        printf("Connecting to host %s port %u\n", addr_s, port);
+        rc = inet_addr_sockaddr(&iaddr, port, &saddr, &saddrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                printf("Out of memory.\n");
+                return ENOMEM;
+        }
         
-        conn_fd = socket(PF_INET, SOCK_STREAM, 0);
+        printf("Connecting to host %s port %u\n", host, port);
+        
+        conn_fd = socket(saddr->sa_family, SOCK_STREAM, 0);
         if (conn_fd < 0)
                 goto error;
         
-        switch (af) {
-        case AF_INET:
-                addr.sin_port = htons(port);
-                rc = connect(conn_fd, (struct sockaddr *) &addr, sizeof(addr));
-                break;
-        case AF_INET6:
-                addr6.sin6_port = htons(port);
-                rc = connect(conn_fd, (struct sockaddr *) &addr6, sizeof(addr6));
-                break;
-        default:
-                printf("Unknown address family.\n");
-                goto error;
-        }
-        
+        rc = connect(conn_fd, saddr, saddrlen);
         if (rc != EOK)
                 goto error;
@@ -134 +128 @@
         fibril_add_ready(rcv_fid);
         
+        free(saddr);
         return EOK;
-        
 error:
         if (conn_fd >= 0) {
@@ -141 +135 @@
                 conn_fd = -1;
         }
+        free(saddr);
         
         return EIO;

uspace/app/ping/ping.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
-#include <net/socket_codes.h>
 #include <inet/dnsr.h>
 #include <inet/addr.h>
@@ -77 +76 @@
 };
 
-static addr32_t src;
-static addr32_t dest;
+static inet_addr_t src_addr;
+static inet_addr_t dest_addr;
 
 static bool repeat_forever = false;
 static size_t repeat_count = 1;
 
-static const char *short_options = "rn:";
+static const char *short_options = "46rn:";
 
 static void print_syntax(void)
 {
-        printf("Syntax: %s [-n <count>|-r] <host>\n", NAME);
+        printf("Syntax: %s [<options>] <host>\n", NAME);
+        printf("\t-n <count> Repeat the specified number of times\n");
+        printf("\t-r         Repeat forever\n");
+        printf("\t-4|-6      Use IPv4 or IPv6 destination host address\n");
 }
 
@@ -108 +110 @@
 static int ping_ev_recv(inetping_sdu_t *sdu)
 {
-        inet_addr_t src_addr;
-        inet_addr_set(sdu->src, &src_addr);
-        
-        inet_addr_t dest_addr;
-        inet_addr_set(sdu->dest, &dest_addr);
-        
         char *asrc;
         int rc = inet_addr_format(&src_addr, &asrc);
@@ -140 +136 @@
         inetping_sdu_t sdu;
         
-        sdu.src = src;
-        sdu.dest = dest;
+        sdu.src = src_addr;
+        sdu.dest = dest_addr;
         sdu.seq_no = seq_no;
         sdu.data = (void *) "foo";
@@ -222 +218 @@
         char *adest = NULL;
         char *sdest = NULL;
+        ip_ver_t ip_ver = ip_any;
         
         int rc = inetping_init(&ev_ops);
@@ -244 +241 @@
                         }
                         break;
+                case '4':
+                        ip_ver = ip_v4;
+                        break;
+                case '6':
+                        ip_ver = ip_v6;
+                        break;
                 default:
                         printf("Unknown option passed.\n");
@@ -258 +261 @@
         
         /* Parse destination address */
-        inet_addr_t dest_addr;
         rc = inet_addr_parse(argv[optind], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
+                rc = dnsr_name2host(argv[optind], &hinfo, ip_ver);
                 if (rc != EOK) {
                         printf("Error resolving host '%s'.\n", argv[optind]);
@@ -271 +273 @@
         }
         
-        uint16_t af = inet_addr_get(&dest_addr, &dest, NULL);
-        if (af != AF_INET) {
-                printf("Destination '%s' is not an IPv4 address.\n",
-                    argv[optind]);
-                goto error;
-        }
-        
         /* Determine source address */
-        rc = inetping_get_srcaddr(dest, &src);
+        rc = inetping_get_srcaddr(&dest_addr, &src_addr);
         if (rc != EOK) {
                 printf("Failed determining source address.\n");
                 goto error;
         }
-        
-        inet_addr_t src_addr;
-        inet_addr_set(src, &src_addr);
         
         rc = inet_addr_format(&src_addr, &asrc);

uspace/app/sportdmp/sportdmp.c

@@ -44 +44 @@
         sysarg_t baud = 9600;
         service_id_t svc_id;
-        
+
         int arg = 1;
         int rc;
-                
+
         if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
                 size_t arg_offset = str_lsize(argv[arg], 7);
@@ -65 +65 @@
                 arg++;
         }
-        
+
         if (argc > arg) {
                 rc = loc_service_get_id(argv[arg], &svc_id, 0);
@@ -77 +77 @@
         else {
                 category_id_t serial_cat_id;
-                
+
                 rc = loc_category_get_id("serial", &serial_cat_id, 0);
                 if (rc != EOK) {
@@ -84 +84 @@
                         return 1;
                 }
-                
+
                 service_id_t *svc_ids;
                 size_t svc_count;
-                
-                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);                if (rc != EOK) {
+
+                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);
+                if (rc != EOK) {
                         fprintf(stderr, "Failed getting list of services\n");
                         return 1;
                 }
-                
+
                 if (svc_count == 0) {
                         fprintf(stderr, "No service in category 'serial'\n");
@@ -98 +99 @@
                         return 1;
                 }
-                
+
                 svc_id = svc_ids[0];
                 free(svc_ids);
         }
-        
+
         if (argc > arg) {
                 fprintf(stderr, "Too many arguments\n");
@@ -108 +109 @@
                 return 1;
         }
-        
-        
+
+
         async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
             IPC_FLAG_BLOCKING);
@@ -115 +116 @@
                 fprintf(stderr, "Failed connecting to service\n");
         }
-        
+
         async_exch_t *exch = async_exchange_begin(sess);
         rc = async_req_4_0(exch, SERIAL_SET_COM_PROPS, baud,
             SERIAL_NO_PARITY, 8, 1);
         async_exchange_end(exch);
-        
+
         if (rc != EOK) {
                 fprintf(stderr, "Failed setting serial properties\n");
                 return 2;
         }
-        
+
         uint8_t *buf = (uint8_t *) malloc(BUF_SIZE);
         if (buf == NULL) {
@@ -131 +132 @@
                 return 3;
         }
-        
+
         while (true) {
                 ssize_t read = char_dev_read(sess, buf, BUF_SIZE);
@@ -144 +145 @@
                 fflush(stdout);
         }
-        
+
         free(buf);
         return 0;
 }
+

uspace/app/tester/Makefile

@@ -37 +37 @@
         util.c \
         thread/thread1.c \
+        thread/setjmp1.c \
         print/print1.c \
         print/print2.c \

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/tester/tester.c

@@ -48 +48 @@
 test_t tests[] = {
 #include "thread/thread1.def"
+#include "thread/setjmp1.def"
 #include "print/print1.def"
 #include "print/print2.def"

uspace/app/tester/tester.h

@@ -39 +39 @@
 #include <stdbool.h>
 #include <stacktrace.h>
+#include <stdio.h>
 
 #define IPC_TEST_SERVICE  10240
@@ -80 +81 @@
 
 extern const char *test_thread1(void);
+extern const char *test_setjmp1(void);
 extern const char *test_print1(void);
 extern const char *test_print2(void);

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),

uspace/app/wavplay/dplay.c

@@ -151 +151 @@
             device_event_callback, pb);
         if (ret != EOK) {
-                printf("Failed to register event callback.\n");
+                printf("Failed to register event callback: %s.\n",
+                    str_error(ret));
                 return;
         }
@@ -285 +286 @@
                             pb->f.sample_format);
                         if (ret != EOK) {
-                                printf("Failed to start playback\n");
+                                printf("Failed to start playback: %s\n",
+                                    str_error(ret));
                                 return;
                         }
@@ -291 +293 @@
                         ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                         if (ret != EOK) {
-                                printf("Failed to update position indicator\n");
+                                printf("Failed to update position indicator "
+                                   "%s\n", str_error(ret));
                         }
                 }
@@ -308 +311 @@
                 const int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
-                        printf("Failed to update position indicator\n");
+                        printf("Failed to update position indicator %s\n",
+                            str_error(ret));
                 }
                 getuptime(&time);
@@ -350 +354 @@
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
-                printf("Failed to get PCM info.\n");
+                printf("Failed to get PCM info: %s.\n", str_error(ret));
                 goto close_session;
         }

uspace/app/wavplay/drec.c

@@ -213 +213 @@
         wave_header_t header;
         fseek(rec.file, sizeof(header), SEEK_SET);
-        const char *error;
-        if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+        if (ret != EOK) {
+                printf("Error parsing wav header\n");
                 goto cleanup;
         }

uspace/app/wavplay/main.c

@@ -79 +79 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Allocate buffer and create new context */
@@ -136 +140 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Connect new playback context */

uspace/app/wavplay/wave.c

@@ -81 +81 @@
         }
 
-        if (uint16_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+        if (uint32_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+                //TODO subchunk 1 sizes other than 16 are allowed ( 18, 40)
+                //http://www-mmsp.ece.mcgill.ca/documents/AudioFormats/WAVE/WAVE.html
                 if (error)
                         *error = "invalid subchunk1 size";
-                return EINVAL;
+//              return EINVAL;
         }
 
@@ -94 +96 @@
 
         if (str_lcmp(header->subchunk2_id, SUBCHUNK2_ID, 4) != 0) {
+                //TODO basedd on subchunk1 size, we might be reading wrong
+                //offset
                 if (error)
                         *error = "invalid subchunk2 id";
-                return EINVAL;
+//              return EINVAL;
         }
 
 
+        //TODO data and data_size are incorrect in extended wav formats
+        //pcm params are OK
         if (data)
                 *data = header->data;