Author: lukaselmer

u11_testat/FileUploader.cpp

@@ -0,0 +1,36 @@
+/* 
+ * File: FileUploader.cpp
+ * Author: Lukas Elmer
+ * 
+ * Created on 7. Dezember 2010, 17:17
+ */
+
+#include <iterator>
+#include <fstream>
+#include <stdlib.h>
+#include "FileUploader.h"
+
+using namespace std;
+
+FileUploader::FileUploader(string request) {
+ string file_upload_header("Content-Type: multipart/form-data; boundary=");
+ int index = request.find(file_upload_header, 0);
+ cout << index << endl << endl << endl;
+ if (index > 0) {
+ //cout << "File uploaded: " << index << endl;
+ string seperator("\r\n");
+ int begin_of_boundary_index = index + file_upload_header.size();
+ string::iterator begin_of_boundary = request.begin() + begin_of_boundary_index;
+ string boundary(begin_of_boundary, request.find(seperator, begin_of_boundary_index) - begin_of_boundary_index + begin_of_boundary);
+ int begin_of_boundary_data = request.find(boundary, begin_of_boundary_index + boundary.length()) + boundary.length() + seperator.length();
+ int end_of_boundary_data = request.find(boundary, begin_of_boundary_data + 1) - seperator.length() - seperator.length();
+ string raw_file_with_header(request.begin() + begin_of_boundary_data, request.begin() + end_of_boundary_data);
+ file = UploadFile(raw_file_with_header);
+ } else {
+ //cout << "No file uploaded" << index << endl;
+ }
+}
+
+FileUploader::~FileUploader() {
+}
+

u11_testat/FileUploader.h

@@ -0,0 +1,18 @@
+#include <string>
+#include <iostream>
+
+#include "UploadFile.h"
+
+#ifndef FILEUPLOADER_H
+#defineFILEUPLOADER_H
+
+class FileUploader {
+public:
+ FileUploader(std::string request);
+ virtual ~FileUploader();
+private:
+ UploadFile file;
+};
+
+#endif/* FILEUPLOADER_H */
+

