]> err.no Git - varnish/commitdiff
Use VSS_open()
authorphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Mon, 16 Jun 2008 21:27:26 +0000 (21:27 +0000)
committerphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Mon, 16 Jun 2008 21:27:26 +0000 (21:27 +0000)
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2702 d4fa192b-c00b-0410-8231-f00ffab90ce4

varnish-cache/bin/varnishtest/vtc_client.c

index 94b213a95fa2f87c3d7c22f1796b6b730c6aa802..8684cd3d763ba337358bbad62838b444051fac4e 100644 (file)
@@ -51,10 +51,6 @@ struct client {
        char                    *spec;
        
        const char              *connect;
-       int                     naddr;
-       struct vss_addr         **vss_addr;
-       char                    *addr;
-       char                    *port;
 
        pthread_t               tp;
 };
@@ -70,19 +66,14 @@ static void *
 client_thread(void *priv)
 {
        struct client *c;
-       int i;
        int fd = -1;
 
        CAST_OBJ_NOTNULL(c, priv, CLIENT_MAGIC);
-       assert(c->naddr > 0);
+       AN(c->connect);
 
        printf("##   %-4s started\n", c->name);
        printf("###  %-4s connect to %s\n", c->name, c->connect);
-       for (i = 0; i < c->naddr; i++) {
-               fd = VSS_connect(c->vss_addr[i]);
-               if (fd >= 0)
-                       break;
-       }
+       fd = VSS_open(c->connect);
        assert(fd >= 0);
        printf("###  %-4s connected to %s fd is %d\n",
            c->name, c->connect, fd);
@@ -196,9 +187,6 @@ cmd_client(char **av, void *priv)
                if (!strcmp(*av, "-connect")) {
                        c->connect = av[1];
                        av++;
-                       AZ(VSS_parse(c->connect, &c->addr, &c->port));
-                       c->naddr = VSS_resolve(c->addr, c->port, &c->vss_addr);
-                       assert(c->naddr > 0);
                        continue;
                }
                if (!strcmp(*av, "-start")) {