* include/hbapifs.h
* src/common/hbffind.c
* src/rtl/direct.c
* src/rtl/dirscan.prg
* src/rtl/filebuf.c
+ added lTime member to HB_FFIND structure
+ added 3-rd parmeter to hb_fsDirectory()
+ extended default maximum number of Harbour file IO redirecros to 128
* use hb_xgrabz()
* formatting
* include/hbcompdf.h
* include/hbpp.h
* src/compiler/cmdcheck.c
* src/compiler/genc.c
* src/compiler/hbcomp.c
* src/compiler/hbmain.c
* src/compiler/ppcomp.c
* src/pp/hbpp.c
* src/pp/ppcore.c
* src/pp/pplib.c
+ added support for -ql compiler switch - it disables displaying PRG line
numbers during compilation
+ added internal support for switch which disables PRG names from final
PCODE - it's not active by default
* src/compiler/ppcomp.c
+ allow to change -gc? switch by #pragma directives
* src/compiler/hbusage.c
* present '-' as default option separator for all platforms
* src/rdd/Makefile
+ src/rdd/rddshort.c
- src/rdd/dbfuncs.prg
* moved short function names (10 characters Cl*pper compatible) wrappers
to rddshort.c
* src/common/hbhash.c
* src/compiler/gencc.c
* src/compiler/hbcomp.c
* src/compiler/hbdbginf.c
* src/compiler/hbdead.c
* src/compiler/hbmain.c
* src/compiler/hbopt.c
* src/debug/dbgentry.c
* src/pp/ppcore.c
* src/rdd/dbf1.c
* src/rdd/dbfntx/dbfntx1.c
* src/rdd/delim1.c
* src/rdd/sdf1.c
* src/rdd/hsx/hsx.c
* src/rdd/usrrdd/usrrdd.c
* src/rdd/wafunc.c
* src/rdd/workarea.c
* src/vm/classes.c
* src/vm/dynsym.c
* src/vm/estack.c
* src/vm/runner.c
* src/vm/set.c
* src/vm/task.c
* src/rtl/cdpapi.c
* src/rtl/filebuf.c
* src/rtl/gtcgi/gtcgi.c
* src/rtl/gtcrs/gtcrs.c
* src/rtl/gtstd/gtstd.c
* src/rtl/gttrm/gttrm.c
* src/rtl/gtxwc/gtxwc.c
* src/rtl/hbdyn.c
* src/rtl/hbgtcore.c
* src/rtl/hbi18n1.c
* src/rtl/hblpp.c
* src/rtl/hbznet.c
* src/rtl/iousr.c
* use hb_xgrabz()
* src/common/hbprintf.c
* formatting
* reduced variable scope
* src/rdd/dblist.prg
* src/rdd/hbsix/sxini.prg
* src/rtl/hbfilehi.prg
% use new hb_FName*() functions
* src/codepage/cp_950.c
* src/codepage/cp_big5.c
* src/codepage/cp_gbk.c
* src/codepage/cp_u16le.c
* src/codepage/cp_utf8.c
* src/common/hbfopen.c
* src/common/hbstr.c
* src/common/strwild.c
* src/compiler/complex.c
* src/compiler/genc.c
* src/compiler/hbopt.c
* src/compiler/hbusage.c
* src/debug/dbghelp.prg
* src/debug/debugger.prg
* src/hbextern/hbextern.prg
* src/main/harbour.1
* src/pp/ppcore.c
* src/rdd/dbcmd.c
* src/rdd/dbcmd53.c
* src/rdd/dbf1.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbfntx/dbfntx1.c
* src/rdd/dbjoin.prg
* src/rdd/dbnubs.c
* src/rdd/dbsort.prg
* src/rdd/dbstrux.prg
* src/rdd/dbtotal.prg
* src/rdd/dbupdat.prg
* src/rdd/hbsix/sxcompat.prg
* src/rdd/hbsix/sxcrypt.c
* src/rdd/hbsix/sxini.prg
* src/rdd/hsx/hsx.c
* src/rdd/usrrdd/usrrdd.c
* src/vm/debug.c
* src/vm/estack.c
* src/vm/set.c
* src/vm/task.c
* src/rtl/achoice.prg
* src/rtl/adir.prg
* src/rtl/alert.prg
* src/rtl/altd.prg
* src/rtl/base64d.c
* src/rtl/browse.prg
* src/rtl/cdpapi.c
* src/rtl/checkbox.prg
* src/rtl/color53.prg
* src/rtl/dbedit.prg
* src/rtl/dircmd.prg
* src/rtl/dirscan.prg
* src/rtl/errapi.c
* src/rtl/errsys.prg
* src/rtl/fnsplit.c
* src/rtl/gtchrmap.c
* src/rtl/gtcrs/gtcrs.c
* src/rtl/gtsln/gtsln.c
* src/rtl/gtsln/mousesln.c
* src/rtl/gttrm/gttrm.c
* src/rtl/gtwin/gtwin.c
* src/rtl/gtwvt/gtwvt.c
* src/rtl/gtxwc/gtxwc.c
* src/rtl/gui.prg
* src/rtl/hbbfish.c
* src/rtl/hbdoc.prg
* src/rtl/hbfilehi.prg
* src/rtl/hbgtcore.c
* src/rtl/hbi18n2.prg
* src/rtl/hbini.prg
* src/rtl/hblpphb.c
* src/rtl/hbregexc.c
* src/rtl/memvarhb.prg
* src/rtl/menusys.prg
* src/rtl/menuto.prg
* src/rtl/objfunc.prg
* src/rtl/padc.c
* src/rtl/padl.c
* src/rtl/padr.c
* src/rtl/profiler.prg
* src/rtl/radiobtn.prg
* src/rtl/radiogrp.prg
* src/rtl/setcolor.c
* src/rtl/tbcolumn.prg
* src/rtl/tbrowse.prg
* src/rtl/tclass.prg
* src/rtl/tgetint.prg
* src/rtl/tgetlist.prg
* src/rtl/tmenusys.prg
* src/rtl/tobject.prg
* src/rtl/tpersist.prg
* src/rtl/tpopup.prg
* src/rtl/tpopuphb.prg
* src/rtl/treport.prg
* src/rtl/tscalar.prg
* src/rtl/tsymbol.prg
* src/rtl/ttextlin.prg
* src/rtl/typefile.prg
* formatting, casing, comment updating, removed trailing spaces, casting,
replace hb_itemType() with HB_IS_*() macros, updated variable and
function names and scopes, pacified unused result warnings, removed
redundant castings, use HB_SIZEOFARRAY() and sizeof(), removed explicit
NIL from parameters, use hb_LeftEq[I](), added supports for symbol items
used as codeblock replacements, use hb_defaultValue(), use FOR EACH
statement, use SWITCH statement, replaced SubStr() with Left() or
Right(), use hb_AScan(), use hb_FReadLen()/hb_VFReadLen(),
removed FO_READ from FOpen() parameters, use Str() instead of PadL(),
use hb_StrShrink()
* src/lang/l_el.c
* src/lang/l_es_419.c
* src/lang/l_fr.c
* src/lang/l_hu.c
* src/lang/l_pt_br.c
* src/lang/l_sk.c
* src/lang/l_tr.c
* synced with Viktor's branch
* src/rtl/achoice.prg
* src/rtl/cdpdet.prg
* synced with Viktor's branch
* src/vm/Makefile
+ src/vm/short.c
+ added short function names (10 characters Cl*pper compatible) wrappers
* src/vm/extrap.c
* synced with Viktor's branch
* src/rtl/Makefile
+ src/rtl/rtlshort.c
+ added short function names (10 characters Cl*pper compatible) wrappers
* src/rtl/cdpdetc.c
* include/harbour.hbx
+ added __wapi_GetConsoleOutputCP()
* src/rtl/datec.c
* include/harbour.hbx
+ added hb_CDay( <nDayOfWeek> ) -> <cDayName>
* src/rtl/filesys.c
! do not check for PIPEs handles in WinCE builds
! respect OS returnb code in SystemTimeToFileTime()
* src/rtl/gete.c
* covered GetE() function by HB_CLP_UNDOC macro
* src/rtl/philes53.c
* covered FSetDevMod() function by HB_CLP_UNDOC macro
* src/rtl/hbdoc.prg
* use HB_SERIALIZE_COMPRESS instead of explicit hb_ZCompress()
(incompatible, .hbd files has to be regenerated)
* src/rtl/hbjson.c
* add a newline at EOF in human readable mode
* src/rtl/hbzlibgz.c
* disabled GZIP support in MSVC WinCE builds
* src/rtl/philes.c
* include/harbour.hbx
+ added hb_FReadLen()
* src/rtl/vfile.c
* include/harbour.hbx
+ added hb_VFReadLen()
* src/rtl/strclear.c
! check hb_itemGetWriteCL() result
; above modifications borrowed from Viktor's branch with some small
modifications - many thanks
* src/rtl/hbinet.c
* extened readahead buffer from 256 to 1500 bytes
! fixed possible wrong result in hb_InetDataReady() and redirected
sockets (i.e. by hb_InetCompress())
* src/rtl/hbsocket.c
! typo in recent modification for BSD socket less builds
+ src/rtl/strutf8.c
* include/harbour.hbx
+ added hb_StrIsUTF8() - it should be compatible with similar function
from Viktor's branch
* src/rtl/tpersist.prg
* eliminated oSelf private variable and reduced macro expansion to
item values
* src/debug/dbgtmenu.prg
* src/debug/dbgtwin.prg
* src/debug/debugger.prg
! replaced SaveScreen()/RestScreen() with
__dbgSaveScreen()/__dbgRestScreen() to fix problems with unicode
characters which do not exists in HVM CP.
* src/rdd/hbsix/sxcompat.prg
+ added support for timestamp values to sxChar(), sxNum(), sxDate()
functions.
243 lines
7.0 KiB
C
243 lines
7.0 KiB
C
/*
|
|
* Harbour Project source code:
|
|
* Length Prefix Protocol
|
|
*
|
|
* Copyright 2010 Mindaugas Kavaliauskas <dbtopas / at / dbtopas.lt>
|
|
* www - http://harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING.txt. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
#include "hbdate.h"
|
|
#include "hblpp.h"
|
|
|
|
|
|
PHB_LPP hb_lppCreate( HB_SOCKET sd )
|
|
{
|
|
PHB_LPP pSocket;
|
|
|
|
pSocket = ( PHB_LPP ) hb_xgrabz( sizeof( HB_LPP ) );
|
|
pSocket->sd = sd;
|
|
pSocket->nLimit = 1024;
|
|
return pSocket;
|
|
}
|
|
|
|
|
|
void hb_lppDestroy( PHB_LPP pSocket )
|
|
{
|
|
if( pSocket->pSendBuffer )
|
|
hb_xfree( pSocket->pSendBuffer );
|
|
|
|
if( pSocket->pRecvBuffer )
|
|
hb_xfree( pSocket->pRecvBuffer );
|
|
|
|
hb_xfree( pSocket );
|
|
}
|
|
|
|
|
|
void hb_lppSetLimit( PHB_LPP pSocket, HB_SIZE nLimit )
|
|
{
|
|
pSocket->nLimit = nLimit;
|
|
}
|
|
|
|
|
|
int hb_lppError( PHB_LPP pSocket )
|
|
{
|
|
return pSocket->iError;
|
|
}
|
|
|
|
|
|
HB_BOOL hb_lppSend( PHB_LPP pSocket, const void * data, HB_SIZE len, HB_MAXINT timeout )
|
|
{
|
|
HB_MAXINT nTime = 0;
|
|
long lSend;
|
|
|
|
if( ! pSocket->pSendBuffer )
|
|
{
|
|
pSocket->pSendBuffer = ( char * ) hb_xgrab( len + 4 );
|
|
HB_PUT_LE_UINT32( pSocket->pSendBuffer, len );
|
|
hb_xmemcpy( pSocket->pSendBuffer + 4, data, len );
|
|
pSocket->nSendLen = len + 4;
|
|
pSocket->nSendPos = 0;
|
|
}
|
|
|
|
if( timeout > 0 )
|
|
nTime = ( HB_MAXINT ) hb_dateMilliSeconds() + timeout;
|
|
|
|
for( ;; )
|
|
{
|
|
if( pSocket->nSendLen - pSocket->nSendPos < ( HB_SIZE ) LONG_MAX )
|
|
lSend = ( long ) ( pSocket->nSendLen - pSocket->nSendPos );
|
|
else
|
|
lSend = LONG_MAX;
|
|
|
|
lSend = hb_socketSend( pSocket->sd, pSocket->pSendBuffer + pSocket->nSendPos, lSend, 0, timeout );
|
|
if( lSend == -1 )
|
|
{
|
|
pSocket->iError = hb_socketGetError();
|
|
return HB_FALSE;
|
|
}
|
|
pSocket->nSendPos += lSend;
|
|
if( pSocket->nSendPos == pSocket->nSendLen )
|
|
{
|
|
hb_xfree( pSocket->pSendBuffer );
|
|
pSocket->pSendBuffer = NULL;
|
|
pSocket->iError = 0;
|
|
return HB_TRUE;
|
|
}
|
|
if( timeout == 0 ||
|
|
( timeout > 0 && ( timeout = nTime - ( HB_MAXINT ) hb_dateMilliSeconds() ) <= 0 ) )
|
|
{
|
|
pSocket->iError = HB_SOCKET_ERR_TIMEOUT;
|
|
return HB_FALSE;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
HB_BOOL hb_lppRecv( PHB_LPP pSocket, void ** data, HB_SIZE * len, HB_MAXINT timeout )
|
|
{
|
|
HB_MAXINT nTime = 0;
|
|
long lRecv;
|
|
|
|
if( ! pSocket->pRecvBuffer )
|
|
{
|
|
pSocket->pRecvBuffer = ( char * ) hb_xgrab( 4 );
|
|
pSocket->nRecvLen = 0;
|
|
pSocket->fRecvHasSize = HB_FALSE;
|
|
}
|
|
|
|
if( timeout > 0 )
|
|
nTime = ( HB_MAXINT ) hb_dateMilliSeconds() + timeout;
|
|
|
|
for( ;; )
|
|
{
|
|
if( ! pSocket->fRecvHasSize )
|
|
{
|
|
lRecv = ( long ) ( 4 - pSocket->nRecvLen );
|
|
lRecv = hb_socketRecv( pSocket->sd, pSocket->pRecvBuffer + pSocket->nRecvLen, lRecv, 0, timeout );
|
|
if( lRecv == -1 )
|
|
{
|
|
pSocket->iError = hb_socketGetError();
|
|
return HB_FALSE;
|
|
}
|
|
else if( lRecv == 0 )
|
|
{
|
|
/* peer closed connection */
|
|
pSocket->iError = 0;
|
|
return HB_FALSE;
|
|
}
|
|
|
|
pSocket->nRecvLen += lRecv;
|
|
if( pSocket->nRecvLen < 4 )
|
|
{
|
|
pSocket->iError = HB_SOCKET_ERR_TIMEOUT;
|
|
return HB_FALSE;
|
|
}
|
|
|
|
pSocket->nRecvSize = HB_GET_UINT32( pSocket->pRecvBuffer );
|
|
|
|
if( pSocket->nLimit && pSocket->nRecvSize > pSocket->nLimit )
|
|
{
|
|
/* protection against remote memory exhaust attack */
|
|
pSocket->iError = HB_LPP_ERR_TOOLARGE;
|
|
hb_xfree( pSocket->pRecvBuffer );
|
|
pSocket->pRecvBuffer = NULL;
|
|
return HB_FALSE;
|
|
}
|
|
|
|
pSocket->nRecvLen = 0;
|
|
pSocket->fRecvHasSize = HB_TRUE;
|
|
if( pSocket->nRecvSize != 4 )
|
|
pSocket->pRecvBuffer = ( char * ) hb_xrealloc( pSocket->pRecvBuffer, pSocket->nRecvSize );
|
|
}
|
|
|
|
if( pSocket->nRecvSize - pSocket->nRecvLen < ( HB_SIZE ) LONG_MAX )
|
|
lRecv = ( long ) ( pSocket->nRecvSize - pSocket->nRecvLen );
|
|
else
|
|
lRecv = LONG_MAX;
|
|
|
|
lRecv = hb_socketRecv( pSocket->sd, pSocket->pRecvBuffer + pSocket->nRecvLen, lRecv, 0, timeout );
|
|
if( lRecv == -1 )
|
|
{
|
|
pSocket->iError = hb_socketGetError();
|
|
return HB_FALSE;
|
|
}
|
|
else if( lRecv == 0 )
|
|
{
|
|
/* peer closed connection */
|
|
pSocket->iError = 0;
|
|
return HB_FALSE;
|
|
}
|
|
|
|
pSocket->nRecvLen += lRecv;
|
|
if( pSocket->nRecvSize == pSocket->nRecvLen )
|
|
{
|
|
* data = pSocket->pRecvBuffer;
|
|
* len = pSocket->nRecvLen;
|
|
pSocket->pRecvBuffer = NULL;
|
|
pSocket->iError = 0;
|
|
return HB_TRUE;
|
|
}
|
|
if( timeout == 0 ||
|
|
( timeout > 0 && ( timeout = nTime - ( HB_MAXINT ) hb_dateMilliSeconds() ) <= 0 ) )
|
|
{
|
|
pSocket->iError = HB_SOCKET_ERR_TIMEOUT;
|
|
return HB_FALSE;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
HB_SIZE hb_lppSendLen( PHB_LPP pSocket )
|
|
{
|
|
return pSocket->nSendLen - pSocket->nSendPos;
|
|
}
|
|
|
|
|
|
HB_SIZE hb_lppRecvLen( PHB_LPP pSocket )
|
|
{
|
|
return pSocket->nRecvLen;
|
|
}
|