Diff: Socket/WncUDPSocket.cpp

Revision:

28:dceb8da78e6d

Parent:

27:2dc9461c04dc

--- a/Socket/WncUDPSocket.cpp	Fri Mar 24 21:50:50 2017 +0000
+++ b/Socket/WncUDPSocket.cpp	Fri Mar 24 22:02:33 2017 +0000
@@ -27,32 +27,32 @@
 #include "WncUDPSocket.h"
 #include <cstring>
 
-UDPSocket::UDPSocket() :
+WncUDPSocket::WncUDPSocket() :
     _is_blocking(0),
     _btimeout(0){
 }
 
-UDPSocket::~UDPSocket() {
+WncUDPSocket::~WncUDPSocket() {
 }
 
-int UDPSocket::init(void) {
+int WncUDPSocket::init(void) {
     _is_blocking = false;   // start out not blocking, user will set it if desired
     return ( WNCInterface::_pwnc->getWncStatus() == WNC_GOOD )? 0:-1;
 }
 
 
-int UDPSocket::close(void) {
-    Socket::disconnect();
+int WncUDPSocket::close(void) {
+    WncSocket::disconnect();
     return ( WNCInterface::_pwnc->getWncStatus() == WNC_GOOD )? 0:-1;
 }
 
 // -1 if unsuccessful, else number of bytes written
-int UDPSocket::sendTo(WncEndpoint &remote, char *packet, int length) {
+int WncUDPSocket::sendTo(WncEndpoint &remote, char *packet, int length) {
     int ret = -1;
     
     CHK_WNCFE(( WNCInterface::_pwnc->getWncStatus() == FATAL_FLAG ), fail);
     if( remote._epAddr.port ) {  //make sure the Endpoint has an port assoicated with it
-        if( Socket::connect(remote._epAddr.IP,SOCK_DGRAM,remote._epAddr.port) ) {
+        if( WncSocket::connect(remote._epAddr.IP,SOCK_DGRAM,remote._epAddr.port) ) {
             if( WNCInterface::_pwnc->write(0,(const uint8_t*)packet,length) )
                 ret = length;
             close();
@@ -65,7 +65,7 @@
 // blocking is used to make the WNC keep checking for incoming data for a
 // period of time.
 
-void UDPSocket::set_blocking (bool blocking, unsigned int timeout) {
+void WncUDPSocket::set_blocking (bool blocking, unsigned int timeout) {
     _is_blocking = blocking;   // true or false
     _btimeout = timeout;       // user specifies in msec
  
@@ -75,7 +75,7 @@
 }
 
 // -1 if unsuccessful, else number of bytes received
-int UDPSocket::receiveFrom(WncEndpoint &remote, char *buffer, int length) {
+int WncUDPSocket::receiveFrom(WncEndpoint &remote, char *buffer, int length) {
     const uint8_t *ptr;
     Timer t;
     int done, ret = -1;
@@ -85,7 +85,7 @@
       return -1;
 
     CHK_WNCFE(( WNCInterface::_pwnc->getWncStatus() == FATAL_FLAG ), fail);
-    ret = Socket::connect(remote._epAddr.IP,SOCK_DGRAM,remote._epAddr.port);        
+    ret = WncSocket::connect(remote._epAddr.IP,SOCK_DGRAM,remote._epAddr.port);        
     
     t.start();
     do {