Server is basically working.

Needs a re-design.
2014-08-03 16:18:18 +01:00
parent e8d1e4d7d9
commit 34ef45478e
19 changed files with 671 additions and 265 deletions
--- a/nbproject/Makefile-Debug.mk
+++ b/nbproject/Makefile-Debug.mk
@@ -43,11 +43,12 @@ OBJECTFILES= \
 	${OBJECTDIR}/src/http.o \
 	${OBJECTDIR}/src/main.o \
 	${OBJECTDIR}/src/mime.o \
-	${OBJECTDIR}/src/socket.o
+	${OBJECTDIR}/src/socket.o \
+	${OBJECTDIR}/src/util.o


 # C Compiler Flags
-CFLAGS=-O0
+CFLAGS=-m64 -O0 -march=native

 # CC Compiler Flags
 CCFLAGS=
@@ -115,6 +116,11 @@ ${OBJECTDIR}/src/socket.o: nbproject/Makefile-${CND_CONF}.mk src/socket.c
 	${RM} "$@.d"
 	$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c

+${OBJECTDIR}/src/util.o: nbproject/Makefile-${CND_CONF}.mk src/util.c 
+	${MKDIR} -p ${OBJECTDIR}/src
+	${RM} "$@.d"
+	$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/util.o src/util.c
+
 # Subprojects
 .build-subprojects:

--- a/nbproject/Makefile-Release.mk
+++ b/nbproject/Makefile-Release.mk
@@ -43,11 +43,12 @@ OBJECTFILES= \
 	${OBJECTDIR}/src/http.o \
 	${OBJECTDIR}/src/main.o \
 	${OBJECTDIR}/src/mime.o \
-	${OBJECTDIR}/src/socket.o
+	${OBJECTDIR}/src/socket.o \
+	${OBJECTDIR}/src/util.o


 # C Compiler Flags
-CFLAGS=
+CFLAGS=-m64 -march=native

 # CC Compiler Flags
 CCFLAGS=
@@ -60,7 +61,7 @@ FFLAGS=
 ASFLAGS=

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

 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
