Changeset 4c14b88 in mainline for uspace/app

Timestamp:

2013-12-31T07:57:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

Location:

uspace/app

Files:

• dnsres/dnsres.c (modified) (4 diffs)
• download/Makefile (modified) (1 diff)
• download/main.c (modified) (5 diffs)
• getterm/getterm.c (modified) (2 diffs)
• hdisk/Makefile (added)
• hdisk/common.h (added)
• hdisk/func_gpt.c (added)
• hdisk/func_gpt.h (added)
• hdisk/func_mbr.c (added)
• hdisk/func_mbr.h (added)
• hdisk/func_none.c (added)
• hdisk/func_none.h (added)
• hdisk/hdisk.c (added)
• hdisk/hdisk.h (added)
• hdisk/input.c (added)
• hdisk/input.h (added)
• init/init.c (modified) (1 diff)
• netspeed/netspeed.c (modified) (7 diffs)
• 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)
• tester/Makefile (modified) (1 diff)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (2 diffs)
• tester/thread/setjmp1.c (added)
• tester/thread/setjmp1.def (added)
• untar/Makefile (added)
• untar/main.c (added)
• untar/tar.c (added)
• untar/tar.h (added)
• viewer/Makefile (added)
• viewer/viewer.c (added)

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

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBS = $(LIBHTTP_PREFIX)/libhttp.a $(LIBURI_PREFIX)/liburi.a
-EXTRA_CFLAGS = -I$(LIBHTTP_PREFIX) -I$(LIBURI_PREFIX)
+EXTRA_CFLAGS = -I$(LIBHTTP_PREFIX)/include -I$(LIBURI_PREFIX)
 DEFS = -DRELEASE=$(RELEASE)
 BINARY = download

uspace/app/download/main.c

@@ -47 +47 @@
 #include <net/socket.h>
 
-#include <http.h>
+#include <http/http.h>
 #include <uri.h>
 
@@ -132 +132 @@
                 fprintf(stderr, "Failed creating request\n");
                 uri_destroy(uri);
-                free(server_path);
                 return 3;
         }
         
-        http_header_t *header_host = http_header_create("Host", uri->host);
-        if (header_host == NULL) {
-                fprintf(stderr, "Failed creating Host header\n");
-                uri_destroy(uri);
-                free(server_path);
-                return 3;
-        }
-        list_append(&header_host->link, &req->headers);
-        
-        http_header_t *header_ua = http_header_create("User-Agent", USER_AGENT);
-        if (header_ua == NULL) {
-                fprintf(stderr, "Failed creating User-Agent header\n");
-                uri_destroy(uri);
-                free(server_path);
-                return 3;
-        }
-        list_append(&header_ua->link, &req->headers);
+        int rc = http_headers_append(&req->headers, "Host", uri->host);
+        if (rc != EOK) {
+                fprintf(stderr, "Failed setting Host header: %s\n", str_error(rc));
+                uri_destroy(uri);
+                return rc;
+        }
+        
+        rc = http_headers_append(&req->headers, "User-Agent", USER_AGENT);
+        if (rc != EOK) {
+                fprintf(stderr, "Failed creating User-Agent header: %s\n", str_error(rc));
+                uri_destroy(uri);
+                return rc;
+        }
         
         http_t *http = http_create(uri->host, port);
         if (http == NULL) {
                 uri_destroy(uri);
-                free(server_path);
                 fprintf(stderr, "Failed creating HTTP object\n");
                 return 3;
         }
         
-        int rc = http_connect(http);
+        rc = http_connect(http);
         if (rc != EOK) {
                 fprintf(stderr, "Failed connecting: %s\n", str_error(rc));
                 uri_destroy(uri);
-                free(server_path);
                 return rc;
         }
@@ -174 +167 @@
                 fprintf(stderr, "Failed sending request: %s\n", str_error(rc));
                 uri_destroy(uri);
-                free(server_path);
                 return rc;
         }
         
         http_response_t *response = NULL;
