aebcc506e2
struct sockaddr_in - the real culprits were BNetAddress::GetAddr(sockaddr_in&) and BNetAddress::SetTo(const sockaddr_in&): * moved check_r5_compatibility() into r5_compatibility.h to make that function available to BNetAddress, too * adjusted sockaddr_in-handling methods of BNetAddress to deal with R5-addresses if in compatibility mode * removed is_r5_sockaddr() again, since it is no longer needed With this less hacky solution, Beam, NetPositive, NetworkTime and Vision still work. So, there's hope that the R5 compatibility layer is now complete. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26377 a95241bf-73f2-0310-859d-f6bbb57e9c96
75 lines
1.2 KiB
C
75 lines
1.2 KiB
C
/*
|
|
* Copyright 2006, Haiku, Inc. All Rights Reserved.
|
|
* Distributed under the terms of the MIT License.
|
|
*/
|
|
#ifndef NET_R5_COMPATIBILITY_H
|
|
#define NET_R5_COMPATIBILITY_H
|
|
|
|
|
|
#include <SupportDefs.h>
|
|
|
|
|
|
#define R5_SOCK_DGRAM 1
|
|
#define R5_SOCK_STREAM 2
|
|
|
|
#define R5_AF_INET 1
|
|
|
|
#define R5_IPPROTO_UDP 1
|
|
#define R5_IPPROTO_TCP 2
|
|
#define R5_IPPROTO_ICMP 3
|
|
|
|
// setsockopt() defines
|
|
|
|
#define R5_SOL_SOCKET 1
|
|
|
|
#define R5_SO_DEBUG 1
|
|
#define R5_SO_REUSEADDR 2
|
|
#define R5_SO_NONBLOCK 3
|
|
#define R5_SO_REUSEPORT 4
|
|
#define R5_SO_FIONREAD 5
|
|
|
|
#define R5_MSG_OOB 0x01
|
|
|
|
|
|
struct r5_sockaddr_in {
|
|
uint16 sin_family;
|
|
uint16 sin_port;
|
|
uint32 sin_addr;
|
|
char sin_zero[4];
|
|
};
|
|
|
|
extern bool __gR5Compatibility;
|
|
extern addr_t __gNetworkStart;
|
|
extern addr_t __gNetworkEnd;
|
|
extern addr_t __gNetAPIStart;
|
|
extern addr_t __gNetAPIEnd;
|
|
|
|
|
|
static inline bool
|
|
check_r5_compatibility()
|
|
{
|
|
if (!__gR5Compatibility)
|
|
return false;
|
|
|
|
#ifndef __INTEL__
|
|
return false;
|
|
#else
|
|
|
|
struct stack_frame {
|
|
struct stack_frame* previous;
|
|
addr_t return_address;
|
|
};
|
|
|
|
stack_frame* frame = (stack_frame*)get_stack_frame();
|
|
if (frame->return_address >= __gNetworkStart
|
|
&& frame->return_address < __gNetworkEnd) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
#endif
|
|
}
|
|
|
|
|
|
#endif // NET_R5_COMPATIBILITY_H
|