add perl wrapper to scgi

libs/libscgi/src/include/scgi.h

@@ -179,7 +179,7 @@ typedef enum {
 	SCGI_GENERR
 } scgi_status_t;
 
-typedef void (*scgi_listen_callback_t)(scgi_socket_t server_sock, scgi_socket_t client_sock, struct sockaddr_in *addr);
+typedef void (*scgi_listen_callback_t)(scgi_socket_t server_sock, scgi_socket_t *client_sock, struct sockaddr_in *addr);
 
 SCGI_DECLARE(scgi_status_t) scgi_connect(scgi_handle_t *handle, const char *host, scgi_port_t port, uint32_t timeout);
 SCGI_DECLARE(scgi_status_t) scgi_disconnect(scgi_handle_t *handle);
@@ -193,6 +193,8 @@ SCGI_DECLARE(scgi_status_t) scgi_destroy_params(scgi_handle_t *handle);
 SCGI_DECLARE(scgi_status_t) scgi_listen(const char *host, scgi_port_t port, scgi_listen_callback_t callback);
 SCGI_DECLARE(const char *) scgi_get_body(scgi_handle_t *handle);
 SCGI_DECLARE(const char *) scgi_get_param(scgi_handle_t *handle, const char *name);
+SCGI_DECLARE(scgi_status_t) scgi_bind(const char *host, scgi_port_t port, scgi_socket_t *socketp);
+SCGI_DECLARE(scgi_status_t) scgi_accept(scgi_socket_t server_sock, scgi_socket_t *client_sock_p, struct sockaddr_in *echoClntAddr);
 
 #ifdef __cplusplus
 }

libs/libscgi/src/include/scgi_oop.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2007-2012, Anthony Minessale II
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * 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.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SCGI_OOP_H_
+#define _SCGI_OOP_H_
+#include <scgi.h>
+#ifdef __cplusplus
+extern "C" { 
+#endif
+
+#define this_check(x) do { if (!this) { scgi_log(SCGI_LOG_ERROR, "object is not initalized\n"); return x;}} while(0)
+#define this_check_void() do { if (!this) { scgi_log(SCGI_LOG_ERROR, "object is not initalized\n"); return;}} while(0)
+
+
+
+class SCGIhandle {
+ private:
+	scgi_handle_t handle;
+	unsigned char buf[65536];
+ public:
+	SCGIhandle();
+	virtual ~SCGIhandle();
+	int connected();
+	int socketDescriptor();
+	int disconnect(void);
+	int addParam(const char *name, const char *value);
+	int addBody(const char *value);
+	int sendRequest(const char *host, int port, int timeout);
+	char *recv();
+	int bind(const char *host, int port);
+	int accept(void);
+};
+
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

libs/libscgi/src/scgi.c

@@ -548,7 +548,7 @@ static int scgi_socket_reuseaddr(scgi_socket_t socket)
 #endif
 }
 
