|
@@ -94,12 +94,9 @@ std::vector<char> cppsocket::receive(){
|
|
|
if(val < 0){
|
|
|
throw socket_exception(strerror(errno));
|
|
|
}
|
|
|
- std::cout << val << ", ";
|
|
|
stor.insert(stor.end(), buffer.begin(), buffer.begin() + std::min(val, (ssize_t)buffersize));
|
|
|
- if(buffer.data()[buffersize] == (char)0){std::cout << "Breaking" << std::endl;break;}
|
|
|
- else{
|
|
|
- std::cout << "Continuing loop" << std::endl;
|
|
|
- }
|
|
|
+ if(buffer.data()[buffersize] == (char)0){break;}
|
|
|
+
|
|
|
}
|
|
|
std::cout << std::endl;
|
|
|
return stor;
|
|
@@ -108,10 +105,10 @@ server_socket::server_socket(int _port) : port_(_port){
|
|
|
int opt = 1;
|
|
|
addrlen = sizeof(address);
|
|
|
if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) == 0) {
|
|
|
- throw socket_exception("server_socket creation failed");
|
|
|
+ throw socket_exception(std::string("server_socket creation failed: ") + strerror(errno));
|
|
|
}
|
|
|
if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt))) {
|
|
|
- throw socket_exception("server_socket creation failed");
|
|
|
+ throw socket_exception(std::string("server_socket creation failed: ") + strerror(errno));
|
|
|
}
|
|
|
address.sin_family = AF_INET;
|
|
|
address.sin_addr.s_addr = INADDR_ANY;
|
|
@@ -127,7 +124,7 @@ cppsocket server_socket::accept_connection(){
|
|
|
int new_socket;
|
|
|
sockaddr client_addr;
|
|
|
if ((new_socket = accept(server_fd, (struct sockaddr *)&client_addr,(socklen_t*)&addrlen))<0){
|
|
|
- throw socket_exception("Socket accept failed");
|
|
|
+ throw socket_exception(std::string("Socket accept failed: ") + strerror(errno));
|
|
|
}
|
|
|
return cppsocket(*((sockaddr_in*)&client_addr), new_socket);
|
|
|
}
|