@@ -70,50 +71,55 @@ ${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 
+${OBJECTDIR}/lib/http_parser.o: nbproject/Makefile-${CND_CONF}.mk 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
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/http_parser.o lib/http_parser.c

-${OBJECTDIR}/lib/ini.o: lib/ini.c 
+${OBJECTDIR}/lib/ini.o: nbproject/Makefile-${CND_CONF}.mk lib/ini.c 
 	${MKDIR} -p ${OBJECTDIR}/lib
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/ini.o lib/ini.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/lib/ini.o lib/ini.c

-${OBJECTDIR}/src/config.o: src/config.c 
+${OBJECTDIR}/src/config.o: nbproject/Makefile-${CND_CONF}.mk src/config.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/config.o src/config.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/config.o src/config.c

-${OBJECTDIR}/src/http-reader.o: src/http-reader.c 
+${OBJECTDIR}/src/http-reader.o: nbproject/Makefile-${CND_CONF}.mk src/http-reader.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-reader.o src/http-reader.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-reader.o src/http-reader.c

-${OBJECTDIR}/src/http-server.o: src/http-server.c 
+${OBJECTDIR}/src/http-server.o: nbproject/Makefile-${CND_CONF}.mk src/http-server.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-server.o src/http-server.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-server.o src/http-server.c

-${OBJECTDIR}/src/http.o: src/http.c 
+${OBJECTDIR}/src/http.o: nbproject/Makefile-${CND_CONF}.mk src/http.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http.o src/http.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http.o src/http.c

-${OBJECTDIR}/src/main.o: src/main.c 
+${OBJECTDIR}/src/main.o: nbproject/Makefile-${CND_CONF}.mk src/main.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c

-${OBJECTDIR}/src/mime.o: src/mime.c 
+${OBJECTDIR}/src/mime.o: nbproject/Makefile-${CND_CONF}.mk src/mime.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/mime.o src/mime.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/mime.o src/mime.c

-${OBJECTDIR}/src/socket.o: src/socket.c 
+${OBJECTDIR}/src/socket.o: nbproject/Makefile-${CND_CONF}.mk src/socket.c 
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/socket.o src/socket.c
+
+${OBJECTDIR}/src/util.o: nbproject/Makefile-${CND_CONF}.mk src/util.c 
+	${MKDIR} -p ${OBJECTDIR}/src
+	${RM} "$@.d"
+	$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/util.o src/util.c

 # Subprojects
 .build-subprojects:
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -13,6 +13,7 @@
      <itemPath>src/main.h</itemPath>
      <itemPath>src/mime.h</itemPath>
      <itemPath>src/socket.h</itemPath>
+      <itemPath>src/util.h</itemPath>
    </logicalFolder>
    <logicalFolder name="ResourceFiles"
                   displayName="Resource Files"
@@ -30,6 +31,7 @@
      <itemPath>src/main.c</itemPath>
      <itemPath>src/mime.c</itemPath>
      <itemPath>src/socket.c</itemPath>
+      <itemPath>src/util.c</itemPath>
    </logicalFolder>
    <logicalFolder name="TestFiles"
                   displayName="Test Files"
@@ -57,11 +59,12 @@
      </toolsSet>
      <compileType>
        <cTool>
+          <architecture>2</architecture>
          <standard>3</standard>
          <incDir>
            <pElem>lib</pElem>
          </incDir>
-          <commandLine>-O0</commandLine>
+          <commandLine>-O0 -march=native</commandLine>
          <preprocessorList>
            <Elem>INI_ALLOW_BOM=0</Elem>
            <Elem>INI_ALLOW_MULTILINE=0</Elem>
@@ -119,26 +122,38 @@
      </item>
      <item path="src/socket.h" ex="false" tool="3" flavor2="0">
      </item>
+      <item path="src/util.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/util.h" ex="false" tool="3" flavor2="0">
+      </item>
    </conf>
    <conf name="Release" type="1">
      <toolsSet>
        <compilerSet>default</compilerSet>
        <dependencyChecking>true</dependencyChecking>
-        <rebuildPropChanged>false</rebuildPropChanged>
+        <rebuildPropChanged>true</rebuildPropChanged>
      </toolsSet>
      <compileType>
        <cTool>
          <developmentMode>5</developmentMode>
+          <architecture>2</architecture>
+          <standard>3</standard>
+          <incDir>
+            <pElem>lib</pElem>
+          </incDir>
+          <commandLine>-march=native</commandLine>
+          <preprocessorList>
+            <Elem>INI_ALLOW_BOM=0</Elem>
+            <Elem>INI_ALLOW_MULTILINE=0</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+          </preprocessorList>
+          <warningLevel>3</warningLevel>
        </cTool>
-        <ccTool>
-          <developmentMode>5</developmentMode>
-        </ccTool>
-        <fortranCompilerTool>
-          <developmentMode>5</developmentMode>
-        </fortranCompilerTool>
-        <asmTool>
-          <developmentMode>5</developmentMode>
-        </asmTool>
+        <linkerTool>
+          <linkerLibItems>
+            <linkerLibLibItem>magic</linkerLibLibItem>
+          </linkerLibItems>
+        </linkerTool>
      </compileType>
      <item path="content/error.html" ex="false" tool="3" flavor2="0">
      </item>
@@ -184,6 +199,10 @@
      </item>
      <item path="src/socket.h" ex="false" tool="3" flavor2="0">
      </item>
+      <item path="src/util.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/util.h" ex="false" tool="3" flavor2="0">
+      </item>
    </conf>
  </confs>
 </configurationDescriptor>
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -62,7 +62,7 @@
          <runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
        </runcommandpicklist>
        <runcommand>"${OUTPUT_PATH}"</runcommand>
-        <rundir></rundir>
+        <rundir>/home/sam/NetBeansProjects/KHttp/./dist/Debug/GNU-Linux-x86</rundir>
        <buildfirst>true</buildfirst>
        <terminal-type>0</terminal-type>
        <remove-instrumentation>0</remove-instrumentation>
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -8,19 +8,19 @@
    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
        <group>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/socket.c</file>
-            <file>file:/home/sam/NetBeansProjects/KHttp/content/khttpd.ini</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/config.c</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/content/dirindex.html</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http-server.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http.c</file>
-            <file>file:/home/sam/NetBeansProjects/KHttp/src/http-reader.h</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/lib/ut/utstring.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/main.h</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/lib/http_parser.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/Makefile</file>
-            <file>file:/home/sam/NetBeansProjects/KHttp/content/error.html</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/main.c</file>
+            <file>file:/home/sam/NetBeansProjects/KHttp/src/socket.h</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http-server.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/lib/ini.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/http.h</file>
-            <file>file:/home/sam/NetBeansProjects/KHttp/src/http-reader.c</file>
            <file>file:/home/sam/NetBeansProjects/KHttp/src/config.h</file>
        </group>
    </open-files>