From 65985c4e6527c82a75367d9c5418b009dfbc6379 Mon Sep 17 00:00:00 2001
From: m0gg
Date: Sun, 26 Nov 2006 20:13:05 +0000
Subject: soap.udp transport added (alpha)
---
nanohttp/nanohttp-common.h | 4 ++--
nanohttp/nanohttp-request.h | 4 ++--
nanohttp/nanohttp-response.h | 7 ++++---
nanohttp/nanohttp-server.c | 8 +++++---
nanohttp/nanohttp-socket.c | 4 +++-
nanohttp/nanohttp-socket.h | 4 ++--
nanohttp/nanohttp-ssl.c | 6 +++++-
7 files changed, 23 insertions(+), 14 deletions(-)
(limited to 'nanohttp')
diff --git a/nanohttp/nanohttp-common.h b/nanohttp/nanohttp-common.h
index 1afd7d5..ad00750 100644
--- a/nanohttp/nanohttp-common.h
+++ b/nanohttp/nanohttp-common.h
@@ -1,5 +1,5 @@
/******************************************************************
- * $Id: nanohttp-common.h,v 1.37 2006/11/25 17:03:20 m0gg Exp $
+ * $Id: nanohttp-common.h,v 1.38 2006/11/26 20:13:05 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003-2004 Ferhat Ayaz
@@ -28,7 +28,7 @@
#define HEADER_CONTENT_TRANSFER_ENCODING "Content-Transfer-Encoding"
#define TRANSFER_ENCODING_CHUNKED "chunked"
-/**
+/** @file
*
* General Header Fields
*
diff --git a/nanohttp/nanohttp-request.h b/nanohttp/nanohttp-request.h
index d1d599b..3f6afba 100755
--- a/nanohttp/nanohttp-request.h
+++ b/nanohttp/nanohttp-request.h
@@ -1,5 +1,5 @@
/******************************************************************
- * $Id: nanohttp-request.h,v 1.11 2006/11/25 15:06:58 m0gg Exp $
+ * $Id: nanohttp-request.h,v 1.12 2006/11/26 20:13:05 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003-2004 Ferhat Ayaz
@@ -24,7 +24,7 @@
#ifndef __nhttp_request_h
#define __nhttp_request_h
-/**
+/** @file
*
* Request Header Fields
*
diff --git a/nanohttp/nanohttp-response.h b/nanohttp/nanohttp-response.h
index edc48fc..88f9c4f 100755
--- a/nanohttp/nanohttp-response.h
+++ b/nanohttp/nanohttp-response.h
@@ -1,5 +1,5 @@
/******************************************************************
- * $Id: nanohttp-response.h,v 1.10 2006/11/25 15:06:58 m0gg Exp $
+ * $Id: nanohttp-response.h,v 1.11 2006/11/26 20:13:06 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003-2004 Ferhat Ayaz
@@ -24,7 +24,7 @@
#ifndef __nanohttp_response_h
#define __nanohttp_response_h
-/**
+/** @file
*
* Response Header Fields
*
@@ -176,9 +176,10 @@ extern "C" {
#ifdef __NHTTP_INTERNAL
extern herror_t hresponse_new_from_socket(struct hsocket_t *sock, hresponse_t **out);
-extern void hresponse_free(hresponse_t * res);
#endif
+extern void hresponse_free(hresponse_t * res);
+
#ifdef __cplusplus
}
#endif
diff --git a/nanohttp/nanohttp-server.c b/nanohttp/nanohttp-server.c
index c144acf..b0e650d 100644
--- a/nanohttp/nanohttp-server.c
+++ b/nanohttp/nanohttp-server.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: nanohttp-server.c,v 1.68 2006/11/25 16:35:57 m0gg Exp $
+* $Id: nanohttp-server.c,v 1.69 2006/11/26 20:13:06 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -145,11 +145,15 @@ static pthread_mutex_t _httpd_connection_lock;
static void _sys_sleep(int secs)
{
Sleep(secs*1000);
+
+ return;
}
#else
static inline void _sys_sleep(int secs)
{
sleep(secs);
+
+ return;
}
#endif
@@ -229,8 +233,6 @@ httpd_init(int argc, char **argv)
return status;
}
- log_verbose2("socket bind to port '%d'", _httpd_port);
-
_httpd_connection_slots_init();
if ((status = _httpd_register_builtin_services(argc, argv)) != H_OK)
diff --git a/nanohttp/nanohttp-socket.c b/nanohttp/nanohttp-socket.c
index c5c4b98..3fd600b 100644
--- a/nanohttp/nanohttp-socket.c
+++ b/nanohttp/nanohttp-socket.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: nanohttp-socket.c,v 1.64 2006/11/25 15:06:58 m0gg Exp $
+* $Id: nanohttp-socket.c,v 1.65 2006/11/26 20:13:06 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -85,6 +85,8 @@ typedef int ssize_t;
#include "nanohttp-common.h"
#include "nanohttp-socket.h"
#include "nanohttp-ssl.h"
+#include "nanohttp-request.h"
+#include "nanohttp-server.h"
#ifdef WIN32
static void
diff --git a/nanohttp/nanohttp-socket.h b/nanohttp/nanohttp-socket.h
index d68da0a..db2bf31 100644
--- a/nanohttp/nanohttp-socket.h
+++ b/nanohttp/nanohttp-socket.h
@@ -1,5 +1,5 @@
/******************************************************************
- * $Id: nanohttp-socket.h,v 1.32 2006/11/24 17:28:07 m0gg Exp $
+ * $Id: nanohttp-socket.h,v 1.33 2006/11/26 20:13:06 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -191,7 +191,7 @@ extern herror_t hsocket_nsend(struct hsocket_t *sock, const unsigned char *bytes
*/
extern herror_t hsocket_send(struct hsocket_t *sock, const char *str);
-extern int hsocket_select_read(int sock, char *buf, size_t len);
+extern int hsocket_select_recv(int sock, char *buf, size_t len);
/**
*
diff --git a/nanohttp/nanohttp-ssl.c b/nanohttp/nanohttp-ssl.c
index 7967bfb..1a98ed5 100644
--- a/nanohttp/nanohttp-ssl.c
+++ b/nanohttp/nanohttp-ssl.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: nanohttp-ssl.c,v 1.31 2006/11/25 15:06:58 m0gg Exp $
+* $Id: nanohttp-ssl.c,v 1.32 2006/11/26 20:13:06 m0gg Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2001-2005 Rochester Institute of Technology
@@ -29,6 +29,10 @@
#include <sys/types.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/socket.h>
+#endif
+
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
--
cgit v1.1-32-gdbae