Changeset 17

Timestamp:

09/22/05 12:20:12 (3 years ago)

Author:

ross

Message:

cleaned out win32 code from posix UdpSocket? implementation

Files:

• oscpack/trunk/ip/posix/UdpSocket.cpp (modified) (9 diffs)

oscpack/trunk/ip/posix/UdpSocket.cpp

@@ -1 @@
-/*
-  oscpack -- Open Sound Control packet manipulation library
-  http://www.audiomulch.com/~rossb/oscpack
-
-  Copyright (c) 2004-2005 Ross Bencina <rossb@audiomulch.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files
-  (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge,
-  publish, distribute, sublicense, and/or sell copies of the Software,
-  and to permit persons to whom the Software is furnished to do so,
-  subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  Any person wishing to distribute modifications to the Software is
-  requested to send the modifications to the original developer so that
-  they can be incorporated into the canonical version.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-  ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#include "UdpSocket.h"
-
-#ifdef WIN32
-#include <winsock2.h>   // this must come first to prevent errors with MSVC7
-#include <windows.h>
-#include <mmsystem.h> // for timeGetTime()
-
-typedef int socklen_t;
-#endif
-
-#include <vector>
@@ -47 +11 @@
-#include <string.h> // for memset
-
-#ifndef WIN32
-#include <pthread.h>
-#include <unistd.h>
@@ -57 +20 @@
-#include <sys/time.h>
-#include <netinet/in.h> // for sockaddr_in
-#endif
-
-#include "PacketListener.h"
@@ -124 +86 @@
-  ~Implementation()
-  {
-#ifdef WIN32
-    if (socket_ != -1) closesocket(socket_);
-#else
-    if (socket_ != -1) close(socket_);
-#endif
-  }
-
@@ -163 +121 @@
-      // unconnect from the remote address
-    
-#ifdef WIN32
-      struct sockaddr_in unconnectSockAddr;
-      SockaddrFromIpEndpointName( unconnectSockAddr, IpEndpointName() );
-
-      if( connect(socket_, (struct sockaddr *)&unconnectSockAddr, sizeof(unconnectSockAddr)) < 0 
-          && WSAGetLastError() != WSAEADDRNOTAVAIL ){
-        throw std::runtime_error("unable to un-connect udp socket\n");
-      }
-#else
-      struct sockaddr_in unconnectSockAddr;
-      memset( (char *)&unconnectSockAddr, 0, sizeof(unconnectSockAddr ) );
@@ -180 +129 @@
-        throw std::runtime_error("unable to un-connect udp socket\n");
-      }
-#endif
-    }
-
@@ -313 +261 @@
-SocketReceiveMultiplexer *multiplexerInstanceToAbortWithSigInt_ = 0;
-
-static
-static
+/*static*/
+/*static*/
-{
-  multiplexerInstanceToAbortWithSigInt_->AsynchronousBreak();
@@ -456 +404 @@
-      }
-
-
-      // execute any expired timers
-      currentTimeMs = GetCurrentTimeMs();
@@ -486 +433 @@
-    break_ = true;
-    // FIXME: need to do something here to break through the select, not sure what
-
+
+
-  }
-};