tlibventi: add functions reconn and redial for use with fossil - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 4544da52005bf0af3bb05a73f4e02ce35117aae0
 (DIR) parent 36c242dd868672ae9c6705622ef1e7dbb84dbbac
 (HTM) Author: David du Colombier <0intro@gmail.com>
       Date:   Tue,  8 Nov 2011 09:02:31 -0500
       
       libventi: add functions reconn and redial for use with fossil
       
       R=rsc
       CC=plan9port.codebot
       http://codereview.appspot.com/5325046
       
       Diffstat:
         M include/venti.h                     |       2 ++
         M man/man3/venti-conn.3               |       6 ++++++
         M src/libventi/conn.c                 |      22 ++++++++++++++++++++++
         M src/libventi/dial.c                 |      18 ++++++++++++++++++
       
       4 files changed, 48 insertions(+), 0 deletions(-)
       ---
 (DIR) diff --git a/include/venti.h b/include/venti.h
       t@@ -335,7 +335,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*);
 (DIR) diff --git a/man/man3/venti-conn.3 b/man/man3/venti-conn.3
       t@@ -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
 (DIR) diff --git a/src/libventi/conn.c b/src/libventi/conn.c
       t@@ -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)
        {
 (DIR) diff --git a/src/libventi/dial.c b/src/libventi/dial.c
       t@@ -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);
       +}