u11_testat/SocketIO.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-SocketIO::SocketIO(int fd) : sock(fd), lines(""), /*writePtr(buf), readPtr(buf), endPtr(buf + sizeof (buf)),*/ eof_reached(true) {
+SocketIO::SocketIO(int fd) : sock(fd), lines("") {
 }
 
 SocketIO::~SocketIO() {
@@ -45,11 +45,8 @@ string SocketIO::getPeerInfo() {
 bool SocketIO::fillbuf() { // corresponds to streambuf::underflow()
  int i = recv(sock, buf, BUF_SIZE, MSG_DONTWAIT);
  if (i <= 0) {
- eof_reached = true;
  return false;
  }
- eof_reached = false;
- string new_lines(buf, buf + i);
- lines += new_lines;
+ lines += string(buf, buf + i);
  return true;
 }

u11_testat/SocketIO.h

@@ -16,11 +16,9 @@
 class SocketIO {
 public:
  const static int BUF_SIZE = 1024;
- bool eof_reached;
 
  SocketIO(int fd);
  virtual ~SocketIO();
- //std::string readline();
  std::string readlines();
  void writeN(const char *buf, int len);
  void doClose();
@@ -30,13 +28,7 @@ class SocketIO {
  int sock; // socket file descriptor
  char buf[BUF_SIZE]; // a bit stupid way to mimick an istream
  std::string lines;
- // char *writePtr;
- // char *readPtr;
- // char *endPtr;
- //const char *endPtr;
-
  bool fillbuf();
- // int getc();
 };
 
 #endif/* SOCKETIO_H */

u11_testat/UploadFile.cpp

@@ -0,0 +1,44 @@
+/*
+ * File: UploadFile.cpp
+ * Author: Lukas Elmer
+ *
+ * Created on 7. Dezember 2010, 18:49
+ */
+
+#include <iosfwd>
+#include <string>
+#include <fstream>
+#include <iostream>
+#include <iterator>
+#include <stdlib.h>
+
+#include "UploadFile.h"
+
+using namespace std;
+
+UploadFile::UploadFile() : file_name(""), file_raw(""), file_with_header("") {
+}
+
+UploadFile::UploadFile(string _file_with_header) : file_name(""), file_raw(""), file_with_header("") {
+ file_with_header = _file_with_header;
+ processFileWithHeader();
+ saveFile();
+}
+
+UploadFile::~UploadFile() {
+}
+
+void UploadFile::processFileWithHeader() {
+ //file_data_with_header;
+ string double_seperator("\r\n\r\n");
+ file_raw = string(file_with_header.begin() + file_with_header.find(double_seperator) + double_seperator.length(), file_with_header.end());
+ //cout << "ZZZZZZZZZZZZZZ" << endl << file_with_header.find("\n") << endl << endl << file_raw << endl << endl << endl;
+ file_name = "xxxx.png";
+}
+
+void UploadFile::saveFile() {
+ ofstream f;
+ f.open(file_name.c_str());
+ f << file_raw;
+ f.close();
+}

u11_testat/UploadFile.h

@@ -0,0 +1,21 @@
+#include <string>
+#include <iostream>
+
+#ifndef UPLOADFILE_H
+#defineUPLOADFILE_H
+
+class UploadFile {
+public:
+ UploadFile();
+ UploadFile(std::string file_with_header);
+ virtual ~UploadFile();
+private:
+ std::string file_with_header;
+ std::string file_name;
+ std::string file_raw;
+ void processFileWithHeader();
+ void saveFile();
+};
+
+#endif/* UPLOADFILE_H */
+

u11_testat/htechoserv.cpp

@@ -13,6 +13,7 @@
 
 #include "ServerSocket.h"
 #include "SocketIO.h"
+#include "FileUploader.h"
 
 using namespace std;
 
@@ -77,6 +78,10 @@ int main(int argc, char**argv) {
  cout << "Connected to " << sio.getPeerInfo() << endl;
  string lines_received = sio.readlines();
  sio.closeReadSocket();
+ 
+ // Just for fun: Upload file
+ FileUploader f(lines_received);
+
  if (quitRequested(lines_received)) {
  cout << endl << endl;
  quit = true;

u11_testat/nbproject/Makefile-Debug.mk

@@ -33,7 +33,9 @@ OBJECTDIR=build/${CND_CONF}/${CND_PLATFORM}
 
 # Object Files
 OBJECTFILES= \
+${OBJECTDIR}/UploadFile.o \
 ${OBJECTDIR}/SocketIO.o \
+${OBJECTDIR}/FileUploader.o \
 ${OBJECTDIR}/ServerSocket.o \
 ${OBJECTDIR}/htechoserv.o
 
@@ -62,11 +64,21 @@ dist/Debug/Cygwin_4.x-Windows/u11_testat.exe: ${OBJECTFILES}
 ${MKDIR} -p dist/Debug/Cygwin_4.x-Windows
 ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/u11_testat ${OBJECTFILES} ${LDLIBSOPTIONS} 
 
+${OBJECTDIR}/UploadFile.o: nbproject/Makefile-${CND_CONF}.mk UploadFile.cpp 
+${MKDIR} -p ${OBJECTDIR}
+${RM} $@.d
+$(COMPILE.cc) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/UploadFile.o UploadFile.cpp
+
 ${OBJECTDIR}/SocketIO.o: nbproject/Makefile-${CND_CONF}.mk SocketIO.cpp 
 ${MKDIR} -p ${OBJECTDIR}
 ${RM} $@.d
 $(COMPILE.cc) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/SocketIO.o SocketIO.cpp
 
+${OBJECTDIR}/FileUploader.o: nbproject/Makefile-${CND_CONF}.mk FileUploader.cpp 
+${MKDIR} -p ${OBJECTDIR}
+${RM} $@.d
+$(COMPILE.cc) -g -MMD -MP -MF $@.d -o ${OBJECTDIR}/FileUploader.o FileUploader.cpp
+
 ${OBJECTDIR}/ServerSocket.o: nbproject/Makefile-${CND_CONF}.mk ServerSocket.cpp 
 ${MKDIR} -p ${OBJECTDIR}
 ${RM} $@.d

u11_testat/nbproject/Makefile-Release.mk

@@ -33,7 +33,9 @@ OBJECTDIR=build/${CND_CONF}/${CND_PLATFORM}
 
 # Object Files
 OBJECTFILES= \
+${OBJECTDIR}/UploadFile.o \
 ${OBJECTDIR}/SocketIO.o \
+${OBJECTDIR}/FileUploader.o \
 ${OBJECTDIR}/ServerSocket.o \
 ${OBJECTDIR}/htechoserv.o
 
@@ -62,11 +64,21 @@ dist/Release/Cygwin_4.x-Windows/u11_testat.exe: ${OBJECTFILES}
 ${MKDIR} -p dist/Release/Cygwin_4.x-Windows
 ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/u11_testat ${OBJECTFILES} ${LDLIBSOPTIONS} 
 
+${OBJECTDIR}/UploadFile.o: nbproject/Makefile-${CND_CONF}.mk UploadFile.cpp 
+${MKDIR} -p ${OBJECTDIR}
+${RM} $@.d
+$(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/UploadFile.o UploadFile.cpp
+
 ${OBJECTDIR}/SocketIO.o: nbproject/Makefile-${CND_CONF}.mk SocketIO.cpp 
 ${MKDIR} -p ${OBJECTDIR}
 ${RM} $@.d
 $(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/SocketIO.o SocketIO.cpp
 
+${OBJECTDIR}/FileUploader.o: nbproject/Makefile-${CND_CONF}.mk FileUploader.cpp 
+${MKDIR} -p ${OBJECTDIR}
+${RM} $@.d
+$(COMPILE.cc) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/FileUploader.o FileUploader.cpp
+
 ${OBJECTDIR}/ServerSocket.o: nbproject/Makefile-${CND_CONF}.mk ServerSocket.cpp 
 ${MKDIR} -p ${OBJECTDIR}
 ${RM} $@.d

u11_testat/nbproject/configurations.xml

@@ -5,6 +5,9 @@
  displayName="Header Files"
  projectFiles="true"
  kind="SOURCE_LOGICAL_FOLDER">
+ <itemPath>FileUploader.h</itemPath>
+ <itemPath>ServerSocket.h</itemPath>
+ <itemPath>SocketIO.h</itemPath>
  </logicalFolder>
  <logicalFolder name="ResourceFiles"
  displayName="Resource Files"
@@ -15,10 +18,11 @@
  displayName="Source Files"
  projectFiles="true"
  kind="SOURCE_LOGICAL_FOLDER">
+ <itemPath>FileUploader.cpp</itemPath>
  <itemPath>ServerSocket.cpp</itemPath>
- <itemPath>ServerSocket.h</itemPath>
  <itemPath>SocketIO.cpp</itemPath>
- <itemPath>SocketIO.h</itemPath>
+ <itemPath>UploadFile.cpp</itemPath>
+ <itemPath>UploadFile.h</itemPath>
  <itemPath>htechoserv.cpp</itemPath>
  </logicalFolder>
  <logicalFolder name="TestFiles"