[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.61,1.62 int_table.
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.61,1.62 int_table.c,1.63,1.64 lib_socket.c,1.12,1.13 |
|
Date: |
Tue, 27 May 2003 22:14:27 -0400 |
Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv21036/engine
Modified Files:
int_proto.h int_table.c lib_socket.c
Log Message:
Modify the internalcall interface for sockets to match the
changes to pnetlib; IPv6 and IrDA socket addresses should now work.
Index: int_proto.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_proto.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** int_proto.h 25 Apr 2003 01:22:00 -0000 1.61
--- int_proto.h 28 May 2003 02:14:25 -0000 1.62
***************
*** 575,599 ****
extern ILNativeInt _IL_SocketMethods_GetInvalidHandle(ILExecThread * _thread);
extern ILBool _IL_SocketMethods_Create(ILExecThread * _thread, ILInt32 _p1,
ILInt32 _p2, ILInt32 _p3, ILNativeInt * handle);
! extern ILBool _IL_SocketMethods_Bind(ILExecThread * _thread, ILNativeInt _p1,
ILInt32 _p2, ILInt64 _p3, ILInt32 _p4);
extern ILBool _IL_SocketMethods_Shutdown(ILExecThread * _thread, ILNativeInt
_p1, ILInt32 _p2);
extern ILBool _IL_SocketMethods_Listen(ILExecThread * _thread, ILNativeInt
_p1, ILInt32 _p2);
! extern ILBool _IL_SocketMethods_Accept(ILExecThread * _thread, ILNativeInt
_p1, ILInt64 * address, ILInt32 * port, ILNativeInt * newHandle);
! extern ILBool _IL_SocketMethods_Connect(ILExecThread * _thread, ILNativeInt
_p1, ILInt32 _p2, ILInt64 _p3, ILInt32 _p4);
extern ILInt32 _IL_SocketMethods_Receive(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5);
! extern ILInt32 _IL_SocketMethods_ReceiveFrom(ILExecThread * _thread,
ILNativeInt _p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5,
ILInt64 * address, ILInt32 * port);
extern ILInt32 _IL_SocketMethods_Send(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5);
! extern ILInt32 _IL_SocketMethods_SendTo(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5, ILInt64 _p6,
ILInt32 _p7);
extern ILBool _IL_SocketMethods_Close(ILExecThread * _thread, ILNativeInt
_p1);
extern ILInt32 _IL_SocketMethods_Select(ILExecThread * _thread, System_Array
* _p1, System_Array * _p2, System_Array * _p3, ILInt64 _p4);
extern ILBool _IL_SocketMethods_SetBlocking(ILExecThread * _thread,
ILNativeInt _p1, ILBool _p2);
extern ILInt32 _IL_SocketMethods_GetAvailable(ILExecThread * _thread,
ILNativeInt _p1);
! extern ILBool _IL_SocketMethods_GetSockName(ILExecThread * _thread,
ILNativeInt _p1, ILInt64 * address, ILInt32 * port);
extern ILBool _IL_SocketMethods_SetSocketOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4);
extern ILBool _IL_SocketMethods_GetSocketOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 * value);
extern ILBool _IL_SocketMethods_SetLingerOption(ILExecThread * _thread,
ILNativeInt _p1, ILBool _p2, ILInt32 _p3);
extern ILBool _IL_SocketMethods_GetLingerOption(ILExecThread * _thread,
ILNativeInt _p1, ILBool * enabled, ILInt32 * seconds);
! extern ILBool _IL_SocketMethods_SetMulticastOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt64 _p3, ILInt64 _p4);
! extern ILBool _IL_SocketMethods_GetMulticastOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt64 * group, ILInt64 * mcint);
extern ILInt32 _IL_SocketMethods_GetErrno(ILExecThread * _thread);
extern ILString * _IL_SocketMethods_GetErrnoMessage(ILExecThread * _thread,
ILInt32 _p1);
--- 575,601 ----
extern ILNativeInt _IL_SocketMethods_GetInvalidHandle(ILExecThread * _thread);
+ extern ILBool _IL_SocketMethods_AddressFamilySupported(ILExecThread *
_thread, ILInt32 _p1);
extern ILBool _IL_SocketMethods_Create(ILExecThread * _thread, ILInt32 _p1,
ILInt32 _p2, ILInt32 _p3, ILNativeInt * handle);
! extern ILBool _IL_SocketMethods_Bind(ILExecThread * _thread, ILNativeInt _p1,
System_Array * _p2);
extern ILBool _IL_SocketMethods_Shutdown(ILExecThread * _thread, ILNativeInt
_p1, ILInt32 _p2);
extern ILBool _IL_SocketMethods_Listen(ILExecThread * _thread, ILNativeInt
_p1, ILInt32 _p2);
! extern ILBool _IL_SocketMethods_Accept(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILNativeInt * newHandle);
! extern ILBool _IL_SocketMethods_Connect(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2);
extern ILInt32 _IL_SocketMethods_Receive(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5);
! extern ILInt32 _IL_SocketMethods_ReceiveFrom(ILExecThread * _thread,
ILNativeInt _p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5,
System_Array * _p6);
extern ILInt32 _IL_SocketMethods_Send(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5);
! extern ILInt32 _IL_SocketMethods_SendTo(ILExecThread * _thread, ILNativeInt
_p1, System_Array * _p2, ILInt32 _p3, ILInt32 _p4, ILInt32 _p5, System_Array *
_p6);
extern ILBool _IL_SocketMethods_Close(ILExecThread * _thread, ILNativeInt
_p1);
extern ILInt32 _IL_SocketMethods_Select(ILExecThread * _thread, System_Array
* _p1, System_Array * _p2, System_Array * _p3, ILInt64 _p4);
extern ILBool _IL_SocketMethods_SetBlocking(ILExecThread * _thread,
ILNativeInt _p1, ILBool _p2);
extern ILInt32 _IL_SocketMethods_GetAvailable(ILExecThread * _thread,
ILNativeInt _p1);
! extern ILBool _IL_SocketMethods_GetSockName(ILExecThread * _thread,
ILNativeInt _p1, System_Array * _p2);
extern ILBool _IL_SocketMethods_SetSocketOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 _p4);
extern ILBool _IL_SocketMethods_GetSocketOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, ILInt32 * value);
extern ILBool _IL_SocketMethods_SetLingerOption(ILExecThread * _thread,
ILNativeInt _p1, ILBool _p2, ILInt32 _p3);
extern ILBool _IL_SocketMethods_GetLingerOption(ILExecThread * _thread,
ILNativeInt _p1, ILBool * enabled, ILInt32 * seconds);
! extern ILBool _IL_SocketMethods_SetMulticastOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, System_Array * _p4, System_Array *
_p5);
! extern ILBool _IL_SocketMethods_GetMulticastOption(ILExecThread * _thread,
ILNativeInt _p1, ILInt32 _p2, ILInt32 _p3, System_Array * _p4, System_Array *
_p5);
! extern ILBool _IL_SocketMethods_DiscoverIrDADevices(ILExecThread * _thread,
ILNativeInt _p1, System_Array * _p2);
extern ILInt32 _IL_SocketMethods_GetErrno(ILExecThread * _thread);
extern ILString * _IL_SocketMethods_GetErrnoMessage(ILExecThread * _thread,
ILInt32 _p1);
***************
*** 604,611 ****
extern ILInt32 _IL_IPAddress_HostToNetworkOrder_i(ILExecThread * _thread,
ILInt32 _p1);
extern ILInt64 _IL_IPAddress_HostToNetworkOrder_l(ILExecThread * _thread,
ILInt64 _p1);
extern ILInt16 _IL_IPAddress_HostToNetworkOrder_s(ILExecThread * _thread,
ILInt16 _p1);
extern ILInt64 _IL_IPAddress_NetworkToHostOrder_l(ILExecThread * _thread,
ILInt64 _p1);
- extern ILInt32 _IL_IPAddress_NetworkToHostOrder_i(ILExecThread * _thread,
ILInt32 _p1);
extern ILInt16 _IL_IPAddress_NetworkToHostOrder_s(ILExecThread * _thread,
ILInt16 _p1);
--- 606,613 ----
extern ILInt32 _IL_IPAddress_HostToNetworkOrder_i(ILExecThread * _thread,
ILInt32 _p1);
+ extern ILInt32 _IL_IPAddress_NetworkToHostOrder_i(ILExecThread * _thread,
ILInt32 _p1);
extern ILInt64 _IL_IPAddress_HostToNetworkOrder_l(ILExecThread * _thread,
ILInt64 _p1);
extern ILInt16 _IL_IPAddress_HostToNetworkOrder_s(ILExecThread * _thread,
ILInt16 _p1);
extern ILInt64 _IL_IPAddress_NetworkToHostOrder_l(ILExecThread * _thread,
ILInt64 _p1);
extern ILInt16 _IL_IPAddress_NetworkToHostOrder_s(ILExecThread * _thread,
ILInt16 _p1);
Index: int_table.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/int_table.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** int_table.c 25 Apr 2003 01:22:00 -0000 1.63
--- int_table.c 28 May 2003 02:14:25 -0000 1.64
***************
*** 2604,2610 ****
#if !defined(HAVE_LIBFFI)
! static void marshal_bpjili(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, ILInt32,
ILInt64, ILInt32))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])),
*((ILInt32 *)(avalue[2])), *((ILInt64 *)(avalue[3])), *((ILInt32
*)(avalue[4])));
}
--- 2604,2610 ----
#if !defined(HAVE_LIBFFI)
! static void marshal_bpjp(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, void
*))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])), *((void *
*)(avalue[2])));
}
***************
*** 2613,2619 ****
#if !defined(HAVE_LIBFFI)
! static void marshal_bpjppp(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, void *,
void *, void *))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])),
*((void * *)(avalue[2])), *((void * *)(avalue[3])), *((void * *)(avalue[4])));
}
--- 2613,2619 ----
#if !defined(HAVE_LIBFFI)
! static void marshal_bpjpp(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, void *,
void *))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])), *((void *
*)(avalue[2])), *((void * *)(avalue[3])));
}
***************
*** 2631,2646 ****
#if !defined(HAVE_LIBFFI)
! static void marshal_ipjpiiipp(void (*fn)(), void *rvalue, void **avalue)
! {
! *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, ILNativeUInt, void *,
ILInt32, ILInt32, ILInt32, void *, void *))fn)(*((void * *)(avalue[0])),
*((ILNativeUInt *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32
*)(avalue[3])), *((ILInt32 *)(avalue[4])), *((ILInt32 *)(avalue[5])), *((void *
*)(avalue[6])), *((void * *)(avalue[7])));
! }
!
! #endif
!
! #if !defined(HAVE_LIBFFI)
!
! static void marshal_ipjpiiili(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, ILNativeUInt, void *,
ILInt32, ILInt32, ILInt32, ILInt64, ILInt32))fn)(*((void * *)(avalue[0])),
*((ILNativeUInt *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32
*)(avalue[3])), *((ILInt32 *)(avalue[4])), *((ILInt32 *)(avalue[5])),
*((ILInt64 *)(avalue[6])), *((ILInt32 *)(avalue[7])));
}
--- 2631,2637 ----
#if !defined(HAVE_LIBFFI)
! static void marshal_ipjpiiip(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt32 (*)(void *, ILNativeUInt, void *,
ILInt32, ILInt32, ILInt32, void *))fn)(*((void * *)(avalue[0])),
*((ILNativeUInt *)(avalue[1])), *((void * *)(avalue[2])), *((ILInt32
*)(avalue[3])), *((ILInt32 *)(avalue[4])), *((ILInt32 *)(avalue[5])), *((void *
*)(avalue[6])));
}
***************
*** 2667,2679 ****
#if !defined(HAVE_LIBFFI)
- static void marshal_bpjpp(void (*fn)(), void *rvalue, void **avalue)
- {
- *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, void *,
void *))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])), *((void *
*)(avalue[2])), *((void * *)(avalue[3])));
- }
-
- #endif
-
- #if !defined(HAVE_LIBFFI)
-
static void marshal_bpjiii(void (*fn)(), void *rvalue, void **avalue)
{
--- 2658,2661 ----
***************
*** 2694,2709 ****
#if !defined(HAVE_LIBFFI)
! static void marshal_bpjill(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, ILInt32,
ILInt64, ILInt64))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])),
*((ILInt32 *)(avalue[2])), *((ILInt64 *)(avalue[3])), *((ILInt64
*)(avalue[4])));
! }
!
! #endif
!
! #if !defined(HAVE_LIBFFI)
!
! static void marshal_bpjipp(void (*fn)(), void *rvalue, void **avalue)
! {
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, ILInt32,
void *, void *))fn)(*((void * *)(avalue[0])), *((ILNativeUInt *)(avalue[1])),
*((ILInt32 *)(avalue[2])), *((void * *)(avalue[3])), *((void * *)(avalue[4])));
}
--- 2676,2682 ----
#if !defined(HAVE_LIBFFI)
! static void marshal_bpjiipp(void (*fn)(), void *rvalue, void **avalue)
{
! *((ILNativeInt *)rvalue) = (*(ILInt8 (*)(void *, ILNativeUInt, ILInt32,
ILInt32, void *, void *))fn)(*((void * *)(avalue[0])), *((ILNativeUInt
*)(avalue[1])), *((ILInt32 *)(avalue[2])), *((ILInt32 *)(avalue[3])), *((void *
*)(avalue[4])), *((void * *)(avalue[5])));
}
***************
*** 2714,2738 ****
IL_METHOD_BEGIN(SocketMethods_Methods)
IL_METHOD("GetInvalidHandle", "()j",
_IL_SocketMethods_GetInvalidHandle, marshal_jp)
IL_METHOD("Create", "(iii&j)Z", _IL_SocketMethods_Create,
marshal_bpiiip)
! IL_METHOD("Bind", "(jili)Z", _IL_SocketMethods_Bind, marshal_bpjili)
IL_METHOD("Shutdown", "(ji)Z", _IL_SocketMethods_Shutdown, marshal_bpji)
IL_METHOD("Listen", "(ji)Z", _IL_SocketMethods_Listen, marshal_bpji)
! IL_METHOD("Accept", "(j&l&i&j)Z", _IL_SocketMethods_Accept,
marshal_bpjppp)
! IL_METHOD("Connect", "(jili)Z", _IL_SocketMethods_Connect,
marshal_bpjili)
IL_METHOD("Receive", "(j[Biii)i", _IL_SocketMethods_Receive,
marshal_ipjpiii)
! IL_METHOD("ReceiveFrom", "(j[Biii&l&i)i",
_IL_SocketMethods_ReceiveFrom, marshal_ipjpiiipp)
IL_METHOD("Send", "(j[Biii)i", _IL_SocketMethods_Send, marshal_ipjpiii)
! IL_METHOD("SendTo", "(j[Biiili)i", _IL_SocketMethods_SendTo,
marshal_ipjpiiili)
IL_METHOD("Close", "(j)Z", _IL_SocketMethods_Close, marshal_bpj)
IL_METHOD("Select", "([j[j[jl)i", _IL_SocketMethods_Select,
marshal_ippppl)
IL_METHOD("SetBlocking", "(jZ)Z", _IL_SocketMethods_SetBlocking,
marshal_bpjb)
IL_METHOD("GetAvailable", "(j)i", _IL_SocketMethods_GetAvailable,
marshal_ipj)
! IL_METHOD("GetSockName", "(j&l&i)Z", _IL_SocketMethods_GetSockName,
marshal_bpjpp)
IL_METHOD("SetSocketOption", "(jiii)Z",
_IL_SocketMethods_SetSocketOption, marshal_bpjiii)
IL_METHOD("GetSocketOption", "(jii&i)Z",
_IL_SocketMethods_GetSocketOption, marshal_bpjiip)
IL_METHOD("SetLingerOption", "(jZi)Z",
_IL_SocketMethods_SetLingerOption, marshal_bpjbi)
IL_METHOD("GetLingerOption", "(j&Z&i)Z",
_IL_SocketMethods_GetLingerOption, marshal_bpjpp)
! IL_METHOD("SetMulticastOption", "(jill)Z",
_IL_SocketMethods_SetMulticastOption, marshal_bpjill)
! IL_METHOD("GetMulticastOption", "(ji&l&l)Z",
_IL_SocketMethods_GetMulticastOption, marshal_bpjipp)
IL_METHOD("GetErrno", "()vPlatform.Errno;", _IL_SocketMethods_GetErrno,
marshal_ip)
IL_METHOD("GetErrnoMessage", "(vPlatform.Errno;)oSystem.String;",
_IL_SocketMethods_GetErrnoMessage, marshal_ppi)
--- 2687,2713 ----
IL_METHOD_BEGIN(SocketMethods_Methods)
IL_METHOD("GetInvalidHandle", "()j",
_IL_SocketMethods_GetInvalidHandle, marshal_jp)
+ IL_METHOD("AddressFamilySupported", "(i)Z",
_IL_SocketMethods_AddressFamilySupported, marshal_bpi)
IL_METHOD("Create", "(iii&j)Z", _IL_SocketMethods_Create,
marshal_bpiiip)
! IL_METHOD("Bind", "(j[B)Z", _IL_SocketMethods_Bind, marshal_bpjp)
IL_METHOD("Shutdown", "(ji)Z", _IL_SocketMethods_Shutdown, marshal_bpji)
IL_METHOD("Listen", "(ji)Z", _IL_SocketMethods_Listen, marshal_bpji)
! IL_METHOD("Accept", "(j[B&j)Z", _IL_SocketMethods_Accept, marshal_bpjpp)
! IL_METHOD("Connect", "(j[B)Z", _IL_SocketMethods_Connect, marshal_bpjp)
IL_METHOD("Receive", "(j[Biii)i", _IL_SocketMethods_Receive,
marshal_ipjpiii)
! IL_METHOD("ReceiveFrom", "(j[Biii[B)i", _IL_SocketMethods_ReceiveFrom,
marshal_ipjpiiip)
IL_METHOD("Send", "(j[Biii)i", _IL_SocketMethods_Send, marshal_ipjpiii)
! IL_METHOD("SendTo", "(j[Biii[B)i", _IL_SocketMethods_SendTo,
marshal_ipjpiiip)
IL_METHOD("Close", "(j)Z", _IL_SocketMethods_Close, marshal_bpj)
IL_METHOD("Select", "([j[j[jl)i", _IL_SocketMethods_Select,
marshal_ippppl)
IL_METHOD("SetBlocking", "(jZ)Z", _IL_SocketMethods_SetBlocking,
marshal_bpjb)
IL_METHOD("GetAvailable", "(j)i", _IL_SocketMethods_GetAvailable,
marshal_ipj)
! IL_METHOD("GetSockName", "(j[B)Z", _IL_SocketMethods_GetSockName,
marshal_bpjp)
IL_METHOD("SetSocketOption", "(jiii)Z",
_IL_SocketMethods_SetSocketOption, marshal_bpjiii)
IL_METHOD("GetSocketOption", "(jii&i)Z",
_IL_SocketMethods_GetSocketOption, marshal_bpjiip)
IL_METHOD("SetLingerOption", "(jZi)Z",
_IL_SocketMethods_SetLingerOption, marshal_bpjbi)
IL_METHOD("GetLingerOption", "(j&Z&i)Z",
_IL_SocketMethods_GetLingerOption, marshal_bpjpp)
! IL_METHOD("SetMulticastOption", "(jii[B[B)Z",
_IL_SocketMethods_SetMulticastOption, marshal_bpjiipp)
! IL_METHOD("GetMulticastOption", "(jii[B[B)Z",
_IL_SocketMethods_GetMulticastOption, marshal_bpjiipp)
! IL_METHOD("DiscoverIrDADevices", "(j[B)Z",
_IL_SocketMethods_DiscoverIrDADevices, marshal_bpjp)
IL_METHOD("GetErrno", "()vPlatform.Errno;", _IL_SocketMethods_GetErrno,
marshal_ip)
IL_METHOD("GetErrnoMessage", "(vPlatform.Errno;)oSystem.String;",
_IL_SocketMethods_GetErrnoMessage, marshal_ppi)
***************
*** 2767,2774 ****
IL_METHOD_BEGIN(IPAddress_Methods)
IL_METHOD("HostToNetworkOrder", "(i)i",
_IL_IPAddress_HostToNetworkOrder_i, marshal_ipi)
IL_METHOD("HostToNetworkOrder", "(l)l",
_IL_IPAddress_HostToNetworkOrder_l, marshal_lpl)
IL_METHOD("HostToNetworkOrder", "(s)s",
_IL_IPAddress_HostToNetworkOrder_s, marshal_sps)
IL_METHOD("NetworkToHostOrder", "(l)l",
_IL_IPAddress_NetworkToHostOrder_l, marshal_lpl)
- IL_METHOD("NetworkToHostOrder", "(i)i",
_IL_IPAddress_NetworkToHostOrder_i, marshal_ipi)
IL_METHOD("NetworkToHostOrder", "(s)s",
_IL_IPAddress_NetworkToHostOrder_s, marshal_sps)
IL_METHOD_END
--- 2742,2749 ----
IL_METHOD_BEGIN(IPAddress_Methods)
IL_METHOD("HostToNetworkOrder", "(i)i",
_IL_IPAddress_HostToNetworkOrder_i, marshal_ipi)
+ IL_METHOD("NetworkToHostOrder", "(i)i",
_IL_IPAddress_NetworkToHostOrder_i, marshal_ipi)
IL_METHOD("HostToNetworkOrder", "(l)l",
_IL_IPAddress_HostToNetworkOrder_l, marshal_lpl)
IL_METHOD("HostToNetworkOrder", "(s)s",
_IL_IPAddress_HostToNetworkOrder_s, marshal_sps)
IL_METHOD("NetworkToHostOrder", "(l)l",
_IL_IPAddress_NetworkToHostOrder_l, marshal_lpl)
IL_METHOD("NetworkToHostOrder", "(s)s",
_IL_IPAddress_NetworkToHostOrder_s, marshal_sps)
IL_METHOD_END
Index: lib_socket.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_socket.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** lib_socket.c 15 May 2003 06:02:07 -0000 1.12
--- lib_socket.c 28 May 2003 02:14:25 -0000 1.13
***************
*** 50,53 ****
--- 50,62 ----
/*
+ * public static bool AddressFamilySupported(int af);
+ */
+ ILBool _IL_SocketMethods_AddressFamilySupported(ILExecThread *_thread,
+
ILInt32 af)
+ {
+ return (ILSysIOAddressFamilySupported(af) != 0);
+ }
+
+ /*
* public static bool Create(int af, int st, int pt, out IntPtr handle);
*/
***************
*** 61,76 ****
/*
! * public static bool Bind(IntPtr handle, int af, long address, int port);
*/
ILBool _IL_SocketMethods_Bind(ILExecThread *_thread, ILNativeInt handle,
! ILInt32 af, ILInt64
address, ILInt32 port)
{
! ILSysIOSockAddr addr;
!
! addr.family = (int)af;
! addr.port = (unsigned short)port;
! addr.addr = (unsigned long)address;
!
! return (ILBool)(ILSysIOSocketBind((ILSysIOHandle)handle, &addr));
}
--- 70,82 ----
/*
! * public static bool Bind(IntPtr handle, byte[] addr);
*/
ILBool _IL_SocketMethods_Bind(ILExecThread *_thread, ILNativeInt handle,
! System_Array *addr)
{
! return (ILBool)(ILSysIOSocketBind
! ((ILSysIOHandle)handle,
! (unsigned char *)ArrayToBuffer(addr),
! addr->length));
}
***************
*** 94,111 ****
/*
! * public static bool Accept(IntPtr handle, out long address, out int port,
* out IntPtr newHandle);
*/
ILBool _IL_SocketMethods_Accept(ILExecThread *_thread, ILNativeInt handle,
! ILInt64
*address, ILInt32 *port,
ILNativeInt
*newHandle)
{
- ILSysIOSockAddr addr;
-
*newHandle = (ILNativeInt)(ILSysIOSocketAccept
! ((ILSysIOHandle)handle, &addr));
!
! *address = (ILInt64)(addr.addr);
! *port = (ILInt32)(addr.port);
return (*newHandle != (ILNativeInt)ILSysIOHandle_Invalid);
--- 100,114 ----
/*
! * public static bool Accept(IntPtr handle, byte[] addrReturn,
* out IntPtr newHandle);
*/
ILBool _IL_SocketMethods_Accept(ILExecThread *_thread, ILNativeInt handle,
! System_Array
*addrReturn,
ILNativeInt
*newHandle)
{
*newHandle = (ILNativeInt)(ILSysIOSocketAccept
! ((ILSysIOHandle)handle,
! (unsigned char *)ArrayToBuffer(addrReturn),
! addrReturn->length));
return (*newHandle != (ILNativeInt)ILSysIOHandle_Invalid);
***************
*** 113,128 ****
/*
! * public static bool Connect(IntPtr handle, int af, long address, int port);
*/
ILBool _IL_SocketMethods_Connect(ILExecThread *_thread, ILNativeInt handle,
! ILInt32 af,
ILInt64 address, ILInt32 port)
{
! ILSysIOSockAddr addr;
!
! addr.family = (int)af;
! addr.addr = (unsigned long)address;
! addr.port = (unsigned short)port;
!
! return (ILBool)(ILSysIOSocketConnect((ILSysIOHandle)handle, &addr));
}
--- 116,128 ----
/*
! * public static bool Connect(IntPtr handle, byte[] addr);
*/
ILBool _IL_SocketMethods_Connect(ILExecThread *_thread, ILNativeInt handle,
! System_Array
*addr)
{
! return (ILBool)(ILSysIOSocketConnect
! ((ILSysIOHandle)handle,
! (unsigned char *)ArrayToBuffer(addr),
! addr->length));
}
***************
*** 143,147 ****
* public static int ReceiveFrom(IntPtr handle, byte[] buffer,
* int offset,
int size, int flags,
! * out long
address, out int port);
*/
ILInt32 _IL_SocketMethods_ReceiveFrom(ILExecThread *_thread,
--- 143,147 ----
* public static int ReceiveFrom(IntPtr handle, byte[] buffer,
* int offset,
int size, int flags,
! * byte[]
addrReturn);
*/
ILInt32 _IL_SocketMethods_ReceiveFrom(ILExecThread *_thread,
***************
*** 149,167 ****
System_Array *buffer,
ILInt32 offset, ILInt32 size,
!
ILInt32 flags, ILInt64 *address,
!
ILInt32 *port)
{
! ILSysIOSockAddr addr;
! ILInt32 result;
!
! result = ILSysIOSocketRecvFrom
((ILSysIOHandle)handle,
((ILUInt8 *)(ArrayToBuffer(buffer))) + offset,
! size, flags, &addr);
!
! *address = (ILInt64)(addr.addr);
! *port = (ILInt32)(addr.port);
!
! return result;
}
--- 149,161 ----
System_Array *buffer,
ILInt32 offset, ILInt32 size,
!
ILInt32 flags,
!
System_Array *addrReturn)
{
! return ILSysIOSocketRecvFrom
((ILSysIOHandle)handle,
((ILUInt8 *)(ArrayToBuffer(buffer))) + offset,
! size, flags,
! (unsigned char *)ArrayToBuffer(addrReturn),
! addrReturn->length);
}
***************
*** 182,201 ****
* public static int SendTo(IntPtr handle, byte[] buffer,
* int offset, int size,
int flags,
! * long address, int port);
*/
ILInt32 _IL_SocketMethods_SendTo(ILExecThread *_thread, ILNativeInt handle,
System_Array
*buffer, ILInt32 offset,
ILInt32 size,
ILInt32 flags,
! ILInt64
address, ILInt32 port)
{
- ILSysIOSockAddr addr;
-
- addr.addr = (unsigned long)address;
- addr.port = (unsigned short)port;
-
return ILSysIOSocketSendTo
((ILSysIOHandle)handle,
((ILUInt8 *)(ArrayToBuffer(buffer))) + offset,
! size, flags, &addr);
}
--- 176,192 ----
* public static int SendTo(IntPtr handle, byte[] buffer,
* int offset, int size,
int flags,
! * byte[] addr)
*/
ILInt32 _IL_SocketMethods_SendTo(ILExecThread *_thread, ILNativeInt handle,
System_Array
*buffer, ILInt32 offset,
ILInt32 size,
ILInt32 flags,
! System_Array
*addr)
{
return ILSysIOSocketSendTo
((ILSysIOHandle)handle,
((ILUInt8 *)(ArrayToBuffer(buffer))) + offset,
! size, flags,
! (unsigned char *)ArrayToBuffer(addr),
! addr->length);
}
***************
*** 244,267 ****
/*
! * public static bool GetSockName(IntPtr handle, out long address,
! * out int port);
*/
ILBool _IL_SocketMethods_GetSockName(ILExecThread * _thread,
ILNativeInt handle,
!
ILInt64 *address, ILInt32 *port)
{
! ILSysIOSockAddr addr;
! if(ILSysIOSocketGetName((ILSysIOHandle)handle, &addr))
! {
! *address = (ILInt64)(addr.addr);
! *port = (ILInt32)(addr.port);
! return 1;
! }
! else
! {
! *address = 0;
! *port = 0;
! return 0;
! }
}
--- 235,248 ----
/*
! * public static bool GetSockName(IntPtr handle, byte[] addrReturn);
*/
ILBool _IL_SocketMethods_GetSockName(ILExecThread * _thread,
ILNativeInt handle,
!
System_Array *addrReturn)
{
! return (ILBool)ILSysIOSocketGetName
! ((ILSysIOHandle)handle,
! (unsigned char *)ArrayToBuffer(addrReturn),
! addrReturn->length);
}
***************
*** 333,381 ****
/*
! * public static bool SetMulticastOption(IntPtr handle, int name,
! *
long group, long mcint);
*/
ILBool _IL_SocketMethods_SetMulticastOption(ILExecThread *_thread,
ILNativeInt handle,
!
ILInt32 name,
!
ILInt64 group,
!
ILInt64 mcint)
! {
! ILSysIOSockAddr g, m;
! g.family = AF_INET;
! g.addr = (unsigned long)group;
! g.port = 0;
! m.family = AF_INET;
! m.addr = (unsigned long)mcint;
! m.port = 0;
! return (ILSysIOSocketSetMulticast((ILSysIOHandle)handle,
! name,
&g, &m) != 0);
}
/*
! * public static bool GetMulticastOption(IntPtr handle, int name,
! *
out long group, out long mcint);
*/
ILBool _IL_SocketMethods_GetMulticastOption(ILExecThread *_thread,
ILNativeInt handle,
!
ILInt32 name,
!
ILInt64 *group,
!
ILInt64 *mcint)
! {
! ILSysIOSockAddr g, m;
! ILMemZero(&g, sizeof(g));
! ILMemZero(&m, sizeof(m));
! if(ILSysIOSocketGetMulticast((ILSysIOHandle)handle, name, &g, &m))
! {
! *group = (ILInt64)(g.addr);
! *mcint = (ILInt64)(m.addr);
! return 1;
! }
! else
! {
! *group = 0;
! *mcint = 0;
! return 0;
! }
}
--- 314,355 ----
/*
! * public static bool SetMulticastOption(IntPtr handle, int af, int name,
! *
byte[] group, byte[] mcint);
*/
ILBool _IL_SocketMethods_SetMulticastOption(ILExecThread *_thread,
ILNativeInt handle,
!
ILInt32 af, ILInt32 name,
!
System_Array *group,
!
System_Array *mcint)
! {
! return (ILSysIOSocketSetMulticast
! ((ILSysIOHandle)handle, af, name,
! (unsigned char *)ArrayToBuffer(group),
group->length,
! (unsigned char *)ArrayToBuffer(mcint),
mcint->length) != 0);
}
/*
! * public static bool GetMulticastOption(IntPtr handle, int af, int name,
! *
byte[] group, byte[] mcint);
*/
ILBool _IL_SocketMethods_GetMulticastOption(ILExecThread *_thread,
ILNativeInt handle,
!
ILInt32 af, ILInt32 name,
!
System_Array *group,
!
System_Array *mcint)
! {
! return (ILSysIOSocketGetMulticast
! ((ILSysIOHandle)handle, af, name,
! (unsigned char *)ArrayToBuffer(group),
group->length,
! (unsigned char *)ArrayToBuffer(mcint),
mcint->length) != 0);
! }
!
! ILBool _IL_SocketMethods_DiscoverIrDADevices(ILExecThread *_thread,
!
ILNativeInt handle,
!
System_Array *buf)
! {
! return (ILSysIODiscoverIrDADevices
! ((ILSysIOHandle)handle,
! (unsigned char *)ArrayToBuffer(buf),
buf->length) != 0);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnet/engine int_proto.h,1.61,1.62 int_table.c,1.63,1.64 lib_socket.c,1.12,1.13,
Rhys Weatherley <address@hidden> <=