X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtparser.c;h=a20b32906ab25d0a98926c1515660999a47959b2;hb=b1b0fe0f4793825232288427da4856e9adf8b868;hp=8eb3873bf4f126cd6e092dd35b40e9f7a9bc73b5;hpb=cac13158ac4fdd8b7682f16f879796e9c4e339ff;p=ashd.git

diff --git a/src/htparser.c b/src/htparser.c
index 8eb3873..a20b329 100644
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -280,15 +280,35 @@ static int http10keep(struct hthead *req, struct hthead *resp)
     }
 }
 
+static char *connid(void)
+{
+    static struct charbuf cur;
+    int i;
+    char *ret;
+    
+    for(i = 0; i < cur.d; i++) {
+	if((++cur.b[i]) > 'Z')
+	    cur.b[i] = 'A';
+	else
+	    goto done;
+    }
+    bufadd(cur, 'A');
+done:
+    ret = memcpy(smalloc(cur.d + 1), cur.b, cur.d);
+    ret[cur.d] = 0;
+    return(ret);
+}
+
 void serve(FILE *in, struct conn *conn)
 {
     int pfds[2];
     FILE *out;
     struct hthead *req, *resp;
-    char *hd;
+    char *hd, *id;
     off_t dlen;
     int keep;
     
+    id = connid();
     out = NULL;
     req = resp = NULL;
     while(plex >= 0) {
@@ -297,6 +317,7 @@ void serve(FILE *in, struct conn *conn)
 	if(!canonreq(req))
 	    break;
 	
+	headappheader(req, "X-Ash-Connection-ID", id);
 	if((conn->initreq != NULL) && conn->initreq(conn, req))
 	    break;
 	
@@ -399,14 +420,16 @@ void serve(FILE *in, struct conn *conn)
     if(resp != NULL)
 	freehthead(resp);
     fclose(in);
+    free(id);
 }
 
 static void plexwatch(struct muth *muth, va_list args)
 {
     vavar(int, fd);
     char *buf;
-    int ret;
+    int i, s, ret;
     
+    s = 0;
     while(1) {
 	if(block(fd, EV_READ, 0) == 0)
 	    break;
@@ -416,14 +439,24 @@ static void plexwatch(struct muth *muth, va_list args)
 	    flog(LOG_WARNING, "received error on rootplex read channel: %s", strerror(errno));
 	    exit(1);
 	} else if(ret == 0) {
-	    exit(0);
+	    s = 1;
+	    free(buf);
+	    break;
 	}
 	/* Maybe I'd like to implement some protocol in this direction
 	 * some day... */
 	free(buf);
     }
-    close(plex);
-    plex = -1;
+    shutdown(plex, SHUT_RDWR);
+    for(i = 0; i < listeners.d; i++) {
+	if(listeners.b[i] == muth)
+	    bufdel(listeners, i);
+    }
+    if(s) {
+	flog(LOG_INFO, "root handler exited, so shutting down listening...");
+	while(listeners.d > 0)
+	    resume(listeners.b[0], 0);
+    }
 }
 
 static void initroot(void *uu)
@@ -602,9 +635,8 @@ int main(int argc, char **argv)
 	    break;
 	case 1:
 	    if(listeners.d > 0) {
-		for(i = 0; i < listeners.d; i++)
-		    resume(listeners.b[i], 0);
-		listeners.d = 0;
+		while(listeners.d > 0)
+		    resume(listeners.b[0], 0);
 		flog(LOG_INFO, "no longer listening");
 	    } else {
 		d = 1;