瀏覽代碼

Fix CR Bug

mawinkle 6 年之前
父節點
當前提交
76922d46ba
共有 4 個文件被更改,包括 20 次插入17 次删除
  1. 2 9
      server.cpp
  2. 1 1
      socketio.hpp
  3. 2 2
      socketio_posix.cpp
  4. 15 5
      test.cpp

+ 2 - 9
server.cpp

@@ -3,15 +3,8 @@
 template<typename T>
 std::ostream& operator<<(std::ostream& out, std::vector<T> o){
 	out << "(";
-	/*out << o[0];
-	out << ", ";
-	out << o[1];
-	out << ", ";
-	out << o[2];
-	out << ", ";
-	out << o[3];
-	out << ", ";*/
 	for(int i = 0;i < o.size();i++){
+		if(o[i] == '\r')continue;
 		out << o[i];
 		if(i < (o.size() - 1))
 			out << ", ";
@@ -30,5 +23,5 @@ int main(){
 	cppsocket sock = ssock.accept_connection();
 	std::vector<char> vec = sock.receive();
 	std::cout << vec << std::endl;
-	sock.write("Message2");
+	sock.write(vec);
 }

+ 1 - 1
socketio.hpp

@@ -14,7 +14,7 @@ private:
 	int sock;
 	std::vector<char> buffer;
 public:
-	const static constexpr unsigned int buffersize = 1024;
+	const static std::size_t buffersize = 1024;
 	cppsocket(sockaddr_in _serv_addr, int _sock);
 	cppsocket();
 	cppsocket(const std::string& addr, unsigned int PORT);

+ 2 - 2
socketio_posix.cpp

@@ -48,7 +48,7 @@ void cppsocket::write(const std::string& message){
 			send(sock, cs, buffersize + 1, 0);
 		}
 		else{
-			cs[message.length() - buffersize] = (char)0;
+			cs[message.length() - i] = (char)0;
 			send(sock, cs, message.length() - i, 0);
 		}
 	}
@@ -62,7 +62,7 @@ void cppsocket::write(const std::vector<char>& message){
 			send(sock, cs, buffersize + 1, 0);
 		}
 		else{
-			cs[message.size() - buffersize] = (char)0;
+			cs[message.size() - i] = (char)0;
 			send(sock, cs, message.size() - i, 0);
 		}
 	}

+ 15 - 5
test.cpp

@@ -10,13 +10,23 @@ std::ostream& operator<<(std::ostream& out, std::vector<T> o){
 	}
 	return out << "]";
 }
+template<>
+std::ostream& operator<< <char>(std::ostream& out, std::vector<char> o){
+	for(int i = 0;i < o.size();i++){
+		out << o[i];
+	}
+	return out;
+}
 int main(){
 	cppsocket sock("127.0.0.1", 80);
-	//sock.write("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.");
-	sock.write("sdkjfshdflkjsh");
+	std::vector<char> toSend(1000000);
+	for(unsigned int i = 0;i < toSend.size();i++){
+		toSend[i] = (char)i;
+	}
+	sock.write(toSend);
 	std::vector<char> vec = sock.receive();
-	std::cout << vec << std::endl;
-	vec = sock.receive();
-	std::cout << vec << std::endl;
+	std::cout << (unsigned int)vec[18] << std::endl;
+	//vec = sock.receive();
+	//std::cout << vec << std::endl;
 	return 0;
 }