fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-28 13:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbsocket.ch
  * include/hbsocket.h
  * source/rtl/hbsocket.c
  * source/rtl/hbinet.c
  * examples/uhttpd2/socket.c
  * examples/httpsrv/socket.c
    * Slightly renamed some constants to settle on a common
      prefix for all socket related ones: HB_SOCKET_*
      HB_SOCK_PF_*      -> HB_SOCKET_PF_*
      HB_SOCK_AF_*      -> HB_SOCKET_AF_*
      HB_SOCK_*         -> HB_SOCKET_PT_* (for protocol types)
      HB_SOCK_IPPROTO_* -> HB_SOCKET_IPPROTO_*
      HB_SOCK_SHUT_*    -> HB_SOCKET_SHUT_*
      HB_SOCK_FUNC      -> HB_SOCKET_FUNC

  * contrib/hbtip/thtml.prg
    * Minor formatting.
This commit is contained in:
Viktor Szakats
2009-07-28 11:56:55 +00:00
parent 3472f72ddd
commit 86fc847f7c
8 changed files with 147 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -17,6 +17,25 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-28 13:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* include/hbsocket.ch
* include/hbsocket.h
* source/rtl/hbsocket.c
* source/rtl/hbinet.c
* examples/uhttpd2/socket.c
* examples/httpsrv/socket.c
* Slightly renamed some constants to settle on a common
prefix for all socket related ones: HB_SOCKET_*
HB_SOCK_PF_* -> HB_SOCKET_PF_*
HB_SOCK_AF_* -> HB_SOCKET_AF_*
HB_SOCK_* -> HB_SOCKET_PT_* (for protocol types)
HB_SOCK_IPPROTO_* -> HB_SOCKET_IPPROTO_*
HB_SOCK_SHUT_* -> HB_SOCKET_SHUT_*
HB_SOCK_FUNC -> HB_SOCKET_FUNC
* contrib/hbtip/thtml.prg
* Minor formatting.
2009-07-28 13:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/Makefile
! added hbextlng.ch

4
harbour/contrib/hbtip/thtml.prg
View File

@@ -4409,8 +4409,8 @@ FUNCTION OemToHtml( cOemText )
// This function returs the HTML character entities that are exchangeable between ANSI and OEM character sets
STATIC PROCEDURE _Init_Html_AnsiCharacterEntities
s_aHtmlAnsiEntities := ;
{ ;
s_aHtmlAnsiEntities := ;
{ ;
{ Chr( 38 ), "&" }, ; // ampersand
{ Chr( 60 ), "<" }, ; // less-than sign
{ Chr( 62 ), ">" }, ; // greater-than sign

8
harbour/examples/httpsrv/socket.c
View File

@@ -87,9 +87,9 @@ HB_FUNC( SOCKET_ERROR )
HB_FUNC( SOCKET_CREATE )
{
hb_retsocket( hb_socketOpen( hb_parnidef( 1, HB_SOCK_PF_INET ),
hb_parnidef( 2, HB_SOCK_STREAM ),
hb_parnidef( 3, HB_SOCK_IPPROTO_TCP ) ) );
hb_retsocket( hb_socketOpen( hb_parnidef( 1, HB_SOCKET_PF_INET ),
hb_parnidef( 2, HB_SOCKET_PT_STREAM ),
hb_parnidef( 3, HB_SOCKET_IPPROTO_TCP ) ) );
}
HB_FUNC( SOCKET_CLOSE )
@@ -144,7 +144,7 @@ HB_FUNC( SOCKET_ACCEPT )
HB_FUNC( SOCKET_SHUTDOWN )
{
hb_retni( hb_socketShutdown( hb_parsocket( 1 ),
hb_parnidef( 2, HB_SOCK_SHUT_RDWR ) ) );
hb_parnidef( 2, HB_SOCKET_SHUT_RDWR ) ) );
}
HB_FUNC( SOCKET_RECV )

8
harbour/examples/uhttpd2/socket.c
View File

