 @@ -1,14 +1,14 @@
-/*	$NetBSD: regress.c,v 1.1 2008/05/16 20:24:57 peter Exp $	*/
+/*	$NetBSD: regress.c,v 1.1.8.1 2009/08/05 18:33:20 snj Exp $	*/
 /*
  * Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -73,44 +73,50 @@ static struct event_base *global_base;
 #define TEST1	"this is a test"
 #define SECONDS	1
 #ifndef SHUT_WR
 #define SHUT_WR 1
 #endif
 static void
 simple_read_cb(int fd, short event, void *arg)
+{
 	char buf[256];
 	int len;
 	if (arg == NULL)
 		return;
 	len = read(fd, buf, sizeof(buf));
 	if (len) {
 		if (!called) {
 			if (event_add(arg, NULL) == -1)
 				exit(1);
+		}
 	} else if (called == 1)
 		test_ok = 1;
 	called++;
+}
 static void
 simple_write_cb(int fd, short event, void *arg)
+{
 	int len;
 	if (arg == NULL)
 		return;
 	len = write(fd, TEST1, strlen(TEST1) + 1);
 	if (len == -1)
 		test_ok = 0;
 	else
 		test_ok = 1;
+}
 static void
 multiple_write_cb(int fd, short event, void *arg)
+{
 	struct event *ev = arg;
 	int len;
 @@ -159,27 +165,27 @@ multiple_read_cb(int fd, short event, vo
 	roff += len;
 	if (!usepersist) {
 		if (event_add(ev, NULL) == -1)
 			exit(1);
+	}
+}
 static void
 timeout_cb(int fd, short event, void *arg)
+{
 	struct timeval tv;
 	int diff;
-	gettimeofday(&tcalled, NULL);
+	evutil_gettimeofday(&tcalled, NULL);
 	if (evutil_timercmp(&tcalled, &tset, >))
 		evutil_timersub(&tcalled, &tset, &tv);
 	else
 		evutil_timersub(&tset, &tcalled, &tv);
 	diff = tv.tv_sec*1000 + tv.tv_usec/1000 - SECONDS * 1000;
 	if (diff < 0)
 		diff = -diff;
 	if (diff < 100)
 		test_ok = 1;
+}
 @@ -278,26 +284,72 @@ cleanup_test(void)
 	close(pair[1]);
 	if (test_ok)
 		fprintf(stdout, "OK\n");
 	else {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
         test_ok = 0;
 	return (0);
+}
 static void
 test_registerfds(void)
+{
 	int i, j;
 	int pair[2];
 	struct event read_evs[512];
 	struct event write_evs[512];
 	struct event_base *base = event_base_new();
 	fprintf(stdout, "Testing register fds: ");
 	for (i = 0; i < 512; ++i) {
 		if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
 			/* run up to the limit of file descriptors */
 			break;
+		}
 		event_set(&read_evs[i], pair[0],
 		    EV_READ|EV_PERSIST, simple_read_cb, NULL);
 		event_base_set(base, &read_evs[i]);
 		event_add(&read_evs[i], NULL);
 		event_set(&write_evs[i], pair[1],
 		    EV_WRITE|EV_PERSIST, simple_write_cb, NULL);
 		event_base_set(base, &write_evs[i]);
 		event_add(&write_evs[i], NULL);
 		/* just loop once */
 		event_base_loop(base, EVLOOP_ONCE);
+	}
 	/* now delete everything */
 	for (j = 0; j < i; ++j) {
 		event_del(&read_evs[j]);
 		event_del(&write_evs[j]);
 		close(read_evs[j].ev_fd);
 		close(write_evs[j].ev_fd);
 		/* just loop once */
 		event_base_loop(base, EVLOOP_ONCE);
+	}
 	event_base_free(base);
 	fprintf(stdout, "OK\n");
+}
 static void
 test_simpleread(void)
+{
 	struct event ev;
 	/* Very simple read test */
 	setup_test("Simple read: ");
 	write(pair[0], TEST1, strlen(TEST1)+1);
 	shutdown(pair[0], SHUT_WR);
 	event_set(&ev, pair[1], EV_READ, simple_read_cb, &ev);
 	if (event_add(&ev, NULL) == -1)
 		exit(1);
 @@ -418,55 +470,74 @@ test_combined(void)
 static void
 test_simpletimeout(void)
+{
 	struct timeval tv;
 	struct event ev;
 	setup_test("Simple timeout: ");
 	tv.tv_usec = 0;
 	tv.tv_sec = SECONDS;
 	evtimer_set(&ev, timeout_cb, NULL);
 	evtimer_add(&ev, &tv);
-	gettimeofday(&tset, NULL);
+	evutil_gettimeofday(&tset, NULL);
 	event_dispatch();
 	cleanup_test();
+}
 extern struct event_base *current_base;
 static void
 child_signal_cb(int fd, short event, void *arg)
+{
 	struct timeval tv;
 	int *pint = arg;
 	*pint = 1;
 	tv.tv_usec = 500000;
 	tv.tv_sec = 0;
 	event_loopexit(&tv);
+}
 static void
 test_fork(void)
+{
-	int status;
+	int status, got_sigchld = 0;
-	struct event ev;
+	struct event ev, sig_ev;
 	pid_t pid;
 	setup_test("After fork: ");
 	write(pair[0], TEST1, strlen(TEST1)+1);
 	event_set(&ev, pair[1], EV_READ, simple_read_cb, &ev);
 	if (event_add(&ev, NULL) == -1)
 		exit(1);
 	signal_set(&sig_ev, SIGCHLD, child_signal_cb, &got_sigchld);
 	signal_add(&sig_ev, NULL);
 	if ((pid = fork()) == 0) {
 		/* in the child */
 		if (event_reinit(current_base) == -1) {
 			fprintf(stderr, "FAILED (reinit)\n");
 			exit(1);
+		}
 		signal_del(&sig_ev);
 		called = 0;
 		event_dispatch();
 		/* we do not send an EOF; simple_read_cb requires an EOF
 		 * to set test_ok.  we just verify that the callback was
 		 * called. */
 		exit(test_ok != 0 || called != 2 ? -2 : 76);
+	}
 	/* wait for the child to read the data */
 	sleep(1);
 @@ -478,53 +549,93 @@ test_fork(void)
+	}
 	if (WEXITSTATUS(status) != 76) {
 		fprintf(stderr, "FAILED (exit): %d\n", WEXITSTATUS(status));
 		exit(1);
+	}
 	/* test that the current event loop still works */
 	write(pair[0], TEST1, strlen(TEST1)+1);
 	shutdown(pair[0], SHUT_WR);
 	event_dispatch();
 	if (!got_sigchld) {
 		fprintf(stdout, "FAILED (sigchld)\n");
 		exit(1);
+	}
 	signal_del(&sig_ev);
 	cleanup_test();
+}
 static void
 test_simplesignal(void)
