aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de>2013-06-18 20:19:36 +0200
committerWolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de>2013-06-18 20:19:36 +0200
commit3fe9937a5505528b0a2ac17875b9117c8c17c3ff (patch)
treedd7eb7a3b9fa86137b794ccd4a6650c30dd14fa1
parentfeb3e1de269c3c72a7c7925cfb81415189cf54f9 (diff)
parentfc9f3c0bde26bc882bdfe1ec0435ade8b60172f4 (diff)
downloadlitheweb-3fe9937a5505528b0a2ac17875b9117c8c17c3ff.tar.gz
litheweb-3fe9937a5505528b0a2ac17875b9117c8c17c3ff.tar.bz2
Merge branch 'master' of github.com:datenwolf/picoweb
Diffstat
-rw-r--r--picohttp.h13
-rw-r--r--test/bsdsocket.c190
-rw-r--r--test/bufbsdsocket.c (renamed from test/bsd_socket.c)111
3 files changed, 277 insertions, 37 deletions
diff --git a/picohttp.h b/picohttp.h
index 38cdd76..ced2ef5 100644
--- a/picohttp.h
+++ b/picohttp.h
@@ -96,7 +96,7 @@ struct picohttpURLRoute {
int16_t allowed_methods;
};
-#define PICOHTTP_EPOCH_YEAR 1980
+#define PICOHTTP_EPOCH_YEAR 1970
struct picohttpDateTime {
unsigned int Y:7; /* EPOCH + 127 years */
@@ -159,4 +159,15 @@ int picohttpResponseWrite (
size_t len,
char const *buf );
+uint16_t picohttpGetch(
+ struct picohttpRequest * const req,
+ struct picohttpChunkTransfer * const ct);
+
+int picohttpMultipartNext(
+ struct picohttpRequest * const req,
+ struct picohttpMultiPart * const mp);
+
+uint16_t picohttpMultipartGetch(
+ struct picohttpMultiPart * const mp);
+
#endif/*PICOHTTP_H_HEADERGUARD*/
diff --git a/test/bsdsocket.c b/test/bsdsocket.c
new file mode 100644
index 0000000..d4bd5a2
--- /dev/null
+++ b/test/bsdsocket.c
@@ -0,0 +1,190 @@
+#define _BSD_SOURCE
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/ip.h>
+
+#include "../picohttp.h"
+
+int bsdsock_read(size_t count, char *buf, void *data)
+{
+ int fd = *((int*)data);
+
+ ssize_t rb = 0;
+ ssize_t r = 0;
+ do {
+ r = read(fd, buf+rb, count-rb);
+ if( 0 < r ) {
+ rb += r;
+ continue;
+ }
+ if( !r ) {
+ break;
+ }
+
+ if( EAGAIN == errno ||
+ EWOULDBLOCK == errno ) {
+ usleep(100);
+ continue;
+ }
+ return -3 + errno;
+ } while( rb < count );
+ return rb;
+}
+
+int bsdsock_write(size_t count, char const *buf, void *data)
+{
+ int fd = *((int*)data);
+
+ ssize_t wb = 0;
+ ssize_t w = 0;
+ do {
+ w = write(fd, buf+wb, count-wb);
+ if( 0 < w ) {
+ wb += w;
+ continue;
+ }
+ if( !w ) {
+ break;
+ }
+
+ if( EAGAIN == errno ||
+ EWOULDBLOCK == errno ) {
+ usleep(100);
+ continue;
+ }
+ return -3 + errno;
+ } while( wb < count );
+ return wb;
+}
+
+int16_t bsdsock_getch(void *data)
+{
+ char ch;
+ if( 1 != bsdsock_read(1, &ch, data) )
+ return -1;
+ return ch;
+}
+
+int bsdsock_putch(char ch, void *data)
+{
+ return bsdsock_write(1, &ch, data);
+}
+
+int sockfd = -1;
+
+void bye(void)
+{
+ fputs("exiting\n", stderr);
+ int const one = 1;
+ /* allows for immediate reuse of address:port
+ * after program termination */
+ setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+ shutdown(sockfd, SHUT_RDWR);
+ close(sockfd);
+}
+
+void rhRoot(struct picohttpRequest *req)
+{
+ fprintf(stderr, "handling request /%s\n", req->urltail);
+
+ char http_header[] = "HTTP/x.x 200 OK\r\nServer: picoweb\r\nContent-Type: text/html\r\n\r\n";
+ http_header[5] = '0'+req->httpversion.major;
+ http_header[7] = '0'+req->httpversion.minor;
+ picohttpIoWrite(req->ioops, sizeof(http_header)-1, http_header);
+ char http_test[] = "<html><head><title>handling request /</title></head>\n<body><a href=\"/test\">/test</a></body></html>\n";
+
+ picohttpIoWrite(req->ioops, sizeof(http_test)-1, http_test);
+}
+
+void rhTest(struct picohttpRequest *req)
+{
+ fprintf(stderr, "handling request /test%s\n", req->urltail);
+ char http_header[] = "HTTP/x.x 200 OK\r\nServer: picoweb\r\nContent-Type: text/text\r\n\r\n";
+ http_header[5] = '0'+req->httpversion.major;
+ http_header[7] = '0'+req->httpversion.minor;
+ picohttpIoWrite(req->ioops, sizeof(http_header)-1, http_header);
+ char http_test[] = "handling request /test";
+ picohttpIoWrite(req->ioops, sizeof(http_test)-1, http_test);
+ if(req->urltail) {
+ picohttpIoWrite(req->ioops, strlen(req->urltail), req->urltail);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ sockfd = socket(AF_INET, SOCK_STREAM, 0);
+ if( -1 == sockfd ) {
+ perror("socket");
+ return -1;
+ }
+#if 0
+ if( atexit(bye) ) {
+ return -1;
+ }
+#endif
+
+ struct sockaddr_in addr = {
+ .sin_family = AF_INET,
+ .sin_port = htons(8000),
+ .sin_addr = 0
+ };
+
+ int const one = 1;
+ setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+ if( -1 == bind(sockfd, (struct sockaddr*)&addr, sizeof(addr)) ) {
+ perror("bind");
+ return -1;
+ }
+
+ if( -1 == listen(sockfd, 2) ) {
+ perror("listen");
+ return -1;
+ }
+
+ for(;;) {
+ socklen_t addrlen = 0;
+ int confd = accept(sockfd, (struct sockaddr*)&addr, &addrlen);
+ if( -1 == confd ) {
+ if( EAGAIN == errno ||
+ EWOULDBLOCK == errno ) {
+ usleep(1000);
+ continue;
+ } else {
+ perror("accept");
+ return -1;
+ }
+ }
+
+ struct picohttpIoOps ioops = {
+ .read = bsdsock_read,
+ .write = bsdsock_write,
+ .getch = bsdsock_getch,
+ .putch = bsdsock_putch,
+ .data = &confd
+ };
+
+ struct picohttpURLRoute routes[] = {
+ { "/test", 0, rhTest, 16, PICOHTTP_METHOD_GET },
+ { "/|", 0, rhRoot, 0, PICOHTTP_METHOD_GET },
+ { NULL, 0, 0, 0, 0 }
+ };
+
+ picohttpProcessRequest(&ioops, routes);
+
+ shutdown(confd, SHUT_RDWR);
+ close(confd);
+ }
+
+ return 0;
+}
+
diff --git a/test/bsd_socket.c b/test/bufbsdsocket.c
index f193e49..596bc3d 100644
--- a/test/bsd_socket.c
+++ b/test/bufbsdsocket.c
@@ -15,69 +15,108 @@
#include "../picohttp.h"
-int bsdsock_read(size_t count, char *buf, void *data)
+#define SENDBUF_LEN 256
+
+struct bufbsdsockData {
+ char * recvbuf;
+ size_t recvbuf_len;
+ size_t recvbuf_pos;
+ char sendbuf[SENDBUF_LEN];
+ size_t sendbuf_pos;
+ int fd;
+};
+
+int bufbsdsock_read(size_t count, char *buf, void *data_)
{
- int fd = *((int*)data);
-
+ struct bufbsdsockData *data = data_;
+
ssize_t rb = 0;
ssize_t r = 0;
do {
- r = read(fd, buf+rb, count-rb);
- if( 0 < r ) {
- rb += r;
- continue;
- }
- if( !r ) {
- break;
- }
+ size_t len = 0;
+
+ if( !data->recvbuf ||
+ data->recvbuf_pos >= data->recvbuf_len ) {
+ if( data->recvbuf )
+ free( data->recvbuf );
+ data->recvbuf_len = 0;
+ data->recvbuf_pos = 0;
+
+ int avail = 0;
+ do {
+ struct pollfd pfd = {
+ .fd = data->fd,
+ .events = POLLIN | POLLPRI,
+ .revents = 0
+ };
+
+ int const pret = poll(&pfd, 1, -1);
+ if( 0 >= pret ) {
+ return -1;
+ }
+
+ assert(pfd.revents & (POLLIN | POLLPRI));
+
+ if( -1 == ioctl(fd, FIONREAD, &avail) ) {
+ perror("ioctl(FIONREAD)");
+ return -1;
+ }
+ } while( !avail );
+
+ data->recvbuf = malloc( avail);
+
+ int r;
+ while( 0 > (r = read(data->fd, data->recvbuf, avail)) )
+ if( EINTR == errno )
+ continue;
+
+ if( EAGAIN == errno ||
+ EWOULDBLOCK == errno ) {
+ usleep(200);
+ continue;
+ }
- if( EAGAIN == errno ||
- EWOULDBLOCK == errno ) {
- usleep(100);
- continue;
+ return -1;
+ }
+ data->recvbuf_len += r;
}
- return -3 + errno;
+
+ len = data->recvbuf_len - data->recvbuf_pos;
+ if( len > count )
+ len = count;
+
+ rb += len;
} while( rb < count );
return rb;
}
-int bsdsock_write(size_t count, char const *buf, void *data)
+int bufbsdsock_write(size_t count, char const *buf, void *data)
{
int fd = *((int*)data);
ssize_t wb = 0;
ssize_t w = 0;
do {
- w = write(fd, buf+wb, count-wb);
- if( 0 < w ) {
- wb += w;
- continue;
- }
- if( !w ) {
- break;
- }
-
- if( EAGAIN == errno ||
- EWOULDBLOCK == errno ) {
- usleep(100);
- continue;
- }
- return -3 + errno;
} while( wb < count );
return wb;
}
-int16_t bsdsock_getch(void *data)
+int16_t bufbsdsock_getch(void *data)
{
char ch;
- if( 1 != bsdsock_read(1, &ch, data) )
+ if( 1 != bufbsdsock_read(1, &ch, data) )
return -1;
return ch;
}
-int bsdsock_putch(char ch, void *data)
+int bufbsdsock_putch(char ch, void *data)
{
- return bsdsock_write(1, &ch, data);
+ return bufbsdsock_write(1, &ch, data);
+}
+
+int bufbsdsock_flush(void *data)
+{
+ return 0;
}
int bsdsock_flush(void* data)