git-svn-id: svn://imanolbarba.net/PAD@57 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent dc242cfe
Showing 6 changed files with 4 additions and 4 deletions
JChatClient/bin/client
JChatClient/src/Socket.cpp
JChatServer/bin/pad/prac2/Connection.class
JChatServerV2/bin/pad/prac2/Connection.class
JChatServerV2/bin/pad/prac2/MySocket.class
JChatServerV2/src/pad/prac2/MySocket.java
@@ -27,7 +27,7 @@ void Socket::Create()
     	throw SocketException ( "TCP: Could not create socket" );
     }
     setsockopt(sock,SOL_SOCKET,SO_KEEPALIVE,&optval,sizeof optval);
-    setsockopt(sock, SOL_TCP, TCP_NODELAY, &optval, sizeof optval);
+    setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof optval);
 }
 void Socket::Bind(string address, int port)
@@ -35,7 +35,7 @@ void Socket::Bind(string address, int port)
     sockAddr.sin_family = AF_INET;
     sockAddr.sin_port = htons(port);
     sockAddr.sin_addr.s_addr = inet_addr(address.c_str());
-    if(bind(sock, (struct sockaddr *)&sockAddr, sizeof(struct sockaddr)) != 0)
+    if(::bind(sock, (struct sockaddr *)&sockAddr, sizeof(struct sockaddr)) != 0)
     {
     	stringstream sstream;
     	sstream <<  "TCP: Could not bind to address " << address << " on port " << port;
@@ -186,4 +186,4 @@ const Socket&amp; Socket::operator &gt;&gt; ( std::string&amp; text )
         message = NULL;
     }
     return *this;
-}
 \ No newline at end of file
+}
@@ -37,7 +37,7 @@ public class MySocket extends Socket
 		try
 		{
 			output = super.getOutputStream();
-			input = new BufferedReader(new InputStreamReader(super.getInputStream()));
+			input = new BufferedReader(new InputStreamReader(super.getInputStream(),"UTF-8"));
 		}
 		catch(IOException ioExc)
 		{