From c50c12e6206772273f62752c1c0091ac78698665 Mon Sep 17 00:00:00 2001
From: Wolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de>
Date: Tue, 18 Jun 2013 21:24:59 +0200
Subject: added header processing for content type and transfer encoding -
 chunked

---
 test/bufbsdsocket.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'test/bufbsdsocket.c')

diff --git a/test/bufbsdsocket.c b/test/bufbsdsocket.c
index 596bc3d..22a4a99 100644
--- a/test/bufbsdsocket.c
+++ b/test/bufbsdsocket.c
@@ -6,12 +6,15 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <assert.h>
 
 #include <unistd.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <netinet/ip.h>
+#include <poll.h>
 
 #include "../picohttp.h"
 
@@ -57,7 +60,7 @@ int bufbsdsock_read(size_t count, char *buf, void *data_)
 
 				assert(pfd.revents & (POLLIN | POLLPRI));
 
-				if( -1 == ioctl(fd, FIONREAD, &avail) ) {
+				if( -1 == ioctl(data->fd, FIONREAD, &avail) ) {
 					perror("ioctl(FIONREAD)");
 					return -1;
 				}
@@ -66,7 +69,7 @@ int bufbsdsock_read(size_t count, char *buf, void *data_)
 			data->recvbuf = malloc( avail);
 
 			int r;
-			while( 0 > (r = read(data->fd, data->recvbuf, avail)) )
+			while( 0 > (r = read(data->fd, data->recvbuf, avail)) ) {
 				if( EINTR == errno )
 					continue;
 
@@ -119,11 +122,6 @@ int bufbsdsock_flush(void *data)
 	return 0;
 }
 
-int bsdsock_flush(void* data)
-{
-	return 0;
-}
-
 int sockfd = -1;
 
 void bye(void)
@@ -255,11 +253,11 @@ int main(int argc, char *argv[])
 		}
 
 		struct picohttpIoOps ioops = {
-			.read  = bsdsock_read,
-			.write = bsdsock_write,
-			.getch = bsdsock_getch,
-			.putch = bsdsock_putch,
-			.flush = bsdsock_flush,
+			.read  = bufbsdsock_read,
+			.write = bufbsdsock_write,
+			.getch = bufbsdsock_getch,
+			.putch = bufbsdsock_putch,
+			.flush = bufbsdsock_flush,
 			.data = &confd
 		};
 
-- 
cgit v1.2.3