diff --git a/sys/include/venti.h b/sys/include/venti.h index c899a66ab..a75973004 100644 --- a/sys/include/venti.h +++ b/sys/include/venti.h @@ -334,7 +334,9 @@ struct VtConn }; VtConn* vtconn(int infd, int outfd); +int vtreconn(VtConn*, int, int); VtConn* vtdial(char*); +int vtredial(VtConn*, char*); void vtfreeconn(VtConn*); int vtsend(VtConn*, Packet*); Packet* vtrecv(VtConn*); diff --git a/sys/man/2/venti-conn b/sys/man/2/venti-conn index 3e3d2eea2..3a2a7d39e 100644 --- a/sys/man/2/venti-conn +++ b/sys/man/2/venti-conn @@ -28,9 +28,15 @@ typedef struct VtConn { VtConn* vtconn(int infd, int outfd) .PP .B +int vtreconn(VtConn *z, int infd, int outfd) +.PP +.B VtConn* vtdial(char *addr) .PP .B +int vtredial(VtConn *z, char *addr) +.PP +.B int vtversion(VtConn *z) .PP .B diff --git a/sys/src/libventi/conn.c b/sys/src/libventi/conn.c index e488c6db6..2a8f67b96 100644 --- a/sys/src/libventi/conn.c +++ b/sys/src/libventi/conn.c @@ -27,6 +27,28 @@ vtconn(int infd, int outfd) return z; } +int +vtreconn(VtConn *z, int infd, int outfd) +{ + NetConnInfo *nci; + + z->state = VtStateAlloc; + if(z->infd >= 0) + close(z->infd); + z->infd = infd; + if(z->outfd >= 0) + close(z->outfd); + z->outfd = outfd; + nci = getnetconninfo(nil, infd); + if(nci == nil) + snprint(z->addr, sizeof z->addr, "/dev/fd/%d", infd); + else{ + strecpy(z->addr, z->addr+sizeof z->addr, nci->raddr); + freenetconninfo(nci); + } + return 0; +} + void vtfreeconn(VtConn *z) { diff --git a/sys/src/libventi/dial.c b/sys/src/libventi/dial.c index 060b93f61..004824732 100644 --- a/sys/src/libventi/dial.c +++ b/sys/src/libventi/dial.c @@ -23,3 +23,21 @@ vtdial(char *addr) strecpy(z->addr, z->addr+sizeof z->addr, na); return z; } + +int +vtredial(VtConn *z, char *addr) +{ + char *na; + int fd; + + if(addr == nil) + addr = getenv("venti"); + if(addr == nil) + addr = "$venti"; + + na = netmkaddr(addr, "tcp", "venti"); + if((fd = dial(na, nil, nil, nil)) < 0) + return fd; + + return vtreconn(z, fd, fd); +}