From: claudio <claudio@openbsd.org>
Date: Sat, 23 Oct 2021 14:29:59 +0000 (+0000)
Subject: Unbreak test-http after the last io.c changes
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4579a58e44d8d22b662f67c1ffa44e4e66a08e74;p=openbsd

Unbreak test-http after the last io.c changes
Report from anton@
---

diff --git a/regress/usr.sbin/rpki-client/test-http.c b/regress/usr.sbin/rpki-client/test-http.c
index 9f87d9ebe66..fa009cc35c3 100644
--- a/regress/usr.sbin/rpki-client/test-http.c
+++ b/regress/usr.sbin/rpki-client/test-http.c
@@ -30,14 +30,13 @@ http_request(size_t id, const char *uri, const char *last_mod, int fd)
 {
 	struct ibuf     *b;
 
-	if ((b = ibuf_dynamic(256, UINT_MAX)) == NULL)
-		err(1, NULL);
+	b = io_buf_new();
 	io_simple_buffer(b, &id, sizeof(id));
 	io_str_buffer(b, uri);
 	io_str_buffer(b, last_mod);
 	/* pass file as fd */
 	b->fd = fd;
-	ibuf_close(&httpq, b);
+	io_buf_close(&httpq, b);
 }
 
 static const char *
@@ -58,10 +57,11 @@ http_result(enum http_result res)
 static int
 http_response(int fd)
 {
-	size_t id;
+	size_t id, sz;
 	enum http_result res;
 	char *lastmod;
 
+	io_simple_read(fd, &sz, sizeof(sz));
 	io_simple_read(fd, &id, sizeof(id));
 	io_simple_read(fd, &res, sizeof(res));
 	io_str_read(fd, &lastmod);