@@ -87,9 +87,9 @@ HB_FUNC( SOCKET_ERROR )
HB_FUNC( SOCKET_CREATE )
{
hb_retsocket( hb_socketOpen( hb_parnidef( 1, HB_SOCK_PF_INET ),
hb_parnidef( 2, HB_SOCK_STREAM ),
hb_parnidef( 3, HB_SOCK_IPPROTO_TCP ) ) );
hb_retsocket( hb_socketOpen( hb_parnidef( 1, HB_SOCKET_PF_INET ),
hb_parnidef( 2, HB_SOCKET_PT_STREAM ),
hb_parnidef( 3, HB_SOCKET_IPPROTO_TCP ) ) );
}
HB_FUNC( SOCKET_CLOSE )
@@ -144,7 +144,7 @@ HB_FUNC( SOCKET_ACCEPT )
HB_FUNC( SOCKET_SHUTDOWN )
{
hb_retni( hb_socketShutdown( hb_parsocket( 1 ),
hb_parnidef( 2, HB_SOCK_SHUT_RDWR ) ) );
hb_parnidef( 2, HB_SOCKET_SHUT_RDWR ) ) );
}
HB_FUNC( SOCKET_RECV )

110
harbour/include/hbsocket.ch
View File

@@ -50,8 +50,8 @@
*
*/
#ifndef HB_SOCK_CH_
#define HB_SOCK_CH_
#ifndef HB_SOCKET_CH_
#define HB_SOCKET_CH_
/* Harbour socket error codes */
#define HB_SOCKET_ERR_PIPE 1
@@ -125,67 +125,65 @@
#define HB_SOCKET_ERR_TYPENOTFOUND 69
#define HB_SOCKET_ERR_OTHER 70
/* protocol family */
#define HB_SOCK_PF_LOCAL 1
#define HB_SOCK_PF_INET 2
#define HB_SOCK_PF_IPX 4
#define HB_SOCK_PF_INET6 10
#define HB_SOCK_PF_PACKET 17
#define HB_SOCKET_PF_LOCAL 1
#define HB_SOCKET_PF_INET 2
#define HB_SOCKET_PF_IPX 4
#define HB_SOCKET_PF_INET6 10
#define HB_SOCKET_PF_PACKET 17
/* address familly */
#define HB_SOCK_AF_LOCAL HB_SOCK_PF_LOCAL
#define HB_SOCK_AF_INET HB_SOCK_PF_INET
#define HB_SOCK_AF_IPX HB_SOCK_PF_IPX
#define HB_SOCK_AF_INET6 HB_SOCK_PF_INET6
#define HB_SOCK_AF_PACKET HB_SOCK_PF_PACKET
#define HB_SOCKET_AF_LOCAL HB_SOCKET_PF_LOCAL
#define HB_SOCKET_AF_INET HB_SOCKET_PF_INET
#define HB_SOCKET_AF_IPX HB_SOCKET_PF_IPX
#define HB_SOCKET_AF_INET6 HB_SOCKET_PF_INET6
#define HB_SOCKET_AF_PACKET HB_SOCKET_PF_PACKET
/* protocol type */
#define HB_SOCK_STREAM 1
#define HB_SOCK_DGRAM 2
#define HB_SOCK_RAW 3
#define HB_SOCK_RDM 4
#define HB_SOCK_SEQPACKET 5
#define HB_SOCKET_PT_STREAM 1
#define HB_SOCKET_PT_DGRAM 2
#define HB_SOCKET_PT_RAW 3
#define HB_SOCKET_PT_RDM 4
#define HB_SOCKET_PT_SEQPACKET 5
/* IP protocols */
#define HB_SOCK_IPPROTO_IP 0 /* Dummy protocol for TCP */
#define HB_SOCK_IPPROTO_ICMP 1 /* Internet Control Message Protocol */
#define HB_SOCK_IPPROTO_IGMP 2 /* Internet Group Management Protocol */
#define HB_SOCK_IPPROTO_IPIP 4 /* IPIP tunnels (older KA9Q tunnels use 94) */
#define HB_SOCK_IPPROTO_TCP 6 /* Transmission Control Protocol */
#define HB_SOCK_IPPROTO_EGP 8 /* Exterior Gateway Protocol */
#define HB_SOCK_IPPROTO_PUP 12 /* PUP protocol */
#define HB_SOCK_IPPROTO_UDP 17 /* User Datagram Protocol */
#define HB_SOCK_IPPROTO_IDP 22 /* XNS IDP protocol */
#define HB_SOCK_IPPROTO_DCCP 23 /* DCCP protocol */
#define HB_SOCK_IPPROTO_RDP 29 /* RDP */
#define HB_SOCK_IPPROTO_TP 29 /* SO Transport Protocol Class 4 */
#define HB_SOCK_IPPROTO_IPV6 41 /* IPv6 header */
#define HB_SOCK_IPPROTO_ROUTING 43 /* IPv6 routing header */
#define HB_SOCK_IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */
#define HB_SOCK_IPPROTO_RSVP 46 /* Reservation Protocol */
#define HB_SOCK_IPPROTO_GRE 47 /* General Routing Encapsulation */
#define HB_SOCK_IPPROTO_ESP 50 /* Encapsulating security payload */
#define HB_SOCK_IPPROTO_AH 51 /* Authentication header */
#define HB_SOCK_IPPROTO_ICMPV6 58 /* ICMP v6 */
#define HB_SOCK_IPPROTO_NONE 59 /* IPv6 no next header */
#define HB_SOCK_IPPROTO_DSTOPTS 60 /* IPv6 destination options */
#define HB_SOCK_IPPROTO_ND 77 /* ND */
#define HB_SOCK_IPPROTO_ICLFXBM 78 /* ICLFXBM */
#define HB_SOCK_IPPROTO_EON 80 /* EON */
#define HB_SOCK_IPPROTO_MTP 92 /* Multicast Transport Protocol */
#define HB_SOCK_IPPROTO_ENCAP 98 /* Encapsulation Header */
#define HB_SOCK_IPPROTO_PIM 103 /* Protocol Independent Multicast */
#define HB_SOCK_IPPROTO_COMP 108 /* Compression Header Protocol */
#define HB_SOCK_IPPROTO_PGM 113 /* PGM */
#define HB_SOCK_IPPROTO_L2TP 115 /* L2TP */
#define HB_SOCK_IPPROTO_SCTP 132 /* Stream Control Transmission Protocol */
#define HB_SOCK_IPPROTO_RAW 255 /* Raw IP packets */
#define HB_SOCKET_IPPROTO_IP 0 /* Dummy protocol for TCP */
#define HB_SOCKET_IPPROTO_ICMP 1 /* Internet Control Message Protocol */
#define HB_SOCKET_IPPROTO_IGMP 2 /* Internet Group Management Protocol */
#define HB_SOCKET_IPPROTO_IPIP 4 /* IPIP tunnels (older KA9Q tunnels use 94) */
#define HB_SOCKET_IPPROTO_TCP 6 /* Transmission Control Protocol */
#define HB_SOCKET_IPPROTO_EGP 8 /* Exterior Gateway Protocol */
#define HB_SOCKET_IPPROTO_PUP 12 /* PUP protocol */
#define HB_SOCKET_IPPROTO_UDP 17 /* User Datagram Protocol */
#define HB_SOCKET_IPPROTO_IDP 22 /* XNS IDP protocol */
#define HB_SOCKET_IPPROTO_DCCP 23 /* DCCP protocol */
#define HB_SOCKET_IPPROTO_RDP 29 /* RDP */
#define HB_SOCKET_IPPROTO_TP 29 /* SO Transport Protocol Class 4 */
#define HB_SOCKET_IPPROTO_IPV6 41 /* IPv6 header */
#define HB_SOCKET_IPPROTO_ROUTING 43 /* IPv6 routing header */
#define HB_SOCKET_IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */
#define HB_SOCKET_IPPROTO_RSVP 46 /* Reservation Protocol */
#define HB_SOCKET_IPPROTO_GRE 47 /* General Routing Encapsulation */
#define HB_SOCKET_IPPROTO_ESP 50 /* Encapsulating security payload */
#define HB_SOCKET_IPPROTO_AH 51 /* Authentication header */
#define HB_SOCKET_IPPROTO_ICMPV6 58 /* ICMP v6 */
#define HB_SOCKET_IPPROTO_NONE 59 /* IPv6 no next header */
#define HB_SOCKET_IPPROTO_DSTOPTS 60 /* IPv6 destination options */
#define HB_SOCKET_IPPROTO_ND 77 /* ND */
#define HB_SOCKET_IPPROTO_ICLFXBM 78 /* ICLFXBM */
#define HB_SOCKET_IPPROTO_EON 80 /* EON */
#define HB_SOCKET_IPPROTO_MTP 92 /* Multicast Transport Protocol */
#define HB_SOCKET_IPPROTO_ENCAP 98 /* Encapsulation Header */
#define HB_SOCKET_IPPROTO_PIM 103 /* Protocol Independent Multicast */
#define HB_SOCKET_IPPROTO_COMP 108 /* Compression Header Protocol */
#define HB_SOCKET_IPPROTO_PGM 113 /* PGM */
#define HB_SOCKET_IPPROTO_L2TP 115 /* L2TP */
#define HB_SOCKET_IPPROTO_SCTP 132 /* Stream Control Transmission Protocol */
#define HB_SOCKET_IPPROTO_RAW 255 /* Raw IP packets */
/* shutdown actions */
#define HB_SOCK_SHUT_RD 0
#define HB_SOCK_SHUT_WR 1
#define HB_SOCK_SHUT_RDWR 2
#define HB_SOCKET_SHUT_RD 0
#define HB_SOCKET_SHUT_WR 1
#define HB_SOCKET_SHUT_RDWR 2
#endif /* HB_SOCK_CH_ */
#endif /* HB_SOCKET_CH_ */

