ether: Add a field for the driver_name

[akaros.git] / tests / ping.c

diff --git a/tests/ping.c b/tests/ping.c
index 9a3f92c..c3386a5 100644 (file)
--- a/tests/ping.c
+++ b/tests/ping.c
@@ -7,18 +7,20 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <parlib.h>
+#include <parlib/parlib.h>
 #include <unistd.h>
 #include <signal.h>
-#include <iplib.h>
-#include <icmp.h>
+#include <iplib/iplib.h>
+#include <iplib/icmp.h>
 #include <ctype.h>
 #include <pthread.h>
-#include <spinlock.h>
-#include <timing.h>
-#include <tsc-compat.h>
-#include <printf-ext.h>
-#include <alarm.h>
+#include <parlib/spinlock.h>
+#include <parlib/timing.h>
+#include <parlib/tsc-compat.h>
+#include <parlib/printf-ext.h>
+#include <parlib/stdio.h>
+#include <parlib/alarm.h>
+#include <ndblib/ndb.h>
 
 #define NR_MSG                         4
 #define SLEEPMS                                1000
@@ -267,7 +269,7 @@ sender(int fd, int msglen, int interval, int n)
                        if(pingrint != 0)
                                extra = rand();
                        /* uth_sleep takes seconds, interval is in ms */
-                       uthread_sleep((interval + extra) / 1000);
+                       uthread_usleep((interval + extra) * 1000);
                }
                r = calloc(sizeof *r, 1);
                if (r == NULL){
@@ -480,8 +482,6 @@ isv4name(char *name)
                return 1;
        else if (isv6lit(ds.rem))
                return 0;
-#warning "Fix me when we get /net/cs"
-#if 0
        /*we don't have cs.*/
        /* map name to ip and look at its syntax */
        ip = csgetvalue(root, "sys", ds.rem, "ip", NULL);
@@ -493,7 +493,6 @@ isv4name(char *name)
                ip = csgetvalue(root, "dom", ds.rem, "ipv6", NULL);
        if (ip != NULL)
                r = isv4name(ip);
-#endif
        free(ip);
        return r;
 }
@@ -510,7 +509,7 @@ void *rcvr_thread(void* arg)
 
 int main(int argc, char **argv)
 {
-       char *ds;
+       char *ds, ds_store[256];
        int pid;
        pthread_t rcvr;
 
@@ -592,9 +591,9 @@ int main(int argc, char **argv)
 
        if (!isv4name(argv[0]))
                proto = &v6pr;
-       ds = netmkaddr(argv[0], proto->net, "1");
+       ds = netmkaddr(argv[0], proto->net, "1", ds_store, sizeof(ds_store));
        printf("ping: dial %s\n", ds);
-       fd = dial(ds, 0, 0, 0);
+       fd = dial9(ds, 0, 0, 0, 0);
        if(fd < 0){
                fprintf(stderr, "%s: couldn't dial %s: %r\n", argv0, ds);
                exit(1);