From 15cba9895cf5e69db8e300514eafe1cc5e3ca033 Mon Sep 17 00:00:00 2001
From: Massimiliano Pinto <massimiliano.pinto@skysql.com>
Date: Tue, 9 Jul 2013 10:38:58 +0200
Subject: [PATCH] Added HTTPD protocol module in configuration and Makefile

---
 gateway.cnf               | 10 ++++++++++
 modules/protocol/Makefile | 13 ++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/gateway.cnf b/gateway.cnf
index 8482f5939..bbd558455 100644
--- a/gateway.cnf
+++ b/gateway.cnf
@@ -57,3 +57,13 @@ port=4006
 type=monitor
 module=mysqlmon
 servers=server1,server2,server3
+
+[HTTPD Service]
+type=service
+router=testroute
+
+[HTTPD Listener]
+type=listener
+service=HTTPD Service
+protocol=HTTPD
+port=6444
diff --git a/modules/protocol/Makefile b/modules/protocol/Makefile
index 85ddd4cb4..341e51e24 100644
--- a/modules/protocol/Makefile
+++ b/modules/protocol/Makefile
@@ -18,9 +18,11 @@
 # Date		Who			Description
 # 13/06/2013	Mark Riddoch		Initial protocol module development
 # 17/06/2013	Massimiliano Pinto	Added mysql_common top both libraries
-# 27/06/13      Vilho Raatikka          Added logmanager-related libs and 
+# 27/06/2013	Vilho Raatikka          Added logmanager-related libs and 
 #                                       headers so that liblog_manager.so can 
 #                                       be linked in.
+# 09/07/2013	Massimiliano Pinto	Added the HTTPD protocol module
+#
 include ../../../build_gateway.inc
 
 LOGPATH := $(ROOT_PATH)/log_manager
@@ -39,10 +41,12 @@ MYSQLBACKENDSRCS=mysql_backend.c mysql_common.c
 MYSQLBACKENDOBJ=$(MYSQLBACKENDSRCS:.c=.o)
 TELNETDSRCS=telnetd.c
 TELNETDOBJ=$(TELNETDSRCS:.c=.o)
-SRCS=$(MYSQLCLIENTSRCS) $(MYSQLBACKENDSRCS) $(TELNETDSRCS)
+HTTPDSRCS=httpd.c
+HTTPDOBJ=$(HTTPDSRCS:.c=.o)
+SRCS=$(MYSQLCLIENTSRCS) $(MYSQLBACKENDSRCS) $(TELNETDSRCS) $(HTTPDSRCS)
 OBJ=$(SRCS:.c=.o)
 LIBS=$(UTILSPATH)/skygw_utils.o 
-MODULES=libMySQLClient.so libMySQLBackend.so libtelnetd.so
+MODULES=libMySQLClient.so libMySQLBackend.so libtelnetd.so libHTTPD.so
 
 all:	$(MODULES)
 
@@ -55,6 +59,9 @@ libMySQLBackend.so: $(MYSQLBACKENDOBJ)
 libtelnetd.so: $(TELNETDOBJ)
 	$(CC) $(LDFLAGS) $(TELNETDOBJ) $(LIBS) -o $@
 
+libHTTPD.so: $(HTTPDOBJ)
+	$(CC) $(LDFLAGS) $(HTTPDOBJ) $(LIBS) -o $@
+
 .c.o:
 	$(CC) $(CFLAGS) $< -o $@