Minor corrections

program/Source/networking/FileServerConnection.cpp

@@ -20,7 +20,7 @@ void FileServerConnection::run()
 
 	int msgType;
 	int fileNameSize;
-	streamsize fileSize;
+	long long fileSize;
 
 	socket().receiveBytes(&msgType, sizeof(msgType));
 	socket().receiveBytes(&fileNameSize, sizeof(fileNameSize));
@@ -50,9 +50,9 @@ void FileServerConnection::run()
 		}
 
 		// Send file
-		auto size = getFileSize(file);
+		fileSize = getFileSize(file);
 		socket().sendBytes(&OK_ANS, sizeof(OK_ANS));
-		socket().sendBytes(&size, sizeof(size));
+		socket().sendBytes(&fileSize, sizeof(fileSize));
 		while (file)
 		{
 			file.read(buffer, sizeof(buffer));
@@ -67,7 +67,7 @@ void FileServerConnection::run()
 		socket().receiveBytes(&fileSize, sizeof(fileSize));
 
 		// Create file
-		ofstream file("out/" + fileName, ios::out | ios::binary);
+		ofstream file(dataFolder + fileName, ios::out | ios::binary);
 
 		// Start receiving file
 		while (fileSize != 0)
@@ -78,7 +78,15 @@ void FileServerConnection::run()
 		}
 
 		socket().sendBytes(&OK_ANS, sizeof(OK_ANS));
+		socket().close();
+		file.close();
 		cout << "received: " << fileName << endl;
+
+		auto result = app.cfs.addFile(fileName, fileName);
+		if (!result)
+			cout << "error uploading file: " << fileName << endl;
+		else
+			cout << "successfully uploaded file: " << fileName << endl;
 	}
 	else
 	{

program/Source/networking/HomeNetworkCommunications.cpp

@@ -66,7 +66,7 @@ bool HomeNetworkCommunications::addFileRemote(string fileID)
 	}
 
 	socket.receiveBytes(&msgType, sizeof(msgType));
-	if (msgType != OK_ANS)
+	if (msgType == OK_ANS)
 		// Successfully sent
 		return true;
 
@@ -87,7 +87,6 @@ ReturnableFile HomeNetworkCommunications::getFileRemote(string fileID)
 		return result;
 	}
 	
-	
 	int msgType;
 	int fileNameSize = fileID.size();
 	long long fileSize;
@@ -112,6 +111,11 @@ ReturnableFile HomeNetworkCommunications::getFileRemote(string fileID)
 	// Get file
 	char buffer[100000];
 	ofstream file(dataFolder + fileID, ios::out | ios::binary);
+	if (!file)
+	{
+		result.setErrorMessage("Error creating file");
+		return result;
+	}
 
 	socket.receiveBytes(&fileSize, sizeof(fileSize));
 	while (fileSize != 0)