Author: lukaselmer

simple_test/nbproject/build-impl.xml

@@ -291,15 +291,18 @@ is divided into following sections:
  <attribute default="${build.classes.dir}" name="destdir"/>
  <sequential>
  <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
+ <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
  <path>
  <filelist dir="@{destdir}" files="${javac.includes}"/>
  </path>
  <globmapper from="*.java" to="*.class"/>
  </pathconvert>
+ <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+ <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
  <delete>
- <files includes="${javac.includes.binary}"/>
+ <files includesfile="${javac.includesfile.binary}"/>
  </delete>
+ <delete file="${javac.includesfile.binary}"/>
  </sequential>
  </macrodef>
  </target>

simple_test/nbproject/genfiles.properties

@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=8068a516
-nbproject/build-impl.xml.script.CRC32=05998054
-nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
+nbproject/build-impl.xml.script.CRC32=34f79022
+nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45

simple_test/nbproject/private/private.properties

@@ -1,2 +1,2 @@
 compile.on.save=true
-user.properties.file=C:\\Users\\Lukas Elmer\\.netbeans\\6.9\\build.properties
+user.properties.file=D:\\Users\\Lukas Elmer\\.netbeans\\6.9\\build.properties

u11_testat/ServerSocket.cpp

@@ -11,11 +11,22 @@ ServerSocket::~ServerSocket() {
  doClose();
 }
 
+bool ServerSocket::setSocketOptions() {
+ char x = 1;
+ if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, (const char*) &x, sizeof (x)) == -1) {
+ return false;
+ }
+ //set reuse socket opt
+ if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const char*) &x, sizeof (x)) == -1) {
+ return false;
+ }
+ return true;
+}
+
 bool ServerSocket::prepareServerSocket() {
  sockfd = socket(AF_INET, SOCK_STREAM, 0);
- //set reuse socket opt
  char x = 1;
- if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const char*) &x, sizeof (x))) {
+ if (!setSocketOptions()) {
  return false;
  }
 

u11_testat/ServerSocket.h

@@ -21,6 +21,7 @@ class ServerSocket {
  bool prepareServerSocket();
  int doAccept();
  void doClose();
+ bool setSocketOptions();
 private:
  int sockfd;
  unsigned short port;

u11_testat/SocketIO.cpp

@@ -2,19 +2,15 @@
 
 using namespace std;
 
-SocketIO::SocketIO(int fd) : sock(fd), /*writePtr(buf), readPtr(buf), endPtr(buf + sizeof (buf)),*/ eof_reached(true) {
+SocketIO::SocketIO(int fd) : sock(fd), lines(""), /*writePtr(buf), readPtr(buf), endPtr(buf + sizeof (buf)),*/ eof_reached(true) {
 }
 
 SocketIO::~SocketIO() {
  this->doClose();
 }
 
 string SocketIO::readlines() {
- fillbuf();
- if (eof_reached) {
- return "";
- }
- eof_reached = true;
+ while (fillbuf());
  return lines;
 }
 
@@ -30,6 +26,10 @@ void SocketIO::doClose() {
  sock = -1;
 }
 
+void SocketIO::closeReadSocket() {
+ shutdown(sock, SHUT_RD);
+}
+
 string SocketIO::getPeerInfo() {
  struct sockaddr_in peerInfo;
  socklen_t len = sizeof (peerInfo);
@@ -43,12 +43,13 @@ string SocketIO::getPeerInfo() {
 }
 
 bool SocketIO::fillbuf() { // corresponds to streambuf::underflow()
- int i = recv(sock, buf, BUF_SIZE, 0);
- if (i < 0) {
- lines = "";
+ int i = recv(sock, buf, BUF_SIZE, MSG_DONTWAIT);
+ if (i <= 0) {
+ eof_reached = true;
  return false;
  }
- eof_reached = (i == 0);
- lines = string(buf, buf + i);
+ eof_reached = false;
+ string new_lines(buf, buf + i);
+ lines += new_lines;
  return true;
 }

u11_testat/SocketIO.h

@@ -25,6 +25,7 @@ class SocketIO {
  void writeN(const char *buf, int len);
  void doClose();
  std::string getPeerInfo();
+ void closeReadSocket();
 private:
  int sock; // socket file descriptor
  char buf[BUF_SIZE]; // a bit stupid way to mimick an istream

u11_testat/htechoserv.cpp

@@ -37,7 +37,9 @@ string generateResponse(string request, string clintinfo, int counter) {
  "<div>This is request <b>#" << counter << "</b>.</div>" <<
  "<div>This is your request:</div>" <<
  "<pre>" << request << "</pre>" <<
- "</body></html>\n";
+ "<form action=\"input_file.htm\" method=\"post\" enctype=\"multipart/form-data\">" <<
+ "File upload test: <input name=\"Datei\" type=\"file\" /><input type=\"submit\" />" <<
+ "</form>" << "</body></html>\n";
  ss2 << getHeaders(ss1.str().length()) << ss1.str();
  return ss2.str();
 }
@@ -74,16 +76,17 @@ int main(int argc, char**argv) {
  SocketIO sio(clientfd);
  cout << "Connected to " << sio.getPeerInfo() << endl;
  string lines_received = sio.readlines();
+ sio.closeReadSocket();
  if (quitRequested(lines_received)) {
  cout << endl << endl;
  quit = true;
  }
  string reply = generateResponse(lines_received, sio.getPeerInfo(), counter);
- sleep(5);
+ //sleep(5);
  sio.writeN(reply.c_str(), reply.length());
  sio.doClose();
 
- cout << "Request done!" << endl << endl;
+ cout << "*** Request done ***" << endl << endl;
  if (quit) {
  cout << "******************************" << endl;
  cout << "* SERVER IS SHUTTING DOWN!!! *" << endl;