+{
 	struct event ev;
 	struct itimerval itv;
 	setup_test("Simple signal: ");
 	signal_set(&ev, SIGALRM, signal_cb, &ev);
 	signal_add(&ev, NULL);
 	/* find bugs in which operations are re-ordered */
 	signal_del(&ev);
 	signal_add(&ev, NULL);
 	memset(&itv, 0, sizeof(itv));
 	itv.it_value.tv_sec = 1;
 	if (setitimer(ITIMER_REAL, &itv, NULL) == -1)
 		goto skip_simplesignal;
 	event_dispatch();
  skip_simplesignal:
 	if (signal_del(&ev) == -1)
 		test_ok = 0;
 	cleanup_test();
+}
 static void
 test_multiplesignal(void)
+{
 	struct event ev_one, ev_two;
 	struct itimerval itv;
 	setup_test("Multiple signal: ");
 	signal_set(&ev_one, SIGALRM, signal_cb, &ev_one);
 	signal_add(&ev_one, NULL);
 	signal_set(&ev_two, SIGALRM, signal_cb, &ev_two);
 	signal_add(&ev_two, NULL);
 	memset(&itv, 0, sizeof(itv));
 	itv.it_value.tv_sec = 1;
 	if (setitimer(ITIMER_REAL, &itv, NULL) == -1)
 		goto skip_simplesignal;
 	event_dispatch();
  skip_simplesignal:
 	if (signal_del(&ev_one) == -1)
 		test_ok = 0;
 	if (signal_del(&ev_two) == -1)
 		test_ok = 0;
 	cleanup_test();
+}
 static void
 test_immediatesignal(void)
+{
 	struct event ev;
 	test_ok = 0;
 	printf("Immediate signal: ");
 	signal_set(&ev, SIGUSR1, signal_cb, &ev);
 	signal_add(&ev, NULL);
 	raise(SIGUSR1);
 	event_loop(EVLOOP_NONBLOCK);
 	signal_del(&ev);
 	cleanup_test();
+}
 @@ -680,26 +791,72 @@ test_signal_restore(void)
 	signal_del(&ev);
 	raise(SIGUSR1);
 	/* 1 == signal_cb, 2 == signal_cb_sa, we want our previous handler */
 	if (test_ok != 2)
 		test_ok = 0;
 out:
 	event_base_free(base);
 	cleanup_test();
 	return;
+}
 static void
 signal_cb_swp(int sig, short event, void *arg)
+{
 	called++;
 	if (called < 5)
 		raise(sig);
 	else
 		event_loopexit(NULL);
+}
 static void
 timeout_cb_swp(int fd, short event, void *arg)
+{
 	if (called == -1) {
 		struct timeval tv = {5, 0};
 		called = 0;
 		evtimer_add((struct event *)arg, &tv);
 		raise(SIGUSR1);
 		return;
+	}
 	test_ok = 0;
 	event_loopexit(NULL);
+}
 static void
 test_signal_while_processing(void)
+{
 	struct event_base *base = event_init();
 	struct event ev, ev_timer;
 	struct timeval tv = {0, 0};
 	setup_test("Receiving a signal while processing other signal: ");
 	called = -1;
 	test_ok = 1;
 	signal_set(&ev, SIGUSR1, signal_cb_swp, NULL);
 	signal_add(&ev, NULL);
 	evtimer_set(&ev_timer, timeout_cb_swp, &ev_timer);
 	evtimer_add(&ev_timer, &tv);
 	event_dispatch();
 	event_base_free(base);
 	cleanup_test();
 	return;
+}
 static void
 test_free_active_base(void)
+{
 	struct event_base *base1;
 	struct event ev1;
 	setup_test("Free active base: ");
 	base1 = event_init();
 	event_set(&ev1, pair[1], EV_READ, simple_read_cb, &ev1);
 	event_base_set(base1, &ev1);
 	event_add(&ev1, NULL);
 	/* event_del(&ev1); */
 	event_base_free(base1);
 	test_ok = 1;
 	cleanup_test();
 @@ -734,29 +891,29 @@ test_loopexit(void)
 	struct event ev;
 	setup_test("Loop exit: ");
 	tv.tv_usec = 0;
 	tv.tv_sec = 60*60*24;
 	evtimer_set(&ev, timeout_cb, NULL);
 	evtimer_add(&ev, &tv);
 	tv.tv_usec = 0;
 	tv.tv_sec = 1;
 	event_loopexit(&tv);
-	gettimeofday(&tv_start, NULL);
+	evutil_gettimeofday(&tv_start, NULL);
 	event_dispatch();
-	gettimeofday(&tv_end, NULL);
+	evutil_gettimeofday(&tv_end, NULL);
 	evutil_timersub(&tv_end, &tv_start, &tv_end);
 	evtimer_del(&ev);
 	if (tv.tv_sec < 2)
 		test_ok = 1;
 	cleanup_test();
+}
 static void
 test_loopexit_multiple(void)