-        rc = http_receive_response(http, &response);
+        rc = http_receive_response(&http->recv_buffer, &response, 16 * 1024,
+            100);
         if (rc != EOK) {
                 fprintf(stderr, "Failed receiving response: %s\n", str_error(rc));
                 uri_destroy(uri);
-                free(server_path);
                 return rc;
         }
@@ -197 +189 @@
                         fprintf(stderr, "Failed allocating buffer\n)");
                         uri_destroy(uri);
-                        free(server_path);
                         return ENOMEM;
                 }
                 
                 int body_size;
-                while ((body_size = http_receive_body(http, buf, buf_size)) > 0) {
+                while ((body_size = recv_buffer(&http->recv_buffer, buf, buf_size)) > 0) {
                         fwrite(buf, 1, body_size, stdout);
                 }
@@ -212 +203 @@
         
         uri_destroy(uri);
-        free(server_path);
         return EOK;
 }

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/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");

uspace/app/netspeed/netspeed.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
+#include <inet/dnsr.h>
+#include <net/in.h>
+#include <net/inet.h>
+#include <net/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41 +46 @@
 #include <str_error.h>
 #include <task.h>
-
-#include <net/in.h>
-#include <net/inet.h>
-#include <net/socket.h>
 
 #define NAME "netspeed"
@@ -114 +115 @@
 }
 
-static int client(sock_type_t sock_type, const char *address, unsigned port,
+static int client(sock_type_t sock_type, const char *host, unsigned port,
     unsigned long count, char *buf, size_t bufsize)
 {
-        struct sockaddr_in addr;
-        
-        addr.sin_family = AF_INET;
-        addr.sin_port = htons(port);
-        
-        int rc = inet_pton(AF_INET, address, (void *) &addr.sin_addr.s_addr);
-        if (rc != EOK) {
-                fprintf(stderr, "inet_pton failed: %s\n", str_error(rc));
-                return rc;
-        }
-        
-        int conn_sd = socket(PF_INET, sock_type, 0);
+        inet_addr_t iaddr;
+        struct sockaddr *saddr;
+        socklen_t saddrlen;
+        
+        int rc = inet_addr_parse(host, &iaddr);
+        if (rc != EOK) {
+                dnsr_hostinfo_t *hinfo = NULL;
+                rc = dnsr_name2host(host, &hinfo, ip_any);
+                if (rc != EOK) {
+                        fprintf(stderr, "Error resolving host '%s'.\n", host);
+                        return ENOENT;
+                }
+                
+                iaddr = hinfo->addr;
+        }
+        
+        rc = inet_addr_sockaddr(&iaddr, port, &saddr, &saddrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                fprintf(stderr, "Out of memory.\n");
+                return ENOMEM;
+        }
+        
+        int conn_sd = socket(saddr->sa_family, sock_type, 0);
         if (conn_sd < 0) {
                 fprintf(stderr, "socket failed: %s\n", str_error(rc));
@@ -135 +148 @@
         
         if (sock_type == SOCK_STREAM) {
-                rc = connect(conn_sd, (struct sockaddr *) &addr, sizeof(addr));
+                rc = connect(conn_sd, saddr, saddrlen);
                 if (rc != EOK) {
                         fprintf(stderr, "connect failed: %s\n", str_error(rc));
@@ -151 +164 @@
                         rc = send(conn_sd, buf, bufsize, 0);
                 } else {
-                        rc = sendto(conn_sd, buf, bufsize, 0,
-                            (struct sockaddr *) &addr, sizeof(addr));
+                        rc = sendto(conn_sd, buf, bufsize, 0, saddr, saddrlen);
                 }
                 if (rc != EOK) {
@@ -161 +173 @@
         
         closesocket(conn_sd);
+        free(saddr);
         return rc;
 }
@@ -167 +180 @@
 {
         fprintf(stderr, "Usage: netspeed <tcp|udp> server [port] <buffer size>\n");
-        fprintf(stderr, "       netspeed <tcp|udp> client <ip> <port> <count> <buffer size>\n");
+        fprintf(stderr, "       netspeed <tcp|udp> client <host> <port> <count> <buffer size>\n");
 }
 

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

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

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