X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fuilib.c;h=973a2b326249eeb0b62ec1ab7a8579679b0c9d0d;hb=1616bab78de7ec2f7c6dd45fcf7aa74840e68fc1;hp=f7a6b28554c2e11c4ea86168b4c3835b97ae2a84;hpb=8affe2ff5a4c2125128d9a9510aa67b29c0c0b18;p=doldaconnect.git

diff --git a/lib/uilib.c b/lib/uilib.c
index f7a6b28..973a2b3 100644
--- a/lib/uilib.c
+++ b/lib/uilib.c
@@ -102,6 +102,7 @@ struct {
     int family;
     int sentcreds;
 } servinfo;
+char *dc_srv_local;
 
 static struct dc_response *makeresp(void)
 {
@@ -258,6 +259,7 @@ int dc_init(void)
 {
     if((ichandle = iconv_open("wchar_t", "utf-8")) == (iconv_t)-1)
 	return(-1);
+    dc_srv_local = sstrdup("");
     initcmds();
     return(0);
 }
@@ -760,6 +762,7 @@ int dc_handleread(void)
     return(0);
 }
 
+#if UNIX_AUTH_STYLE == 1
 static void mkcreds(struct msghdr *msg)
 {
     struct ucred *ucred;
@@ -778,6 +781,7 @@ static void mkcreds(struct msghdr *msg)
     ucred->gid = getgid();
     msg->msg_controllen = cmsg->cmsg_len;
 }
+#endif
 
 int dc_handlewrite(void)
 {
@@ -796,11 +800,13 @@ int dc_handlewrite(void)
 	    msg.msg_iovlen = 1;
 	    bufvec.iov_base = queue->buf;
 	    bufvec.iov_len = queue->buflen;
+#if UNIX_AUTH_STYLE == 1
 	    if((servinfo.family == PF_UNIX) && !servinfo.sentcreds)
 	    {
 		mkcreds(&msg);
 		servinfo.sentcreds = 1;
 	    }
+#endif
 	    ret = sendmsg(fd, &msg, MSG_NOSIGNAL | MSG_DONTWAIT);
 	    if(ret < 0)
 	    {
@@ -1128,7 +1134,7 @@ static struct addrinfo *defaulthost(void)
     return(ret);
 }
 
-static int dc_connectai(struct addrinfo *hosts)
+static int dc_connectai(struct addrinfo *hosts, struct qcmd **cnctcmd)
 {
     struct qcmd *qcmd;
     int errnobak;
@@ -1144,6 +1150,8 @@ static int dc_connectai(struct addrinfo *hosts)
 	if((fd = socket(curhost->ai_family, curhost->ai_socktype, curhost->ai_protocol)) < 0)
 	{
 	    errnobak = errno;
+	    freeaddrinfo(hostlist);
+	    hostlist = NULL;
 	    errno = errnobak;
 	    return(-1);
 	}
@@ -1165,35 +1173,79 @@ static int dc_connectai(struct addrinfo *hosts)
 	    break;
 	}
     }
-    qcmd = makeqcmd(NULL);
-    resetreader = 1;
+    if(state != -1)
+    {
+	qcmd = makeqcmd(NULL);
+	if(cnctcmd != NULL)
+	    *cnctcmd = qcmd;
+	resetreader = 1;
+    } else {
+	free(hostlist);
+	hostlist = NULL;
+    }
     return(fd);
 }
 
-int dc_connect(char *host)
+static int dc_connect2(char *host, struct qcmd **cnctcmd)
 {
     struct addrinfo *ai;
+    struct qcmd *qcmd;
     int ret;
     
-    if(!host || !*host)
+    if(host == dc_srv_local)
+	ai = getlocalai();
+    else if(!host || !*host)
 	ai = defaulthost();
     else
 	ai = resolvhost(host);
     if(ai == NULL)
 	return(-1);
-    if((ret = dc_connectai(ai)) != 0)
-	freeaddrinfo(ai);
+    ret = dc_connectai(ai, &qcmd);
+    if((ret >= 0) && (cnctcmd != NULL))
+	*cnctcmd = qcmd;
     return(ret);
 }
 
-int dc_connectlocal(void)
+int dc_connect(char *host)
+{
+    return(dc_connect2(host, NULL));
+}
+
+int dc_connectsync(char *host, struct dc_response **respbuf)
 {
-    struct addrinfo *ai;
     int ret;
+    struct qcmd *cc;
+    struct dc_response *resp;
     
-    ai = getlocalai();
-    if((ret = dc_connectai(ai)) != 0)
-	freeaddrinfo(ai);
+    if((ret = dc_connect2(host, &cc)) < 0)
+	return(-1);
+    resp = dc_gettaggedrespsync(cc->tag);
+    if(resp == NULL) {
+	dc_disconnect();
+	return(-1);
+    }
+    if(respbuf == NULL)
+	dc_freeresp(resp);
+    else
+	*respbuf = resp;
+    return(ret);
+}
+
+int dc_connectsync2(char *host, int rev)
+{
+    int ret;
+    struct dc_response *resp;
+    
+    if((ret = dc_connectsync(host, &resp)) < 0)
+	return(-1);
+    if(dc_checkprotocol(resp, rev))
+    {
+	dc_freeresp(resp);
+	dc_disconnect();
+	errno = EPROTONOSUPPORT;
+	return(-1);
+    }
+    dc_freeresp(resp);
     return(ret);
 }
 
@@ -1278,7 +1330,7 @@ int dc_checkprotocol(struct dc_response *resp, int revision)
     if((ires = dc_interpret(resp)) == NULL)
 	return(-1);
     low = ires->argv[0].val.num;
-    high = ires->argv[0].val.num;
+    high = ires->argv[1].val.num;
     dc_freeires(ires);
     if((revision < low) || (revision > high))
 	return(-1);
@@ -1289,3 +1341,8 @@ const char *dc_gethostname(void)
 {
     return(servinfo.hostname);
 }
+
+int dc_getfd(void)
+{
+    return(fd);
+}