Skip to content

Commit

Permalink
replace v0073
Browse files Browse the repository at this point in the history
  • Loading branch information
hideyukisaito committed Mar 11, 2013
1 parent a5c4bca commit 6e69e0d
Show file tree
Hide file tree
Showing 30 changed files with 3,109 additions and 357 deletions.
41 changes: 34 additions & 7 deletions install.xml
Expand Up @@ -22,6 +22,40 @@
<file>../../../addons/ofxOsc/src/ofxOscSender.cpp</file>
<file>../../../addons/ofxOsc/src/ofxOscSender.h</file>
</folder>

<folder name="addons/ofxOsc/libs/oscpack/src/ip">
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/NetworkingUtils.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/PacketListener.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/TimerListener.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/UdpSocket.h</file>
</folder>

<folder name="addons/ofxOsc/libs/oscpack/src/ip/posix">
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/posix/NetworkingUtils.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/posix/UdpSocket.cpp</file>
</folder>

<folder name="addons/ofxOsc/libs/oscpack/src/ip/win32">
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/win32/NetworkingUtilsWin.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/ip/win32/UdpSocketWin.cpp</file>
</folder>

<folder name="addons/ofxOsc/libs/oscpack/src/osc">
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/MessageMappingOscPacketListener.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscException.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscHostEndianness.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscOutboundPacketStream.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscPacketListener.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscPrintReceivedElements.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscReceivedElements.h</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscTypes.cpp</file>
<file>../../../addons/ofxOsc/libs/oscpack/src/osc/OscTypes.h</file>
</folder>
</src>

<include>
Expand All @@ -31,13 +65,6 @@
</include>

<link>
<lib os="win_cb" compiler="codeblocks">../../../addons/ofxOsc/libs/oscpack/lib/win32/oscpack.a</lib>
<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxOsc/libs/oscpack/lib/win32/oscpack.lib</lib>
<lib os="linux" compiler="codeblocks, makefile">../../../addons/ofxOsc/libs/oscpack/lib/linux/liboscpack.a</lib>
<lib os="linux64" compiler="codeblocks, makefile">../../../addons/ofxOsc/libs/oscpack/lib/linux64/liboscpack.a</lib>
<lib os="mac" compiler="xcode">../../../addons/ofxOsc/libs/oscpack/lib/osx/osc.a</lib>
<lib os="iphone" compiler="xcode">../../../addons/ofxOsc/libs/oscpack/lib/iphone/osc.a</lib>
<lib os="iphone" compiler="xcode">../../../addons/ofxOsc/libs/oscpack/lib/osx/osc.a</lib>
</link>

</add>
Expand Down
Binary file removed libs/oscpack/lib/osx/osc.a
Binary file not shown.
81 changes: 81 additions & 0 deletions libs/oscpack/src/ip/IpEndpointName.cpp
@@ -0,0 +1,81 @@
/*
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 "IpEndpointName.h"

#include <cstdio>

#include "NetworkingUtils.h"


unsigned long IpEndpointName::GetHostByName( const char *s )
{
return ::GetHostByName(s);
}


void IpEndpointName::AddressAsString( char *s ) const
{
if( address == ANY_ADDRESS ){
sprintf( s, "<any>" );
}else{
sprintf( s, "%d.%d.%d.%d",
(int)((address >> 24) & 0xFF),
(int)((address >> 16) & 0xFF),
(int)((address >> 8) & 0xFF),
(int)(address & 0xFF) );
}
}


void IpEndpointName::AddressAndPortAsString( char *s ) const
{
if( port == ANY_PORT ){
if( address == ANY_ADDRESS ){
sprintf( s, "<any>:<any>" );
}else{
sprintf( s, "%d.%d.%d.%d:<any>",
(int)((address >> 24) & 0xFF),
(int)((address >> 16) & 0xFF),
(int)((address >> 8) & 0xFF),
(int)(address & 0xFF) );
}
}else{
if( address == ANY_ADDRESS ){
sprintf( s, "<any>:%d", port );
}else{
sprintf( s, "%d.%d.%d.%d:%d",
(int)((address >> 24) & 0xFF),
(int)((address >> 16) & 0xFF),
(int)((address >> 8) & 0xFF),
(int)(address & 0xFF),
(int)port );
}
}
}
Expand Up @@ -54,6 +54,8 @@ class IpEndpointName{
unsigned long address;
int port;

bool IsMulticastAddress() const { return ((address >> 24) & 0xFF) >= 224 && ((address >> 24) & 0xFF) <= 239; }

enum { ADDRESS_STRING_LENGTH=17 };
void AddressAsString( char *s ) const;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
59 changes: 59 additions & 0 deletions libs/oscpack/src/ip/posix/NetworkingUtils.cpp
@@ -0,0 +1,59 @@
/*
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 "ip/NetworkingUtils.h"
#if !defined( __WIN32__ ) && !defined( _WIN32 )

#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <string.h>
#include <stdio.h>



NetworkInitializer::NetworkInitializer() {}

NetworkInitializer::~NetworkInitializer() {}


unsigned long GetHostByName( const char *name )
{
unsigned long result = 0;

struct hostent *h = gethostbyname( name );
if( h ){
struct in_addr a;
memcpy( &a, h->h_addr_list[0], h->h_length );
result = ntohl(a.s_addr);
}

return result;
}
#endif

0 comments on commit 6e69e0d

Please sign in to comment.