Http parsing and responses are now mostly complete

2014-07-25 17:23:38 +01:00
parent bfe3a66903
commit a97b541174
14 changed files with 2865 additions and 114 deletions
--- a/nbproject/Makefile-Debug.mk
+++ b/nbproject/Makefile-Debug.mk
@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}

 # Object Files
 OBJECTFILES= \
+	${OBJECTDIR}/lib/http_parser.o \
 	${OBJECTDIR}/src/http/http.o \
 	${OBJECTDIR}/src/http/parse.o \
 	${OBJECTDIR}/src/main.o \
@@ -55,7 +56,7 @@ FFLAGS=
 ASFLAGS=

 # Link Libraries and Options
-LDLIBSOPTIONS=-lhttp_parser
+LDLIBSOPTIONS=

 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
@@ -65,25 +66,30 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp ${OBJECTFILES} ${LDLIBSOPTIONS}

+${OBJECTDIR}/lib/http_parser.o: lib/http_parser.c 
+	${MKDIR} -p ${OBJECTDIR}/lib
+	${RM} "$@.d"
+	$(COMPILE.c) -g -Werror -Ilib -include lib/http_parser.h -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/http_parser.o lib/http_parser.c
+
 ${OBJECTDIR}/src/http/http.o: src/http/http.c 
 	${MKDIR} -p ${OBJECTDIR}/src/http
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/http.o src/http/http.c
+	$(COMPILE.c) -g -Werror -Ilib -include lib/http_parser.h -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/http.o src/http/http.c

 ${OBJECTDIR}/src/http/parse.o: src/http/parse.c 
 	${MKDIR} -p ${OBJECTDIR}/src/http
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/parse.o src/http/parse.c
+	$(COMPILE.c) -g -Werror -Ilib -include lib/http_parser.h -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http/parse.o src/http/parse.c

 ${OBJECTDIR}/src/main.o: src/main.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c
+	$(COMPILE.c) -g -Werror -Ilib -include lib/http_parser.h -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c

 ${OBJECTDIR}/src/socket.o: src/socket.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -g -Werror -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c
+	$(COMPILE.c) -g -Werror -Ilib -include lib/http_parser.h -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c

 # Subprojects
 .build-subprojects:
--- a/nbproject/Makefile-Release.mk
+++ b/nbproject/Makefile-Release.mk
@@ -35,6 +35,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}

 # Object Files
 OBJECTFILES= \
+	${OBJECTDIR}/lib/http_parser.o \
 	${OBJECTDIR}/src/http/http.o \
 	${OBJECTDIR}/src/http/parse.o \
 	${OBJECTDIR}/src/main.o \
@@ -65,6 +66,11 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/khttp ${OBJECTFILES} ${LDLIBSOPTIONS}

+${OBJECTDIR}/lib/http_parser.o: lib/http_parser.c 
+	${MKDIR} -p ${OBJECTDIR}/lib
+	${RM} "$@.d"
+	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/http_parser.o lib/http_parser.c
+
 ${OBJECTDIR}/src/http/http.o: src/http/http.c 
 	${MKDIR} -p ${OBJECTDIR}/src/http
 	${RM} "$@.d"
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -5,6 +5,7 @@
                   displayName="Header Files"
                   projectFiles="true">
      <itemPath>src/http/http.h</itemPath>
+      <itemPath>lib/http_parser.h</itemPath>
      <itemPath>src/main.h</itemPath>
      <itemPath>src/http/parse.h</itemPath>
      <itemPath>src/socket.h</itemPath>
@@ -17,6 +18,7 @@
                   displayName="Source Files"
                   projectFiles="true">
      <itemPath>src/http/http.c</itemPath>
+      <itemPath>lib/http_parser.c</itemPath>
      <itemPath>src/main.c</itemPath>
      <itemPath>src/http/parse.c</itemPath>
      <itemPath>src/socket.c</itemPath>
@@ -33,10 +35,8 @@
      <itemPath>Makefile</itemPath>
    </logicalFolder>
    <itemPath>content/error.html</itemPath>
+    <itemPath>content/lorem.txt</itemPath>
  </logicalFolder>
-  <sourceRootList>
-    <Elem>include</Elem>
-  </sourceRootList>
  <projectmakefile>Makefile</projectmakefile>
  <confs>
    <conf name="Debug" type="1">
@@ -48,17 +48,24 @@
      <compileType>
        <cTool>
          <standard>3</standard>
+          <incDir>
+            <pElem>lib</pElem>
+          </incDir>
+          <incFile>
+            <pElem>lib/http_parser.h</pElem>
+          </incFile>
          <commandLine>-O0</commandLine>
          <warningLevel>3</warningLevel>
        </cTool>
-        <linkerTool>
-          <linkerLibItems>
-            <linkerLibLibItem>http_parser</linkerLibLibItem>
-          </linkerLibItems>
-        </linkerTool>
      </compileType>
      <item path="content/error.html" ex="false" tool="3" flavor2="0">
      </item>
+      <item path="content/lorem.txt" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="lib/http_parser.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="lib/http_parser.h" ex="false" tool="3" flavor2="0">
+      </item>
      <item path="src/http/http.c" ex="false" tool="0" flavor2="0">
      </item>
      <item path="src/http/http.h" ex="false" tool="3" flavor2="0">
@@ -98,6 +105,12 @@
      </compileType>
      <item path="content/error.html" ex="false" tool="3" flavor2="0">
      </item>
+      <item path="content/lorem.txt" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="lib/http_parser.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="lib/http_parser.h" ex="false" tool="3" flavor2="0">
+      </item>
      <item path="src/http/http.c" ex="false" tool="0" flavor2="0">
      </item>
      <item path="src/http/http.h" ex="false" tool="3" flavor2="0">
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -10,12 +10,13 @@
            <file>file:/home/sam/NetBeansProjects/KHttp/src/socket.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/http.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/parse.c</file>
-            <file>file:/home/sam/NetBeansProjects/KHttp/src/ut/utarray.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/main.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/Makefile</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/lib/http_parser.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/content/error.html</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/parse.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/main.c</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/lib/http_parser.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/socket.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http/http.c</file>
        </group>
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -9,9 +9,7 @@
            <header-extensions>h</header-extensions>
            <sourceEncoding>UTF-8</sourceEncoding>
            <make-dep-projects/>
-            <sourceRootList>
-                <sourceRootElem>include</sourceRootElem>
-            </sourceRootList>
+            <sourceRootList/>
            <confList>
                <confElem>
                    <name>Debug</name>