-SCGI_DECLARE(scgi_status_t) scgi_listen(const char *host, scgi_port_t port, scgi_listen_callback_t callback)
+SCGI_DECLARE(scgi_status_t) scgi_bind(const char *host, scgi_port_t port, scgi_socket_t *socketp)
 {
 	scgi_socket_t server_sock = SCGI_SOCK_INVALID;
 	struct sockaddr_in addr;
@@ -573,32 +573,64 @@ SCGI_DECLARE(scgi_status_t) scgi_listen(const char *host, scgi_port_t port, scgi
     if (listen(server_sock, 10000) < 0) {
 		status = SCGI_FAIL;
 		goto end;
-	}
-
-	for (;;) {
-		int client_sock;                    
-		struct sockaddr_in echoClntAddr;
-#ifdef WIN32
-		int clntLen;
-#else
-		unsigned int clntLen;
-#endif
-
-		clntLen = sizeof(echoClntAddr);
-    
-		if ((client_sock = accept(server_sock, (struct sockaddr *) &echoClntAddr, &clntLen)) == SCGI_SOCK_INVALID) {
-			status = SCGI_FAIL;
-			goto end;
-		}
-		
-		callback(server_sock, client_sock, &echoClntAddr);
-	}
+	}	
 
  end:
 
 	if (server_sock != SCGI_SOCK_INVALID) {
 		closesocket(server_sock);
 		server_sock = SCGI_SOCK_INVALID;
+	} else {
+		*socketp = server_sock;
+	}
+
+	return status;
+}
+
+SCGI_DECLARE(scgi_status_t) scgi_accept(scgi_socket_t server_sock, scgi_socket_t *client_sock_p, struct sockaddr_in *echoClntAddr)
+{
+	scgi_status_t status = SCGI_SUCCESS;
+	int client_sock;                    
+	struct sockaddr_in local_echoClntAddr;
+#ifdef WIN32
+	int clntLen;
+#else
+	unsigned int clntLen;
+#endif
+	
+	if (!echoClntAddr) {
+		echoClntAddr = &local_echoClntAddr;
+	}
+
+
+	clntLen = sizeof(*echoClntAddr);
+    
+	if ((client_sock = accept(server_sock, (struct sockaddr *) echoClntAddr, &clntLen)) == SCGI_SOCK_INVALID) {
+		status = SCGI_FAIL;
+	} else {
+		*client_sock_p = client_sock;
+	}
+	
+	return status;
+}
+
+SCGI_DECLARE(scgi_status_t) scgi_listen(const char *host, scgi_port_t port, scgi_listen_callback_t callback)
+{
+
+	scgi_socket_t server_sock = SCGI_SOCK_INVALID, client_sock = SCGI_SOCK_INVALID;
+	scgi_status_t status = SCGI_FAIL;
+	struct sockaddr_in echoClntAddr;
+
+	if ((status = scgi_bind(host, port, &server_sock)) == SCGI_SUCCESS) {
+
+		while(scgi_accept(server_sock, &client_sock, &echoClntAddr) == SCGI_SUCCESS) {
+			callback(server_sock, &client_sock, &echoClntAddr);
+			
+			if (client_sock != SCGI_SOCK_INVALID) {
+				closesocket(client_sock);
+				client_sock = SCGI_SOCK_INVALID;
+			}
+		}
 	}
 
 	return status;

libs/libscgi/src/scgi_oop.cpp

@@ -0,0 +1,101 @@
+#include <scgi.h>
+#include <scgi_oop.h>
+
+#define connection_construct_common() memset(&handle, 0, sizeof(handle))
+
+
+
+SCGIhandle::SCGIhandle(void)
+{
+	connection_construct_common();
+}
+
+SCGIhandle::~SCGIhandle()
+{
+	if (handle.connected) {
+		scgi_disconnect(&handle);
+	}
+}
+
+int SCGIhandle::socketDescriptor()
+{
+	if (handle.connected) {
+        return (int) handle.sock;
+    }
+
+	return -1;
+}
+
+
+int SCGIhandle::disconnect()
+{
+	if (handle.connected) {
+        return scgi_disconnect(&handle);
+    }
+
+	return 0;
+}
+
+int SCGIhandle::connected()
+{
+	return handle.connected;
+}
+
+int SCGIhandle::addParam(const char *name, const char *value)
+{
+	return (int) scgi_add_param(&handle, name, value);
+}
+
+int SCGIhandle::addBody(const char *value)
+{
+	return (int) scgi_add_body(&handle, value);
+}
+
+
+int SCGIhandle::sendRequest(const char *host, int port, int timeout)
+{
+	if (!host) {
+		return -2;
+	}
+
+	if (timeout < 1000) {
+		timeout = 1000;
+	}
+	
+	if (scgi_connect(&handle, host, port, timeout) == SCGI_SUCCESS) {
+		return (int) scgi_send_request(&handle);
+	}
+
+	return -2;
+}
+
+char *SCGIhandle::recv(void)
+{
+	ssize_t len = scgi_recv(&handle, buf, sizeof(buf));
+	
+	if (len > 0) {
+		return (char *)buf;
+	}
+
+	return NULL;
+}
+
+
+int SCGIhandle::bind(const char *host, int port)
+{
+	return (int) scgi_bind(host, port, &handle.sock);
+}
+
+
+int SCGIhandle::accept(void)
+{
+	scgi_socket_t client_sock;
+
+	if (scgi_accept(handle.sock, &client_sock, NULL) == SCGI_SUCCESS) {
+		return (int) client_sock;
+	}
+
+	return -1;
+}
+
+