10
harbour/include/hbsocket.h
View File

@@ -50,8 +50,8 @@
*
*/
#ifndef HB_SOCK_H_
#define HB_SOCK_H_
#ifndef HB_SOCKET_H_
#define HB_SOCKET_H_
#include "hbapi.h"
#include "hbsocket.ch"
@@ -64,7 +64,7 @@ HB_EXTERN_BEGIN
typedef int HB_SOCKET;
#endif
typedef HB_SOCKET ( * HB_SOCK_FUNC )( PHB_ITEM );
typedef HB_SOCKET ( * HB_SOCKET_FUNC )( PHB_ITEM );
#define HB_NO_SOCKET ( ( HB_SOCKET ) -1 )
@@ -112,8 +112,8 @@ HB_EXPORT extern int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG time
HB_EXPORT extern int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
PHB_ITEM pArrayWR, BOOL fSetWR,
PHB_ITEM pArrayEX, BOOL fSetEX,
HB_LONG timeout, HB_SOCK_FUNC pFunc );
HB_LONG timeout, HB_SOCKET_FUNC pFunc );
HB_EXTERN_END
#endif /* HB_SOCK_H_ */
#endif /* HB_SOCKET_H_ */

22
harbour/source/rtl/hbinet.c
View File

@@ -162,7 +162,7 @@ static HB_GARBAGE_FUNC( hb_inetSocketFinalize )
if( socket->sd != HB_NO_SOCKET )
{
hb_socketShutdown( socket->sd, HB_SOCK_SHUT_RDWR );
hb_socketShutdown( socket->sd, HB_SOCKET_SHUT_RDWR );
hb_socketClose( socket->sd );
socket->sd = HB_NO_SOCKET;
}
@@ -220,7 +220,7 @@ HB_FUNC( HB_INETCLOSE )
{
if( socket->sd != HB_NO_SOCKET )
{
hb_socketShutdown( socket->sd, HB_SOCK_SHUT_RDWR );
hb_socketShutdown( socket->sd, HB_SOCKET_SHUT_RDWR );
hb_retni( hb_socketClose( socket->sd ) );
socket->sd = HB_NO_SOCKET;
@@ -1051,7 +1051,7 @@ HB_FUNC( HB_INETGETHOSTS )
if( szHost )
{
PHB_ITEM pHosts = hb_socketGetHosts( szHost, HB_SOCK_PF_INET );
PHB_ITEM pHosts = hb_socketGetHosts( szHost, HB_SOCKET_PF_INET );
if( pHosts )
hb_itemReturnRelease( pHosts );
@@ -1068,7 +1068,7 @@ HB_FUNC( HB_INETGETALIAS )
if( szHost )
{
PHB_ITEM pHosts = hb_socketGetAliases( szHost, HB_SOCK_PF_INET );
PHB_ITEM pHosts = hb_socketGetAliases( szHost, HB_SOCKET_PF_INET );
if( pHosts )
hb_itemReturnRelease( pHosts );
@@ -1109,7 +1109,7 @@ HB_FUNC( HB_INETSERVER )
hb_socketClose( socket->sd );
socket->sd = HB_NO_SOCKET;
}
socket->sd = hb_socketOpen( HB_SOCK_PF_INET, HB_SOCK_STREAM, 0 );
socket->sd = hb_socketOpen( HB_SOCKET_PF_INET, HB_SOCKET_PT_STREAM, 0 );
if( socket->sd == HB_NO_SOCKET )
{
HB_SOCKET_SET_ERROR( socket );
@@ -1236,13 +1236,13 @@ HB_FUNC( HB_INETCONNECT )
else
HB_SOCKET_INIT( socket, pSocket );
szAddr = hb_socketResolveAddr( szHost, HB_SOCK_AF_INET );
szAddr = hb_socketResolveAddr( szHost, HB_SOCKET_AF_INET );
if( !szAddr )
HB_SOCKET_SET_ERROR( socket );
else
{
/* Creates comm socket */
socket->sd = hb_socketOpen( HB_SOCK_PF_INET, HB_SOCK_STREAM, 0 );
socket->sd = hb_socketOpen( HB_SOCKET_PF_INET, HB_SOCKET_PT_STREAM, 0 );
if( socket->sd == HB_NO_SOCKET )
HB_SOCKET_SET_ERROR( socket );
else
@@ -1290,7 +1290,7 @@ HB_FUNC( HB_INETCONNECTIP )
HB_SOCKET_INIT( socket, pSocket );
/* Creates comm socket */
socket->sd = hb_socketOpen( HB_SOCK_PF_INET, HB_SOCK_STREAM, 0 );
socket->sd = hb_socketOpen( HB_SOCKET_PF_INET, HB_SOCKET_PT_STREAM, 0 );
if( socket->sd == HB_NO_SOCKET )
HB_SOCKET_SET_ERROR( socket );
else
@@ -1331,7 +1331,7 @@ HB_FUNC( HB_INETDGRAMBIND )
HB_SOCKET_INIT( socket, pSocket );
/* Creates comm socket */
socket->sd = hb_socketOpen( HB_SOCK_PF_INET, HB_SOCK_DGRAM, HB_SOCK_IPPROTO_UDP );
socket->sd = hb_socketOpen( HB_SOCKET_PF_INET, HB_SOCKET_PT_DGRAM, HB_SOCKET_IPPROTO_UDP );
if( socket->sd == HB_NO_SOCKET )
{
HB_SOCKET_SET_ERROR( socket );
@@ -1363,7 +1363,7 @@ HB_FUNC( HB_INETDGRAMBIND )
}
else if( hb_pcount() >= 4 )
{
if( hb_socketSetMulticast( socket->sd, HB_SOCK_PF_INET, hb_parc( 4 ) ) != 0 )
if( hb_socketSetMulticast( socket->sd, HB_SOCKET_PF_INET, hb_parc( 4 ) ) != 0 )
HB_SOCKET_SET_ERROR( socket );
}
@@ -1378,7 +1378,7 @@ HB_FUNC( HB_INETDGRAM )
HB_SOCKET_INIT( socket, pSocket );
/* Creates comm socket */
socket->sd = hb_socketOpen( HB_SOCK_PF_INET, HB_SOCK_DGRAM, HB_SOCK_IPPROTO_UDP );
socket->sd = hb_socketOpen( HB_SOCKET_PF_INET, HB_SOCKET_PT_DGRAM, HB_SOCKET_IPPROTO_UDP );
if( socket->sd == HB_NO_SOCKET )
{
HB_SOCKET_SET_ERROR( socket );

96
harbour/source/rtl/hbsocket.c
View File

@@ -610,7 +610,7 @@ int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG timeout )
int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
PHB_ITEM pArrayWR, BOOL fSetWR,
PHB_ITEM pArrayEX, BOOL fSetEX,
HB_LONG timeout, HB_SOCK_FUNC pFunc )
HB_LONG timeout, HB_SOCKET_FUNC pFunc )
{
HB_SYMBOL_UNUSED( pArrayRD );
HB_SYMBOL_UNUSED( fSetRD );
@@ -1559,22 +1559,22 @@ BOOL hb_socketAddrFromItem( void ** pSockAddr, unsigned * puiLen, PHB_ITEM pAddr
{
switch( hb_arrayGetNI( pAddrItm, 1 ) )
{
case HB_SOCK_PF_INET:
case HB_SOCKET_PF_INET:
fOK = hb_socketInetAddr( pSockAddr, puiLen,
hb_arrayGetCPtr( pAddrItm, 2 ),
hb_arrayGetNI( pAddrItm, 3 ) );
break;
case HB_SOCK_PF_INET6:
case HB_SOCKET_PF_INET6:
fOK = hb_socketInet6Addr( pSockAddr, puiLen,
hb_arrayGetCPtr( pAddrItm, 2 ),
hb_arrayGetNI( pAddrItm, 3 ) );
break;
case HB_SOCK_PF_LOCAL:
case HB_SOCKET_PF_LOCAL:
fOK = hb_socketLocalAddr( pSockAddr, puiLen,
hb_arrayGetCPtr( pAddrItm, 2 ) );
break;
case HB_SOCK_PF_PACKET:
case HB_SOCK_PF_IPX:
case HB_SOCKET_PF_PACKET:
case HB_SOCKET_PF_IPX:
break;
}
}
@@ -1607,7 +1607,7 @@ PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len )
if( szAddr )
{
pAddrItm = hb_itemArrayNew( 3 );
hb_arraySetNI( pAddrItm, 1, HB_SOCK_PF_INET );
hb_arraySetNI( pAddrItm, 1, HB_SOCKET_PF_INET );
hb_arraySetC( pAddrItm, 2, szAddr );
hb_arraySetNI( pAddrItm, 3, ntohs( sa->sin_port ) );
}
@@ -1632,7 +1632,7 @@ PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len )
if( szAddr )
{
pAddrItm = hb_itemArrayNew( 3 );
hb_arraySetNI( pAddrItm, 1, HB_SOCK_PF_INET6 );
hb_arraySetNI( pAddrItm, 1, HB_SOCKET_PF_INET6 );
hb_arraySetC( pAddrItm, 2, szAddr );
hb_arraySetNI( pAddrItm, 3, ntohs( sa->sin6_port ) );
}
@@ -1649,7 +1649,7 @@ PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len )
{
struct sockaddr_un * sa = ( struct sockaddr_un * ) pSockAddr;
pAddrItm = hb_itemArrayNew( 2 );
hb_arraySetNI( pAddrItm, 1, HB_SOCK_PF_LOCAL );
hb_arraySetNI( pAddrItm, 1, HB_SOCKET_PF_LOCAL );
hb_arraySetC( pAddrItm, 2, sa->sun_path );
}
break;
@@ -1737,7 +1737,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#if defined( HB_SOCKET_TRANSLATE_DOMAIN )
switch( domain )
{
case HB_SOCK_PF_INET:
case HB_SOCKET_PF_INET:
#if defined( PF_INET )
domain = PF_INET;
#elif defined( AF_INET )
@@ -1747,7 +1747,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_PF_INET6:
case HB_SOCKET_PF_INET6:
#if defined( PF_INET6 )
domain = PF_INET6;
#elif defined( AF_INET6 )
@@ -1757,7 +1757,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_PF_LOCAL:
case HB_SOCKET_PF_LOCAL:
#if defined( PF_LOCAL )
domain = PF_LOCAL;
#elif defined( AF_LOCAL )
@@ -1771,7 +1771,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_PF_PACKET:
case HB_SOCKET_PF_PACKET:
#if defined( PF_PACKET )
domain = PF_PACKET;
#elif defined( AF_PACKET )
@@ -1781,7 +1781,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_PF_IPX:
case HB_SOCKET_PF_IPX:
#if defined( PF_IPX )
domain = PF_IPX;
#elif defined( AF_ )
@@ -1799,7 +1799,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#if defined( HB_SOCKET_TRANSLATE_TYPE )
if( err == 0 ) switch( type )
{
case HB_SOCK_STREAM:
case HB_SOCKET_PT_STREAM:
#if defined( SOCK_STREAM )
type = SOCK_STREAM;
#else
@@ -1807,7 +1807,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_DGRAM:
case HB_SOCKET_PT_DGRAM:
#if defined( SOCK_DGRAM )
type = SOCK_DGRAM;
#else
@@ -1815,7 +1815,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_SEQPACKET:
case HB_SOCKET_PT_SEQPACKET:
#if defined( SOCK_SEQPACKET )
type = SOCK_SEQPACKET;
#else
@@ -1823,7 +1823,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_RAW:
case HB_SOCKET_PT_RAW:
#if defined( SOCK_RAW )
type = SOCK_RAW;
#else
@@ -1831,7 +1831,7 @@ HB_SOCKET hb_socketOpen( int domain, int type, int protocol )
#endif
break;
case HB_SOCK_RDM:
case HB_SOCKET_PT_RDM:
#if defined( SOCK_RDM )
type = SOCK_RDM;
#else
@@ -1886,30 +1886,30 @@ int hb_socketShutdown( HB_SOCKET sd, int iMode )
int ret;
#if defined( HB_OS_WIN )
if( iMode == HB_SOCK_SHUT_RD )
if( iMode == HB_SOCKET_SHUT_RD )
iMode = SD_RECEIVE;
else if( iMode == HB_SOCK_SHUT_WR )
else if( iMode == HB_SOCKET_SHUT_WR )
iMode = SD_SEND;
else if( iMode == HB_SOCK_SHUT_RDWR )
else if( iMode == HB_SOCKET_SHUT_RDWR )
iMode = SD_BOTH;
#elif defined( HB_OS_OS2 )
if( iMode == HB_SOCK_SHUT_RD )
if( iMode == HB_SOCKET_SHUT_RD )
iMode = SO_RCV_SHUTDOWN;
else if( iMode == HB_SOCK_SHUT_WR )
else if( iMode == HB_SOCKET_SHUT_WR )
iMode = SO_SND_SHUTDOWN;
else if( iMode == HB_SOCK_SHUT_RDWR )
else if( iMode == HB_SOCKET_SHUT_RDWR )
iMode = SO_RCV_SHUTDOWN | SO_SND_SHUTDOWN;
#elif defined( __WATCOMC__ )
if( iMode == HB_SOCK_SHUT_RD ||
iMode == HB_SOCK_SHUT_WR ||
iMode == HB_SOCK_SHUT_RDWR )
if( iMode == HB_SOCKET_SHUT_RD ||
iMode == HB_SOCKET_SHUT_WR ||
iMode == HB_SOCKET_SHUT_RDWR )
{ ; }
#else
if( iMode == HB_SOCK_SHUT_RD )
if( iMode == HB_SOCKET_SHUT_RD )
iMode = SHUT_RD;
else if( iMode == HB_SOCK_SHUT_WR )
else if( iMode == HB_SOCKET_SHUT_WR )
iMode = SHUT_WR;
else if( iMode == HB_SOCK_SHUT_RDWR )
else if( iMode == HB_SOCKET_SHUT_RDWR )
iMode = SHUT_RDWR;
#endif
else
@@ -2277,7 +2277,7 @@ int hb_socketGetRcvBufSize( HB_SOCKET sd, int * piSize )
int hb_socketSetMulticast( HB_SOCKET sd, int af, const char * szAddr )
{
if( af == HB_SOCK_AF_INET )
if( af == HB_SOCKET_AF_INET )
{
#if defined( IP_ADD_MEMBERSHIP ) && defined( IPPROTO_IP )
struct ip_mreq mreq;
@@ -2291,7 +2291,7 @@ int hb_socketSetMulticast( HB_SOCKET sd, int af, const char * szAddr )
#endif
}
#if defined( HB_HAS_INET6 )
else if( af == HB_SOCK_AF_INET6 )
else if( af == HB_SOCKET_AF_INET6 )
{
#if defined( HB_HAS_INET_PTON ) && defined( IN6ADDR_ANY_INIT )
struct ipv6_mreq mreq;
@@ -2357,7 +2357,7 @@ int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG timeout )
int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
PHB_ITEM pArrayWR, BOOL fSetWR,
PHB_ITEM pArrayEX, BOOL fSetEX,
HB_LONG timeout, HB_SOCK_FUNC pFunc )
HB_LONG timeout, HB_SOCKET_FUNC pFunc )
{
HB_SOCKET maxsd, sd;
int i, ret;
@@ -2468,7 +2468,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
#if defined( HB_SOCKET_TRANSLATE_DOMAIN )
switch( af )
{
case HB_SOCK_PF_INET:
case HB_SOCKET_PF_INET:
#if defined( PF_INET )
af = PF_INET;
#elif defined( AF_INET )
@@ -2476,7 +2476,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_INET6:
case HB_SOCKET_PF_INET6:
#if defined( PF_INET6 )
af = PF_INET6;
#elif defined( AF_INET6 )
@@ -2484,7 +2484,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_LOCAL:
case HB_SOCKET_PF_LOCAL:
#if defined( PF_LOCAL )
af = PF_LOCAL;
#elif defined( AF_LOCAL )
@@ -2496,7 +2496,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_PACKET:
case HB_SOCKET_PF_PACKET:
#if defined( PF_PACKET )
af = PF_PACKET;
#elif defined( AF_PACKET )
@@ -2504,7 +2504,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_IPX:
case HB_SOCKET_PF_IPX:
#if defined( PF_IPX )
af = PF_IPX;
#elif defined( AF_ )
@@ -2531,7 +2531,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
}
#else
if( af == HB_SOCK_PF_INET )
if( af == HB_SOCKET_PF_INET )
{
struct hostent * he = NULL;
@@ -2556,7 +2556,7 @@ char * hb_socketResolveAddr( const char * szAddr, int af )
hb_vmLock();
}
#if defined( HB_HAS_INET6 )
else if( af == HB_SOCK_PF_INET6 )
else if( af == HB_SOCKET_PF_INET6 )
{
int TODO;
}
@@ -2576,7 +2576,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
#if defined( HB_SOCKET_TRANSLATE_DOMAIN )
switch( af )
{
case HB_SOCK_PF_INET:
case HB_SOCKET_PF_INET:
#if defined( PF_INET )
af = PF_INET;
#elif defined( AF_INET )
@@ -2584,7 +2584,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_INET6:
case HB_SOCKET_PF_INET6:
#if defined( PF_INET6 )
af = PF_INET6;
#elif defined( AF_INET6 )
@@ -2592,7 +2592,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_LOCAL:
case HB_SOCKET_PF_LOCAL:
#if defined( PF_LOCAL )
af = PF_LOCAL;
#elif defined( AF_LOCAL )
@@ -2604,7 +2604,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_PACKET:
case HB_SOCKET_PF_PACKET:
#if defined( PF_PACKET )
af = PF_PACKET;
#elif defined( AF_PACKET )
@@ -2612,7 +2612,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
#endif
break;
case HB_SOCK_PF_IPX:
case HB_SOCKET_PF_IPX:
#if defined( PF_IPX )
af = PF_IPX;
#elif defined( AF_ )
@@ -2676,7 +2676,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
}
#else
if( af == HB_SOCK_PF_INET )
if( af == HB_SOCKET_PF_INET )
{
struct hostent * he = NULL;
int iCount = 0;
@@ -2724,7 +2724,7 @@ PHB_ITEM hb_socketGetHosts( const char * szAddr, int af )
}
}
#if defined( HB_HAS_INET6 )
else if( af == HB_SOCK_PF_INET6 )
else if( af == HB_SOCKET_PF_INET6 )
{
int TODO;
}