Diff: Socket/Socket.cpp

Revision:

12:1c2a856c618a

Parent:

11:5e3771b29385

Child:

16:f3676ae62f96

--- a/Socket/Socket.cpp	Tue Oct 01 21:17:44 2013 +0000
+++ b/Socket/Socket.cpp	Wed Oct 02 17:02:34 2013 +0200
@@ -55,11 +55,11 @@
 }
 
 int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen) {
-    return _cc3000_module->_socket.set_sockopt(_sock_fd, level, optname, optval, optlen);
+    return _cc3000_module->_socket.setsockopt(_sock_fd, level, optname, optval, optlen);
 }
 
 int Socket::get_option(int level, int optname, void *optval, socklen_t *optlen) {
-    return _cc3000_module->_socket.get_sockopt(_sock_fd, level, optname, optval, optlen);
+    return _cc3000_module->_socket.getsockopt(_sock_fd, level, optname, optval, optlen);
 }
 
 int Socket::select(struct timeval *timeout, bool read, bool write) {
@@ -76,7 +76,7 @@
 
     int ret = _cc3000_module->_socket.select(_sock_fd+1, readset, writeset, NULL, timeout);
 #if (CC3000_DEBUG == 1)
-    printf("DEBUG: Select on sock_fd: %d, returns %d. fdSet: %d\r\n",_sock_fd, ret, fdSet);
+    printf("DEBUG: Select on sock_fd: %d, returns %d. fdSet: %d \r\n",_sock_fd, ret, fdSet);
 #endif
     // TODO
     //return (ret <= 0 || !FD_ISSET(_sock_fd, &fdSet)) ? (-1) : (0);