+{
 @@ -1036,27 +1193,27 @@ test_priorities_cb(int fd, short what, v
 	pri->count++;
 	evutil_timerclear(&tv);
 	event_add(&pri->ev, &tv);
+}
 static void
 test_priorities(int npriorities)
+{
 	char buf[32];
 	struct test_pri_event one, two;
 	struct timeval tv;
-	snprintf(buf, sizeof(buf), "Testing Priorities %d: ", npriorities);
+	evutil_snprintf(buf, sizeof(buf), "Testing Priorities %d: ", npriorities);
 	setup_test(buf);
 	event_base_priority_init(global_base, npriorities);
 	memset(&one, 0, sizeof(one));
 	memset(&two, 0, sizeof(two));
 	timeout_set(&one.ev, test_priorities_cb, &one);
 	if (event_priority_set(&one.ev, 0) == -1) {
 		fprintf(stderr, "%s: failed to set priority", __func__);
 		exit(1);
+	}
 @@ -1326,60 +1483,62 @@ rpc_test(void)
 	msg = msg_new();
 	EVTAG_ASSIGN(msg, from_name, "niels");
 	EVTAG_ASSIGN(msg, to_name, "phoenix");
 	if (EVTAG_GET(msg, attack, &attack) == -1) {
 		fprintf(stderr, "Failed to set kill message.\n");
 		exit(1);
+	}
 	EVTAG_ASSIGN(attack, weapon, "feather");
 	EVTAG_ASSIGN(attack, action, "tickle");
-	gettimeofday(&tv_start, NULL);
+	evutil_gettimeofday(&tv_start, NULL);
 	for (i = 0; i < 1000; ++i) {
 		run = EVTAG_ADD(msg, run);
 		if (run == NULL) {
 			fprintf(stderr, "Failed to add run message.\n");
 			exit(1);
+		}
 		EVTAG_ASSIGN(run, how, "very fast but with some data in it");
 		EVTAG_ASSIGN(run, fixed_bytes,
 		    (unsigned char*)"012345678901234567890123");
+	}
 	if (msg_complete(msg) == -1) {
 		fprintf(stderr, "Failed to make complete message.\n");
 		exit(1);
+	}
 	evtag_marshal_msg(tmp, 0xdeaf, msg);
 	if (evtag_peek(tmp, &tag) == -1) {
 		fprintf(stderr, "Failed to peak tag.\n");
 		exit (1);
+	}
 	if (tag != 0xdeaf) {
 		fprintf(stderr, "Got incorrect tag: %0x.\n", tag);
 		exit (1);
+	}
 	msg2 = msg_new();
 	if (evtag_unmarshal_msg(tmp, 0xdeaf, msg2) == -1) {
 		fprintf(stderr, "Failed to unmarshal message.\n");
 		exit(1);
+	}
-	gettimeofday(&tv_end, NULL);
+	evutil_gettimeofday(&tv_end, NULL);
 	evutil_timersub(&tv_end, &tv_start, &tv_end);
 	fprintf(stderr, "(%.1f us/add) ",
 	    (float)tv_end.tv_sec/(float)i * 1000000.0 +
 	    tv_end.tv_usec / (float)i);
 	if (!EVTAG_HAS(msg2, from_name) ||
 	    !EVTAG_HAS(msg2, to_name) ||
 	    !EVTAG_HAS(msg2, attack)) {
 		fprintf(stderr, "Missing data structures.\n");
 		exit(1);
+	}
 	if (EVTAG_LEN(msg2, run) != i) {
 @@ -1415,31 +1574,35 @@ test_evutil_strtoll(void)
         if (evutil_strtoll("foo", NULL, 10) != 0)
                 goto err;
         test_ok = 1;
  err:
         cleanup_test();
+}
 int
 main (int argc, char **argv)
+{
 	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
 		return (1);
 	setvbuf(stdout, NULL, _IONBF, 0);
 	/* Initalize the event library */
 	global_base = event_init();
 	test_registerfds();
         test_evutil_strtoll();
 	/* use the global event base and need to be called first */
 	test_priorities(1);
 	test_priorities(2);
 	test_priorities(3);
 	test_evbuffer();
 	test_evbuffer_find();
 	test_bufferevent();
 	test_bufferevent_watermarks();
 @@ -1457,37 +1620,39 @@ main (int argc, char **argv)
 	test_simpleread();
 	test_simplewrite();
 	test_multiple();
 	test_persistent();
 	test_combined();
 	test_simpletimeout();
 	test_simplesignal();
 	test_multiplesignal();
 	test_immediatesignal();
 	test_loopexit();
 	test_loopbreak();
 	test_loopexit_multiple();
 	test_multiple_events_for_same_fd();
 	test_want_only_once();
 	evtag_test();
 	rpc_test();
 	test_signal_dealloc();
 	test_signal_pipeloss();
 	test_signal_switchbase();
 	test_signal_restore();
 	test_signal_assert();
 	test_signal_while_processing();
 	return (0);
+}

 @@ -1,28 +1,27 @@
 /*	$NetBSD: regress.gen.c,v 1.1 2008/05/16 20:24:57 peter Exp $	*/
 /*
- * Automatically generated from ./regress.rpc
+ * Automatically generated from regress.rpc
  * by event_rpcgen.py/0.1.  DO NOT EDIT THIS FILE.
  */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <event.h>
-#include "./regress.gen.h"
+#include "regress.gen.h"
 void event_err(int eval, const char *fmt, ...);
 void event_warn(const char *fmt, ...);
 void event_errx(int eval, const char *fmt, ...);
 void event_warnx(const char *fmt, ...);
 /*
  * Implementation of msg
  */
 static struct msg_access_ __msg_base = {
   msg_from_name_assign,
 @@ -630,124 +629,222 @@ evtag_marshal_kill(struct evbuffer *evbu
   evbuffer_drain(_buf, -1);
   kill_marshal(_buf, msg);
   evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
   evbuffer_free(_buf);
+}
 /*
  * Implementation of run
  */
 static struct run_access_ __run_base = {
   run_how_assign,
   run_how_get,
   run_some_bytes_assign,
   run_some_bytes_get,
   run_fixed_bytes_assign,
   run_fixed_bytes_get,
 };
 struct run *
 run_new(void)
+{
   struct run *tmp;
   if ((tmp = malloc(sizeof(struct run))) == NULL) {
     event_warn("%s: malloc", __func__);
     return (NULL);
+  }
   tmp->base = &__run_base;
   tmp->how_data = NULL;
   tmp->how_set = 0;
   tmp->some_bytes_data = NULL;
   tmp->some_bytes_length = 0;
   tmp->some_bytes_set = 0;
   memset(tmp->fixed_bytes_data, 0, sizeof(tmp->fixed_bytes_data));
   tmp->fixed_bytes_set = 0;
   return (tmp);
+}
 int
 run_how_assign(struct run *msg,
     const char * value)
+{
   if (msg->how_data != NULL)
     free(msg->how_data);
   if ((msg->how_data = strdup(value)) == NULL)
     return (-1);
   msg->how_set = 1;
   return (0);
+}
 int
 run_some_bytes_assign(struct run *msg, const uint8_t * value, uint32_t len)
+{
   if (msg->some_bytes_data != NULL)
     free (msg->some_bytes_data);
   msg->some_bytes_data = malloc(len);
   if (msg->some_bytes_data == NULL)
     return (-1);
   msg->some_bytes_set = 1;
   msg->some_bytes_length = len;
   memcpy(msg->some_bytes_data, value, len);
   return (0);
+}
 int
 run_fixed_bytes_assign(struct run *msg, const uint8_t *value)
+{
   msg->fixed_bytes_set = 1;
   memcpy(msg->fixed_bytes_data, value, 24);
   return (0);
+}
 int
 run_how_get(struct run *msg, char * *value)
+{
   if (msg->how_set != 1)
     return (-1);
   *value = msg->how_data;
   return (0);
+}
 int
 run_some_bytes_get(struct run *msg, uint8_t * *value, uint32_t *plen)
+{
   if (msg->some_bytes_set != 1)
     return (-1);
   *value = msg->some_bytes_data;
   *plen = msg->some_bytes_length;
   return (0);
+}
 int
 run_fixed_bytes_get(struct run *msg, uint8_t **value)
+{
   if (msg->fixed_bytes_set != 1)
     return (-1);
   *value = msg->fixed_bytes_data;
   return (0);
+}
 void
 run_clear(struct run *tmp)
+{
   if (tmp->how_set == 1) {
     free (tmp->how_data);
     tmp->how_data = NULL;
     tmp->how_set = 0;
+  }
   if (tmp->some_bytes_set == 1) {
     free (tmp->some_bytes_data);
     tmp->some_bytes_data = NULL;
     tmp->some_bytes_length = 0;
     tmp->some_bytes_set = 0;
+  }
   tmp->fixed_bytes_set = 0;
   memset(tmp->fixed_bytes_data, 0, sizeof(tmp->fixed_bytes_data));
+}
 void
 run_free(struct run *tmp)
+{
   if (tmp->how_data != NULL)
       free (tmp->how_data);
   if (tmp->some_bytes_data != NULL)
       free (tmp->some_bytes_data);
   free(tmp);
+}
 void
 run_marshal(struct evbuffer *evbuf, const struct run *tmp){
   evtag_marshal_string(evbuf, RUN_HOW, tmp->how_data);
   if (tmp->some_bytes_set) {
     evtag_marshal(evbuf, RUN_SOME_BYTES, tmp->some_bytes_data, tmp->some_bytes_length);
+  }
   evtag_marshal(evbuf, RUN_FIXED_BYTES, tmp->fixed_bytes_data, sizeof(tmp->fixed_bytes_data));
+}
 int
 run_unmarshal(struct run *tmp,  struct evbuffer *evbuf)
+{
   uint32_t tag;
   while (EVBUFFER_LENGTH(evbuf) > 0) {
     if (evtag_peek(evbuf, &tag) == -1)
       return (-1);
     switch (tag) {
       case RUN_HOW:
         if (tmp->how_set)
           return (-1);
         if (evtag_unmarshal_string(evbuf, RUN_HOW, &tmp->how_data) == -1) {
           event_warnx("%s: failed to unmarshal how", __func__);
           return (-1);
+        }
         tmp->how_set = 1;
         break;
       case RUN_SOME_BYTES:
         if (tmp->some_bytes_set)
           return (-1);
         if (evtag_payload_length(evbuf, &tmp->some_bytes_length) == -1)
           return (-1);
         if (tmp->some_bytes_length > EVBUFFER_LENGTH(evbuf))
           return (-1);
         if ((tmp->some_bytes_data = malloc(tmp->some_bytes_length)) == NULL)
           return (-1);
         if (evtag_unmarshal_fixed(evbuf, RUN_SOME_BYTES, tmp->some_bytes_data, tmp->some_bytes_length) == -1) {
           event_warnx("%s: failed to unmarshal some_bytes", __func__);
           return (-1);
+        }
         tmp->some_bytes_set = 1;
         break;
       case RUN_FIXED_BYTES:
         if (tmp->fixed_bytes_set)
           return (-1);
         if (evtag_unmarshal_fixed(evbuf, RUN_FIXED_BYTES, tmp->fixed_bytes_data, sizeof(tmp->fixed_bytes_data)) == -1) {
           event_warnx("%s: failed to unmarshal fixed_bytes", __func__);
           return (-1);
+        }
         tmp->fixed_bytes_set = 1;
         break;
       default:
         return -1;
+    }
+  }
   if (run_complete(tmp) == -1)
     return (-1);
   return (0);
+}
 int
 run_complete(struct run *msg)
+{
   if (!msg->how_set)
     return (-1);
   if (!msg->fixed_bytes_set)
     return (-1);
   return (0);
+}
 int
 evtag_unmarshal_run(struct evbuffer *evbuf, uint32_t need_tag, struct run *msg)
+{
   uint32_t tag;
   int res = -1;
   struct evbuffer *tmp = evbuffer_new();
   if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
     goto error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: regress_http.c,v 1.1 2008/05/16 20:24:57 peter Exp $	*/
+/*	$NetBSD: regress_http.c,v 1.1.8.1 2009/08/05 18:33:20 snj Exp $	*/
 /*
  * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -27,75 +27,79 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include "event.h"
 #include "evhttp.h"
 #include "log.h"
 #include "http-internal.h"
 extern int pair[];
 extern int test_ok;
 static struct evhttp *http;
 /* set if a test needs to call loopexit on a base */
 static struct event_base *base;
 void http_suite(void);
 void http_basic_cb(struct evhttp_request *req, void *arg);
 static void http_chunked_cb(struct evhttp_request *req, void *arg);
 void http_post_cb(struct evhttp_request *req, void *arg);
 void http_dispatcher_cb(struct evhttp_request *req, void *arg);
 static void http_large_delay_cb(struct evhttp_request *req, void *arg);
 static struct evhttp *
 http_setup(short *pport, struct event_base *base)
+{
 	int i;
 	struct evhttp *myhttp;
 	short port = -1;
 	/* Try a few different ports */
 	myhttp = evhttp_new(base);
 	for (i = 0; i < 50; ++i) {
 		if (evhttp_bind_socket(myhttp, "127.0.0.1", 8080 + i) != -1) {
 			port = 8080 + i;
 			break;
+		}
+	}
 	if (port == -1)
 		event_errx(1, "Could not start web server");
 	/* Register a callback for certain types of requests */
 	evhttp_set_cb(myhttp, "/test", http_basic_cb, NULL);
 	evhttp_set_cb(myhttp, "/chunked", http_chunked_cb, NULL);
 	evhttp_set_cb(myhttp, "/postit", http_post_cb, NULL);
 	evhttp_set_cb(myhttp, "/largedelay", http_large_delay_cb, NULL);
 	evhttp_set_cb(myhttp, "/", http_dispatcher_cb, NULL);
 	*pport = port;
 	return (myhttp);
+}
 #ifndef NI_MAXSERV
 #define NI_MAXSERV 1024
 #endif
 static int
 http_connect(const char *address, u_short port)
+{
 @@ -129,35 +133,43 @@ http_connect(const char *address, u_shor
 	return (fd);
+}
 static void
 http_readcb(struct bufferevent *bev, void *arg)
+{
 	const char *what = "This is funny";
  	event_debug(("%s: %s\n", __func__, EVBUFFER_DATA(bev->input)));
 	if (evbuffer_find(bev->input,
 		(const unsigned char*) what, strlen(what)) != NULL) {
 		struct evhttp_request *req = evhttp_request_new(NULL, NULL);
-		int done;
+		enum message_read_status done;
 		req->kind = EVHTTP_RESPONSE;
-		done = evhttp_parse_lines(req, bev->input);
+		done = evhttp_parse_firstline(req, bev->input);
 		if (done != ALL_DATA_READ)
 			goto out;
 		done = evhttp_parse_headers(req, bev->input);
 		if (done != ALL_DATA_READ)
 			goto out;
 		if (done == 1 &&
 		    evhttp_find_header(req->input_headers,
 			"Content-Type") != NULL)
 			test_ok++;
 	out:
 		evhttp_request_free(req);
 		bufferevent_disable(bev, EV_READ);
 		if (base)
 			event_base_loopexit(base, NULL);
 		else
 			event_loopexit(NULL);
+	}
+}
 static void
 http_writecb(struct bufferevent *bev, void *arg)
+{
 	if (EVBUFFER_LENGTH(bev->output) == 0) {
 @@ -171,107 +183,211 @@ static void
 http_errorcb(struct bufferevent *bev, short what, void *arg)
+{
 	test_ok = -2;
 	event_loopexit(NULL);
+}
 void
 http_basic_cb(struct evhttp_request *req, void *arg)
+{
 	struct evbuffer *evb = evbuffer_new();
 	int empty = evhttp_find_header(req->input_headers, "Empty") != NULL;
 	event_debug(("%s: called\n", __func__));
 	evbuffer_add_printf(evb, "This is funny");
 	/* For multi-line headers test */
+	{
 		const char *multi =
 		    evhttp_find_header(req->input_headers,"X-multi");
 		if (multi) {
 			if (strcmp("END", multi + strlen(multi) - 3) == 0)
 				test_ok++;
 			if (evhttp_find_header(req->input_headers, "X-Last"))
 				test_ok++;
+		}
+	}
 	/* injecting a bad content-length */
 	if (evhttp_find_header(req->input_headers, "X-Negative"))
 		evhttp_add_header(req->output_headers,
 		    "Content-Length", "-100");
 	/* allow sending of an empty reply */
 	evhttp_send_reply(req, HTTP_OK, "Everything is fine",
 	    !empty ? evb : NULL);
 	evbuffer_free(evb);
+}
 static char const* const CHUNKS[] = {
 	"This is funny",
 	"but not hilarious.",
 	"bwv 1052"
 };
 struct chunk_req_state {
 	struct evhttp_request *req;
 	int i;
 };
 static void
 http_chunked_trickle_cb(int fd, short events, void *arg)
+{
 	struct evbuffer *evb = evbuffer_new();
 	struct chunk_req_state *state = arg;
 	struct timeval when = { 0, 0 };
 	evbuffer_add_printf(evb, "%s", CHUNKS[state->i]);
 	evhttp_send_reply_chunk(state->req, evb);
 	evbuffer_free(evb);
 	if (++state->i < sizeof(CHUNKS)/sizeof(CHUNKS[0])) {
 		event_once(-1, EV_TIMEOUT,
 		    http_chunked_trickle_cb, state, &when);
 	} else {
 		evhttp_send_reply_end(state->req);
 		free(state);
+	}
+}
 static void
 http_chunked_cb(struct evhttp_request *req, void *arg)
+{
 	struct timeval when = { 0, 0 };
 	struct chunk_req_state *state = malloc(sizeof(struct chunk_req_state));
 	event_debug(("%s: called\n", __func__));
 	memset(state, 0, sizeof(struct chunk_req_state));
 	state->req = req;
 	/* generate a chunked reply */
 	evhttp_send_reply_start(req, HTTP_OK, "Everything is fine");
 	/* but trickle it across several iterations to ensure we're not
 	 * assuming it comes all at once */
 	event_once(-1, EV_TIMEOUT, http_chunked_trickle_cb, state, &when);
+}
 static void
 http_complete_write(int fd, short what, void *arg)
+{
 	struct bufferevent *bev = arg;
 	const char *http_request = "host\r\n"
 	    "Connection: close\r\n"
 	    "\r\n";
 	bufferevent_write(bev, http_request, strlen(http_request));
+}
 static void
 http_basic_test(void)
+{
 	struct timeval tv;
 	struct bufferevent *bev;
 	int fd;
 	const char *http_request;
 	short port = -1;
 	test_ok = 0;
 	fprintf(stdout, "Testing Basic HTTP Server: ");
 	http = http_setup(&port, NULL);
 	/* bind to a second socket */
 	if (evhttp_bind_socket(http, "127.0.0.1", port + 1) == -1) {
 		fprintf(stdout, "FAILED (bind)\n");
 		exit(1);
+	}
 	fd = http_connect("127.0.0.1", port);
 	/* Stupid thing to send a request */
 	bev = bufferevent_new(fd, http_readcb, http_writecb,
 	    http_errorcb, NULL);
 	/* first half of the http request */
 	http_request =
 	    "GET /test HTTP/1.1\r\n"
-	    "Host: somehost\r\n"
+	    "Host: some";
 	    "Connection: close\r\n"
 	    "\r\n";
 	bufferevent_write(bev, http_request, strlen(http_request));
 	timerclear(&tv);
 	tv.tv_usec = 10000;
 	event_once(-1, EV_TIMEOUT, http_complete_write, bev, &tv);
 	event_dispatch();
-	if (test_ok != 2) {
+	if (test_ok != 3) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	/* connect to the second port */
 	bufferevent_free(bev);
-	close(fd);
+	EVUTIL_CLOSESOCKET(fd);
 	fd = http_connect("127.0.0.1", port + 1);
 	/* Stupid thing to send a request */
 	bev = bufferevent_new(fd, http_readcb, http_writecb,
 	    http_errorcb, NULL);
 	http_request =
 	    "GET /test HTTP/1.1\r\n"
 	    "Host: somehost\r\n"
 	    "Connection: close\r\n"
 	    "\r\n";
 	bufferevent_write(bev, http_request, strlen(http_request));
 	event_dispatch();
 	bufferevent_free(bev);
-	close(fd);
+	EVUTIL_CLOSESOCKET(fd);
 	evhttp_free(http);
-	if (test_ok != 4) {
+	if (test_ok != 5) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	fprintf(stdout, "OK\n");
+}
 static struct evhttp_connection *delayed_client;
 static void
 http_delay_reply(int fd, short what, void *arg)
+{
 	struct evhttp_request *req = arg;
 	evhttp_send_reply(req, HTTP_OK, "Everything is fine", NULL);
 	++test_ok;
+}
 static void
 http_large_delay_cb(struct evhttp_request *req, void *arg)
+{
 	struct timeval tv;
 	timerclear(&tv);
 	tv.tv_sec = 3;
 	event_once(-1, EV_TIMEOUT, http_delay_reply, req, &tv);
 	/* here we close the client connection which will cause an EOF */
 	evhttp_connection_fail(delayed_client, EVCON_HTTP_EOF);
+}
 void http_request_done(struct evhttp_request *, void *);
 void http_request_empty_done(struct evhttp_request *, void *);
 static void
 http_connection_test(int persistent)
+{
 	short port = -1;
 	struct evhttp_connection *evcon = NULL;
 	struct evhttp_request *req = NULL;
 	test_ok = 0;
 	fprintf(stdout, "Testing Request Connection Pipeline %s: ",
 	    persistent ? "(persistent)" : "");
 @@ -681,133 +797,148 @@ http_failure_test(void)
 	fd = http_connect("127.0.0.1", port);
 	/* Stupid thing to send a request */
 	bev = bufferevent_new(fd, http_failure_readcb, http_writecb,
 	    http_errorcb, NULL);
 	http_request = "illegal request\r\n";
 	bufferevent_write(bev, http_request, strlen(http_request));
 	event_dispatch();
 	bufferevent_free(bev);
-	close(fd);
+	EVUTIL_CLOSESOCKET(fd);
 	evhttp_free(http);
 	if (test_ok != 2) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	fprintf(stdout, "OK\n");
+}
 static void
 close_detect_done(struct evhttp_request *req, void *arg)
+{
 	struct timeval tv;
 	if (req == NULL || req->response_code != HTTP_OK) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	test_ok = 1;
 	event_loopexit(NULL);
 	timerclear(&tv);
 	tv.tv_sec = 3;   /* longer than the http time out */
 	event_loopexit(&tv);
+}
 static void
 close_detect_launch(int fd, short what, void *arg)
+{
 	struct evhttp_connection *evcon = arg;
 	struct evhttp_request *req;
 	req = evhttp_request_new(close_detect_done, NULL);
 	/* Add the information that we care about */
 	evhttp_add_header(req->output_headers, "Host", "somehost");
 	/* We give ownership of the request to the connection */
 	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
+}
 static void
 close_detect_cb(struct evhttp_request *req, void *arg)
+{
 	struct evhttp_connection *evcon = arg;
 	struct timeval tv;
-	if (req->response_code != HTTP_OK) {
+	if (req != NULL && req->response_code != HTTP_OK) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	timerclear(&tv);
 	tv.tv_sec = 3;   /* longer than the http time out */
 	/* launch a new request on the persistent connection in 6 seconds */
 	event_once(-1, EV_TIMEOUT, close_detect_launch, evcon, &tv);
+}
 static void
-http_close_detection(void)
+http_close_detection(int with_delay)
+{
 	short port = -1;
 	struct evhttp_connection *evcon = NULL;
 	struct evhttp_request *req = NULL;
 	test_ok = 0;
-	fprintf(stdout, "Testing Connection Close Detection: ");
+	fprintf(stdout, "Testing Connection Close Detection%s: ",
 		with_delay ? " (with delay)" : "");
 	http = http_setup(&port, NULL);
 	/* 2 second timeout */
 	evhttp_set_timeout(http, 2);
 	evcon = evhttp_connection_new("127.0.0.1", port);
 	if (evcon == NULL) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	delayed_client = evcon;
 	/*
 	 * At this point, we want to schedule a request to the HTTP
 	 * server using our make request method.
 	 */
 	req = evhttp_request_new(close_detect_cb, evcon);
 	/* Add the information that we care about */
 	evhttp_add_header(req->output_headers, "Host", "somehost");
 	/* We give ownership of the request to the connection */
-	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
+	if (evhttp_make_request(evcon,
 	    req, EVHTTP_REQ_GET, with_delay ? "/largedelay" : "/test") == -1) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	event_dispatch();
 	if (test_ok != 1) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	/* at this point, the http server should have no connection */
 	if (TAILQ_FIRST(&http->connections) != NULL) {
 		fprintf(stdout, "FAILED (left connections)\n");
 		exit(1);
+	}
 	evhttp_connection_free(evcon);
 	evhttp_free(http);
 	fprintf(stdout, "OK\n");
+}
 static void
 http_highport_test(void)
+{
 	int i = -1;
 	struct evhttp *myhttp = NULL;
 	fprintf(stdout, "Testing HTTP Server with high port: ");
 @@ -830,45 +961,103 @@ static void
 http_bad_header_test(void)
+{
 	struct evkeyvalq headers;
 	fprintf(stdout, "Testing HTTP Header filtering: ");
 	TAILQ_INIT(&headers);
 	if (evhttp_add_header(&headers, "One", "Two") != 0)
 		goto fail;
 	if (evhttp_add_header(&headers, "One\r", "Two") != -1)
 		goto fail;
 	if (evhttp_add_header(&headers, "One", "Two") != 0)
 		goto fail;
 	if (evhttp_add_header(&headers, "One", "Two\r\n Three") != 0)
 		goto fail;
 	if (evhttp_add_header(&headers, "One\r", "Two") != -1)
 		goto fail;
 	if (evhttp_add_header(&headers, "One\n", "Two") != -1)
 		goto fail;
 	if (evhttp_add_header(&headers, "One", "Two\r") != -1)
 		goto fail;
 	if (evhttp_add_header(&headers, "One", "Two\n") != -1)
 		goto fail;
 	evhttp_clear_headers(&headers);
 	fprintf(stdout, "OK\n");
 	return;
 fail:
 	fprintf(stdout, "FAILED\n");
 	exit(1);
+}
 static int validate_header(
 	const struct evkeyvalq* headers,
 	const char *key, const char *value)
+{
 	const char *real_val = evhttp_find_header(headers, key);
 	if (real_val == NULL)
 		return (-1);
 	if (strcmp(real_val, value) != 0)
 		return (-1);
 	return (0);
+}
 static void
 http_parse_query_test(void)
+{
 	struct evkeyvalq headers;
 	fprintf(stdout, "Testing HTTP query parsing: ");
 	TAILQ_INIT(&headers);
 	evhttp_parse_query("http://www.test.com/?q=test", &headers);
 	if (validate_header(&headers, "q", "test") != 0)
 		goto fail;
 	evhttp_clear_headers(&headers);
 	evhttp_parse_query("http://www.test.com/?q=test&foo=bar", &headers);
 	if (validate_header(&headers, "q", "test") != 0)
 		goto fail;
 	if (validate_header(&headers, "foo", "bar") != 0)
 		goto fail;
 	evhttp_clear_headers(&headers);
 	evhttp_parse_query("http://www.test.com/?q=test+foo", &headers);
 	if (validate_header(&headers, "q", "test foo") != 0)
 		goto fail;
 	evhttp_clear_headers(&headers);
 	evhttp_parse_query("http://www.test.com/?q=test%0Afoo", &headers);
 	if (validate_header(&headers, "q", "test\nfoo") != 0)
 		goto fail;
 	evhttp_clear_headers(&headers);
 	evhttp_parse_query("http://www.test.com/?q=test%0Dfoo", &headers);
 	if (validate_header(&headers, "q", "test\rfoo") != 0)
 		goto fail;
 	evhttp_clear_headers(&headers);
 	fprintf(stdout, "OK\n");
 	return;
 fail:
 	fprintf(stdout, "FAILED\n");
 	exit(1);
+}
 static void
 http_base_test(void)
+{
 	struct bufferevent *bev;
 	int fd;
 	const char *http_request;
 	short port = -1;
 	test_ok = 0;
 	fprintf(stdout, "Testing HTTP Server Event Base: ");
 	base = event_init();
 @@ -888,42 +1077,376 @@ http_base_test(void)
 	bufferevent_base_set(base, bev);
 	http_request =
 	    "GET /test HTTP/1.1\r\n"
 	    "Host: somehost\r\n"
 	    "Connection: close\r\n"
 	    "\r\n";
 	bufferevent_write(bev, http_request, strlen(http_request));
 	event_base_dispatch(base);
 	bufferevent_free(bev);
-	close(fd);
+	EVUTIL_CLOSESOCKET(fd);
 	evhttp_free(http);
 	event_base_free(base);
 	base = NULL;
 	if (test_ok != 2) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	fprintf(stdout, "OK\n");
+}
 /*
  * the server is going to reply with chunked data.
  */
 static void
 http_chunked_readcb(struct bufferevent *bev, void *arg)
+{
 	/* nothing here */
+}
 static void
 http_chunked_errorcb(struct bufferevent *bev, short what, void *arg)
+{
 	if (!test_ok)
 		goto out;
 	test_ok = -1;
 	if ((what & EVBUFFER_EOF) != 0) {
 		struct evhttp_request *req = evhttp_request_new(NULL, NULL);
 		const char *header;
 		enum message_read_status done;
 		req->kind = EVHTTP_RESPONSE;
 		done = evhttp_parse_firstline(req, EVBUFFER_INPUT(bev));
 		if (done != ALL_DATA_READ)
 			goto out;
 		done = evhttp_parse_headers(req, EVBUFFER_INPUT(bev));
 		if (done != ALL_DATA_READ)
 			goto out;
 		header = evhttp_find_header(req->input_headers, "Transfer-Encoding");
 		if (header == NULL || strcmp(header, "chunked"))
 			goto out;
 		header = evhttp_find_header(req->input_headers, "Connection");
 		if (header == NULL || strcmp(header, "close"))
 			goto out;
 		header = evbuffer_readline(EVBUFFER_INPUT(bev));
 		if (header == NULL)
 			goto out;
 		/* 13 chars */
 		if (strcmp(header, "d"))
 			goto out;
 		free((char*)header);
 		if (strncmp((char *)EVBUFFER_DATA(EVBUFFER_INPUT(bev)),
 			"This is funny", 13))
 			goto out;
 		evbuffer_drain(EVBUFFER_INPUT(bev), 13 + 2);
 		header = evbuffer_readline(EVBUFFER_INPUT(bev));
 		if (header == NULL)
 			goto out;
 		/* 18 chars */
 		if (strcmp(header, "12"))
 			goto out;
 		free((char *)header);
 		if (strncmp((char *)EVBUFFER_DATA(EVBUFFER_INPUT(bev)),
 			"but not hilarious.", 18))
 			goto out;
 		evbuffer_drain(EVBUFFER_INPUT(bev), 18 + 2);
 		header = evbuffer_readline(EVBUFFER_INPUT(bev));
 		if (header == NULL)
 			goto out;
 		/* 8 chars */
 		if (strcmp(header, "8"))
 			goto out;
 		free((char *)header);
 		if (strncmp((char *)EVBUFFER_DATA(EVBUFFER_INPUT(bev)),
 			"bwv 1052.", 8))
 			goto out;
 		evbuffer_drain(EVBUFFER_INPUT(bev), 8 + 2);
 		header = evbuffer_readline(EVBUFFER_INPUT(bev));
 		if (header == NULL)
 			goto out;
 		/* 0 chars */
 		if (strcmp(header, "0"))
 			goto out;
 		free((char *)header);
 		test_ok = 2;
+	}
 out:
 	event_loopexit(NULL);
+}
 static void
 http_chunked_writecb(struct bufferevent *bev, void *arg)
+{
 	if (EVBUFFER_LENGTH(EVBUFFER_OUTPUT(bev)) == 0) {
 		/* enable reading of the reply */
 		bufferevent_enable(bev, EV_READ);
 		test_ok++;
+	}
+}
 static void
 http_chunked_request_done(struct evhttp_request *req, void *arg)
+{
 	if (req->response_code != HTTP_OK) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	if (evhttp_find_header(req->input_headers,
 		"Transfer-Encoding") == NULL) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	if (EVBUFFER_LENGTH(req->input_buffer) != 13 + 18 + 8) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	if (strncmp((char *)EVBUFFER_DATA(req->input_buffer),
 		"This is funnybut not hilarious.bwv 1052",
 + 18 + 8)) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	test_ok = 1;
 	event_loopexit(NULL);
+}
 static void
 http_chunked_test(void)
+{
 	struct bufferevent *bev;
 	int fd;
 	const char *http_request;
 	short port = -1;
 	struct timeval tv_start, tv_end;
 	struct evhttp_connection *evcon = NULL;
 	struct evhttp_request *req = NULL;
 	int i;
 	test_ok = 0;
 	fprintf(stdout, "Testing Chunked HTTP Reply: ");
 	http = http_setup(&port, NULL);
 	fd = http_connect("127.0.0.1", port);
 	/* Stupid thing to send a request */
 	bev = bufferevent_new(fd,
 	    http_chunked_readcb, http_chunked_writecb,
 	    http_chunked_errorcb, NULL);
 	http_request =
 	    "GET /chunked HTTP/1.1\r\n"
 	    "Host: somehost\r\n"
 	    "Connection: close\r\n"
 	    "\r\n";
 	bufferevent_write(bev, http_request, strlen(http_request));
 	evutil_gettimeofday(&tv_start, NULL);
 	event_dispatch();
 	evutil_gettimeofday(&tv_end, NULL);
 	evutil_timersub(&tv_end, &tv_start, &tv_end);
 	if (tv_end.tv_sec >= 1) {
 		fprintf(stdout, "FAILED (time)\n");
 		exit (1);
+	}
 	if (test_ok != 2) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	/* now try again with the regular connection object */
 	evcon = evhttp_connection_new("127.0.0.1", port);
 	if (evcon == NULL) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	/* make two requests to check the keepalive behavior */
 	for (i = 0; i < 2; i++) {
 		test_ok = 0;
 		req = evhttp_request_new(http_chunked_request_done, NULL);
 		/* Add the information that we care about */
 		evhttp_add_header(req->output_headers, "Host", "somehost");
 		/* We give ownership of the request to the connection */
 		if (evhttp_make_request(evcon, req,
 			EVHTTP_REQ_GET, "/chunked") == -1) {
 			fprintf(stdout, "FAILED\n");
 			exit(1);
+		}
 		event_dispatch();
 		if (test_ok != 1) {
 			fprintf(stdout, "FAILED\n");
 			exit(1);
+		}
+	}
 	evhttp_connection_free(evcon);
 	evhttp_free(http);
 	fprintf(stdout, "OK\n");
+}
 static void
 http_multi_line_header_test(void)
+{
 	struct bufferevent *bev;
 	int fd;
 	const char *http_start_request;
 	short port = -1;
 	test_ok = 0;
 	fprintf(stdout, "Testing HTTP Server with multi line: ");
 	http = http_setup(&port, NULL);
 	fd = http_connect("127.0.0.1", port);
 	/* Stupid thing to send a request */
 	bev = bufferevent_new(fd, http_readcb, http_writecb,
 	    http_errorcb, NULL);
 	http_start_request =
 	    "GET /test HTTP/1.1\r\n"
 	    "Host: somehost\r\n"
 	    "Connection: close\r\n"
 	    "X-Multi:  aaaaaaaa\r\n"
 	    " a\r\n"
 	    "\tEND\r\n"
 	    "X-Last: last\r\n"
 	    "\r\n";
 	bufferevent_write(bev, http_start_request, strlen(http_start_request));
 	event_dispatch();
 	bufferevent_free(bev);
 	EVUTIL_CLOSESOCKET(fd);
 	evhttp_free(http);
 	if (test_ok != 4) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	fprintf(stdout, "OK\n");
+}
 static void
 http_request_bad(struct evhttp_request *req, void *arg)
+{
 	if (req != NULL) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);
+	}
 	test_ok = 1;
 	event_loopexit(NULL);
+}
 static void
 http_negative_content_length_test(void)
+{
 	short port = -1;
 	struct evhttp_connection *evcon = NULL;
 	struct evhttp_request *req = NULL;
 	test_ok = 0;
 	fprintf(stdout, "Testing HTTP Negative Content Length: ");
 	http = http_setup(&port, NULL);
 	evcon = evhttp_connection_new("127.0.0.1", port);
 	if (evcon == NULL) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	/*
 	 * At this point, we want to schedule a request to the HTTP
 	 * server using our make request method.
 	 */
 	req = evhttp_request_new(http_request_bad, NULL);
 	/* Cause the response to have a negative content-length */
 	evhttp_add_header(req->output_headers, "X-Negative", "makeitso");
 	/* We give ownership of the request to the connection */
 	if (evhttp_make_request(evcon, req, EVHTTP_REQ_GET, "/test") == -1) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	event_dispatch();
 	evhttp_free(http);
 	if (test_ok != 1) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
+	}
 	fprintf(stdout, "OK\n");
+}
 void
 http_suite(void)
+{
 	http_base_test();
 	http_bad_header_test();
 	http_parse_query_test();
 	http_basic_test();
 	http_connection_test(0 /* not-persistent */);
 	http_connection_test(1 /* persistent */);
-	http_close_detection();
+	http_close_detection(0 /* with delay */);
 	http_close_detection(1 /* with delay */);
 	http_post_test();
 	http_failure_test();
 	http_highport_test();
 	http_dispatcher_test();
 	http_multi_line_header_test();
 	http_negative_content_length_test();
 	http_chunked_test();
+}

 @@ -1,22 +1,24 @@
 /*	$NetBSD: regress.gen.h,v 1.1 2008/05/16 20:24:57 peter Exp $	*/
 /*
- * Automatically generated from ./regress.rpc
+ * Automatically generated from regress.rpc
  */
-#ifndef ___REGRESS_RPC_
+#ifndef _REGRESS_RPC_
-#define ___REGRESS_RPC_
+#define _REGRESS_RPC_
 #include <event-config.h>
 #ifdef _EVENT_HAVE_STDINT_H
 #include <stdint.h>
 #endif
 #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)
 #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->base->member##_assign)(msg, ## args)
 #define EVTAG_GET(msg, member, args...) (*(msg)->base->member##_get)(msg, ## args)
 #define EVTAG_ADD(msg, member) (*(msg)->base->member##_add)(msg)
 #define EVTAG_LEN(msg, member) ((msg)->member##_length)
 struct msg;
 struct kill;
 struct run;
 /* Tag definition for msg */
 enum msg_ {
   MSG_FROM_NAME=1,
 @@ -117,45 +119,60 @@ void evtag_marshal_kill(struct evbuffer
 int evtag_unmarshal_kill(struct evbuffer *, uint32_t,
     struct kill *);
 int kill_weapon_assign(struct kill *, const char *);
 int kill_weapon_get(struct kill *, char * *);
 int kill_action_assign(struct kill *, const char *);
 int kill_action_get(struct kill *, char * *);
 int kill_how_often_assign(struct kill *, const uint32_t);
 int kill_how_often_get(struct kill *, uint32_t *);
 /* --- kill done --- */
 /* Tag definition for run */
 enum run_ {
   RUN_HOW=1,
   RUN_SOME_BYTES=2,
   RUN_FIXED_BYTES=3,
   RUN_MAX_TAGS
 };
 /* Structure declaration for run */
 struct run_access_ {
   int (*how_assign)(struct run *, const char *);
   int (*how_get)(struct run *, char * *);
   int (*some_bytes_assign)(struct run *, const uint8_t *, uint32_t);
   int (*some_bytes_get)(struct run *, uint8_t * *, uint32_t *);
   int (*fixed_bytes_assign)(struct run *, const uint8_t *);
   int (*fixed_bytes_get)(struct run *, uint8_t **);
 };
 struct run {
   struct run_access_ *base;
   char *how_data;
   uint8_t *some_bytes_data;
   uint32_t some_bytes_length;
   uint8_t fixed_bytes_data[24];
   uint8_t how_set;
   uint8_t some_bytes_set;
   uint8_t fixed_bytes_set;
 };
 struct run *run_new(void);
 void run_free(struct run *);
 void run_clear(struct run *);
 void run_marshal(struct evbuffer *, const struct run *);
 int run_unmarshal(struct run *, struct evbuffer *);
 int run_complete(struct run *);
 void evtag_marshal_run(struct evbuffer *, uint32_t,
     const struct run *);
 int evtag_unmarshal_run(struct evbuffer *, uint32_t,
     struct run *);
 int run_how_assign(struct run *, const char *);
 int run_how_get(struct run *, char * *);
 int run_some_bytes_assign(struct run *, const uint8_t *, uint32_t);
 int run_some_bytes_get(struct run *, uint8_t * *, uint32_t *);
 int run_fixed_bytes_assign(struct run *, const uint8_t *);
 int run_fixed_bytes_get(struct run *, uint8_t **);
 /* --- run done --- */
-#endif  /* ___REGRESS_RPC_ */
+#endif  /* _REGRESS_RPC_ */