|
@@ -18,14 +18,14 @@ struct socket_exception : public std::exception{
|
|
|
return msg.length() == 0 ? "Connection creation failure" : msg.c_str();
|
|
|
}
|
|
|
};
|
|
|
-cppsocket::cppsocket(sockaddr_in _serv_addr,int _sock) : sock(_sock), serv_addr(_serv_addr){
|
|
|
+cppsocket::cppsocket(sockaddr_in _serv_addr,int _sock) : serv_addr(_serv_addr),sock(_sock){
|
|
|
buffer = std::vector<char>(buffersize + 1,0);
|
|
|
}
|
|
|
-cppsocket::cppsocket(){buffer = std::vector<char>(buffersize + 1, 0);};
|
|
|
+cppsocket::cppsocket(){buffer = std::vector<char>(buffersize + 1, 0);}
|
|
|
cppsocket::cppsocket(const std::string& addr, unsigned int PORT){
|
|
|
- struct sockaddr_in address;
|
|
|
+ //struct sockaddr_in address;
|
|
|
sock = 0;
|
|
|
- int valread;
|
|
|
+ //int valread;
|
|
|
buffer = std::vector<char>(buffersize + 1, 0);
|
|
|
if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
|
|
|
throw socket_exception("Socket creation error");
|
|
@@ -112,6 +112,13 @@ server_socket::server_socket(int _port) : port_(_port){
|
|
|
void server_socket::close(){
|
|
|
shutdown(server_fd, SHUT_RDWR);
|
|
|
}
|
|
|
+server_socket::server_socket(server_socket&& o){
|
|
|
+ port_ = o.port_;
|
|
|
+ server_fd = o.server_fd;
|
|
|
+ o.server_fd = 0;
|
|
|
+ address = o.address;
|
|
|
+ addrlen = o.addrlen;
|
|
|
+}
|
|
|
cppsocket server_socket::accept_connection(){
|
|
|
int new_socket;
|
|
|
sockaddr client_addr;
|