2009-01-26 00:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/make_b32_all.bat
* contrib/make_gcc_all.sh
* contrib/make_vc_all.bat
+ contrib/hbssl
+ contrib/hbssl/Makefile
+ contrib/hbssl/common.mak
+ contrib/hbssl/make_b32.bat
+ contrib/hbssl/make_vc.bat
+ contrib/hbssl/make_gcc.sh
+ contrib/hbssl/hbssl.h
+ contrib/hbssl/hbssl.ch
+ contrib/hbssl/ssl.c
+ contrib/hbssl/sslctx.c
+ contrib/hbssl/sslrand.c
+ contrib/hbssl/tests
+ contrib/hbssl/tests/hbmk_b32.bat
+ contrib/hbssl/tests/hbmk_vc.bat
+ contrib/hbssl/tests/test.prg
+ Added Harbour bindings to OpenSSL.
Work in progress, but it's theoretically already functional.
To build, set your HB_DIR_OPENSSL or HB_INC_OPENSSL envvar.
; TOFIX: Makefile openssl autodetection should be adjusted.
* contrib/examples/uhttpd
! Fixed SVN attributes. (except for /home dir)
This commit is contained in:
@@ -8,13 +8,40 @@
|
||||
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
|
||||
*/
|
||||
|
||||
2009-01-26 00:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
|
||||
* contrib/make_b32_all.bat
|
||||
* contrib/make_gcc_all.sh
|
||||
* contrib/make_vc_all.bat
|
||||
+ contrib/hbssl
|
||||
+ contrib/hbssl/Makefile
|
||||
+ contrib/hbssl/common.mak
|
||||
+ contrib/hbssl/make_b32.bat
|
||||
+ contrib/hbssl/make_vc.bat
|
||||
+ contrib/hbssl/make_gcc.sh
|
||||
+ contrib/hbssl/hbssl.h
|
||||
+ contrib/hbssl/hbssl.ch
|
||||
+ contrib/hbssl/ssl.c
|
||||
+ contrib/hbssl/sslctx.c
|
||||
+ contrib/hbssl/sslrand.c
|
||||
+ contrib/hbssl/tests
|
||||
+ contrib/hbssl/tests/hbmk_b32.bat
|
||||
+ contrib/hbssl/tests/hbmk_vc.bat
|
||||
+ contrib/hbssl/tests/test.prg
|
||||
+ Added Harbour bindings to OpenSSL.
|
||||
Work in progress, but it's theoretically already functional.
|
||||
To build, set your HB_DIR_OPENSSL or HB_INC_OPENSSL envvar.
|
||||
; TOFIX: Makefile openssl autodetection should be adjusted.
|
||||
|
||||
* contrib/examples/uhttpd
|
||||
! Fixed SVN attributes. (except for /home dir)
|
||||
|
||||
2009-01-25 22:16 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
|
||||
* source/rtl/philes.c
|
||||
! FWRITE(): Fixed accessing past the string buffer (thus
|
||||
causing potential GPF and a huge security hole) when
|
||||
the passed length is greate than the lenght of the string.
|
||||
the passed length is greater than the length of the string.
|
||||
Very old bug. In fact CA-Cl*pper suffers from the same
|
||||
problem, and behavior for such case is not documented.
|
||||
problem, and behaviour for such case is not documented.
|
||||
Harbour will ignore the length parameter (thus writing
|
||||
the whole passed string), if the length is invalid.
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@echo off
|
||||
cls
|
||||
rem
|
||||
rem $Id: hbmk_b32.bat 9884 2008-11-09 19:37:16Z vszakats $
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
SET UHTTP_INET_SUPPORT=no
|
||||
|
||||
@@ -1,112 +1,112 @@
|
||||
/*
|
||||
* $Id: rlcdx.prg 9754 2008-10-27 22:40:04Z vszakats $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* uHTTPD info page
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
Show internal variables.
|
||||
Call it with: /info
|
||||
*/
|
||||
|
||||
|
||||
#include "common.ch"
|
||||
#include "hbclass.ch"
|
||||
|
||||
MEMVAR _SERVER, _REQUEST, _GET, _POST
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
LOCAL cHtml
|
||||
|
||||
cHtml := ShowServerInfo()
|
||||
|
||||
RETURN cHtml
|
||||
|
||||
STATIC FUNCTION ShowServerInfo()
|
||||
LOCAL cHtml := ""
|
||||
|
||||
cHtml += DisplayVars( _Server , "SERVER Vars" )
|
||||
cHtml += "<br>"
|
||||
cHtml += DisplayVars( _Get , "GET Vars" )
|
||||
cHtml += "<br>"
|
||||
cHtml += DisplayVars( _Post , "POST Vars" )
|
||||
cHtml += "<br>"
|
||||
//cHtml += DisplayVars( _Cookie , "COOKIE Vars" )
|
||||
//cHtml += "<br>"
|
||||
//cHtml += DisplayVars( _Files , "FILE Vars" )
|
||||
//cHtml += "<br>"
|
||||
cHtml += DisplayVars( _Request, "REQUEST Vars" )
|
||||
cHtml += "<br>"
|
||||
//cHtml += DisplayVars( _Session, "SESSION Vars" )
|
||||
//cHtml += "<br>"
|
||||
RETURN cHtml
|
||||
|
||||
STATIC FUNCTION DisplayVars( hHash, cTitle )
|
||||
LOCAL cHtml := ""
|
||||
cHtml += "<table width='90%' align='center' border='1'>"
|
||||
cHtml += "<th colspan=2>" + hb_cStr( cTitle ) + "</th>"
|
||||
cHtml += "<tr>"
|
||||
cHtml += "<th width='20%'>KEY</th>"
|
||||
cHtml += "<th width='80%'>VALUE</th>"
|
||||
cHtml += "</tr>"
|
||||
cHtml += DisplayHash( hHash )
|
||||
cHtml += "</table>"
|
||||
RETURN cHtml
|
||||
|
||||
STATIC FUNCTION DisplayHash( hHash )
|
||||
LOCAL cHtml := ""
|
||||
LOCAL cKey, cSubKey
|
||||
|
||||
FOR EACH cKey IN hHash:Keys
|
||||
cHtml += "<tr>"
|
||||
cHtml += "<td>" + hb_cStr( cKey ) + "</td>"
|
||||
cHtml += "<td>" + hb_cStr( hHash[ cKey ] ) + "</td>"
|
||||
cHtml += "</tr>"
|
||||
NEXT
|
||||
RETURN cHtml
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* uHTTPD info page
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
Show internal variables.
|
||||
Call it with: /info
|
||||
*/
|
||||
|
||||
|
||||
#include "common.ch"
|
||||
#include "hbclass.ch"
|
||||
|
||||
MEMVAR _SERVER, _REQUEST, _GET, _POST
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
LOCAL cHtml
|
||||
|
||||
cHtml := ShowServerInfo()
|
||||
|
||||
RETURN cHtml
|
||||
|
||||
STATIC FUNCTION ShowServerInfo()
|
||||
LOCAL cHtml := ""
|
||||
|
||||
cHtml += DisplayVars( _Server , "SERVER Vars" )
|
||||
cHtml += "<br>"
|
||||
cHtml += DisplayVars( _Get , "GET Vars" )
|
||||
cHtml += "<br>"
|
||||
cHtml += DisplayVars( _Post , "POST Vars" )
|
||||
cHtml += "<br>"
|
||||
//cHtml += DisplayVars( _Cookie , "COOKIE Vars" )
|
||||
//cHtml += "<br>"
|
||||
//cHtml += DisplayVars( _Files , "FILE Vars" )
|
||||
//cHtml += "<br>"
|
||||
cHtml += DisplayVars( _Request, "REQUEST Vars" )
|
||||
cHtml += "<br>"
|
||||
//cHtml += DisplayVars( _Session, "SESSION Vars" )
|
||||
//cHtml += "<br>"
|
||||
RETURN cHtml
|
||||
|
||||
STATIC FUNCTION DisplayVars( hHash, cTitle )
|
||||
LOCAL cHtml := ""
|
||||
cHtml += "<table width='90%' align='center' border='1'>"
|
||||
cHtml += "<th colspan=2>" + hb_cStr( cTitle ) + "</th>"
|
||||
cHtml += "<tr>"
|
||||
cHtml += "<th width='20%'>KEY</th>"
|
||||
cHtml += "<th width='80%'>VALUE</th>"
|
||||
cHtml += "</tr>"
|
||||
cHtml += DisplayHash( hHash )
|
||||
cHtml += "</table>"
|
||||
RETURN cHtml
|
||||
|
||||
STATIC FUNCTION DisplayHash( hHash )
|
||||
LOCAL cHtml := ""
|
||||
LOCAL cKey, cSubKey
|
||||
|
||||
FOR EACH cKey IN hHash:Keys
|
||||
cHtml += "<tr>"
|
||||
cHtml += "<td>" + hb_cStr( cKey ) + "</td>"
|
||||
cHtml += "<td>" + hb_cStr( hHash[ cKey ] ) + "</td>"
|
||||
cHtml += "</tr>"
|
||||
NEXT
|
||||
RETURN cHtml
|
||||
|
||||
@@ -1,219 +1,219 @@
|
||||
|
||||
/*
|
||||
* $Id: rlcdx.prg 9754 2008-10-27 22:40:04Z vszakats $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* simple image counter
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
MEMVAR _SERVER // defined in uHTTPD
|
||||
MEMVAR _REQUEST // defined in uHTTPD
|
||||
|
||||
#include "common.ch"
|
||||
//#include "xhb.ch"
|
||||
#include "gd.ch"
|
||||
|
||||
#define IMAGES_IN "..\..\hbgd\tests\digits\"
|
||||
#define IMAGES_OUT ( _SERVER[ "DOCUMENT_ROOT" ] + "\counter\" )
|
||||
|
||||
#define DISPLAY_NUM 10
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
LOCAL cHtml
|
||||
LOCAL cBaseImage
|
||||
|
||||
IF HB_HHasKey( _REQUEST, "w" )
|
||||
|
||||
cHtml := CreateCounter( AllTrim( Str( Val( _REQUEST[ "w" ] ) ) ) )
|
||||
//hb_ToOutDebug( hb_sprintf( "CreateCounter = %s", cHtml ) )
|
||||
IF !Empty( cHtml )
|
||||
uAddHeader( "Content-Type", "image/gif" )
|
||||
uAddHeader( "Pragma", "no-cache" )
|
||||
uAddHeader( "Content-Disposition", "inline; filename=counter" + LTrim( Str( hb_randomint( 100 ) ) ) + ".gif" )
|
||||
uWrite( cHtml )
|
||||
ELSE
|
||||
uAddHeader( "Content-Type", "text/html" )
|
||||
uWrite( "<h1>Error: No image created</h1>" )
|
||||
ENDIF
|
||||
|
||||
|
||||
ELSE
|
||||
|
||||
uAddHeader( "Content-Type", "text/html" )
|
||||
uWrite( "<h1>Error: no parameters passed</h1>" )
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN TRUE
|
||||
|
||||
STATIC FUNCTION CreateCounter( cValue, cBaseImage )
|
||||
|
||||
LOCAL oI, oIDigits, nWidth, nHeight, nDigits, nNumWidth, oTemp
|
||||
//LOCAL black, white, blue, red, green, cyan, gray
|
||||
LOCAL white
|
||||
LOCAL aNumberImages := {}
|
||||
LOCAL n, nValue
|
||||
LOCAL cFile
|
||||
|
||||
// A value if not passed
|
||||
DEFAULT cValue TO Str( hb_RandomInt( 1, 10^DISPLAY_NUM ), DISPLAY_NUM )
|
||||
DEFAULT cBaseImage TO "57chevy.gif"
|
||||
|
||||
IF !File( IMAGES_IN + cBaseImage )
|
||||
//hb_ToOutDebug( "ERROR: Base Image File '" + IMAGES_IN + cBaseImage + "' not found" )
|
||||
//THROW( "ERROR: Base Image File '" + IMAGES_IN + cBaseImage + "' not found" )
|
||||
RETURN NIL
|
||||
ENDIF
|
||||
|
||||
nValue := Val( cValue )
|
||||
|
||||
// Fix num lenght
|
||||
IF nValue > 10^DISPLAY_NUM
|
||||
nValue := 10^DISPLAY_NUM
|
||||
ENDIF
|
||||
|
||||
cValue := StrZero( nValue, DISPLAY_NUM )
|
||||
|
||||
//? "Value = ", cValue
|
||||
|
||||
// To set fonts run this command:
|
||||
// for windows: SET GDFONTPATH=c:\windows\fonts
|
||||
// per linux : export GDFONTPATH=/usr/share/fonts/default/TrueType
|
||||
|
||||
// SET GDFONTPATH=c:\windows\fonts
|
||||
//IF GetEnv( "GDFONTPATH" ) == ""
|
||||
// ? "Please set GDFONTPATH"
|
||||
// ? "On Windows: SET GDFONTPATH=c:\windows\fonts"
|
||||
// ? "On Linux : export GDFONTPATH=/usr/share/fonts/default/TrueType"
|
||||
// ?
|
||||
//ENDIF
|
||||
|
||||
// Check output directory
|
||||
/*
|
||||
IF !ISDirectory( IMAGES_OUT )
|
||||
DirMake( IMAGES_OUT )
|
||||
ENDIF
|
||||
*/
|
||||
|
||||
/* Load a digits image in memory from file */
|
||||
oIDigits := GDImage():LoadFromGif( IMAGES_IN + cBaseImage )
|
||||
|
||||
/* Get single number images */
|
||||
|
||||
// Get dimensions
|
||||
nWidth := oIDigits:Width()
|
||||
nHeight := oIDigits:Height()
|
||||
|
||||
// Check base digits image
|
||||
DO CASE
|
||||
CASE nWidth % 10 == 0 // 0..9 digits
|
||||
nDigits := 10
|
||||
CASE nWidth % 11 == 0 // 0..9 :
|
||||
nDigits := 11
|
||||
CASE nWidth % 13 == 0 // 0..9 : am pm
|
||||
nDigits := 13
|
||||
OTHERWISE
|
||||
uWrite( "Error on digits image" )
|
||||
ENDCASE
|
||||
nNumWidth := nWidth / nDigits
|
||||
|
||||
//? "nNumWidth, nWidth, nHeight, nDigits = ", nNumWidth, nWidth, nHeight, nDigits
|
||||
|
||||
/* extracts single digits */
|
||||
FOR n := 1 TO nDigits
|
||||
oTemp := oIDigits:Copy( (n - 1) * nNumWidth, 0, nNumWidth, nHeight )
|
||||
//oTemp:SaveGif( IMAGES_OUT + StrZero( n-1, 2 ) + ".gif" )
|
||||
// Here I have to clone the image, otherwise on var destruction I loose
|
||||
// the image in memory
|
||||
aAdd( aNumberImages, oTemp:Clone() )
|
||||
NEXT
|
||||
|
||||
/* Create counter image in memory */
|
||||
oI := GDImage():New( nNumWidth * DISPLAY_NUM, nHeight ) // the counter
|
||||
//? "Image dimensions: ", oI:Width(), oI:Height()
|
||||
|
||||
/* Allocate background */
|
||||
white := oI:SetColor( 255, 255, 255 )
|
||||
|
||||
/* Allocate drawing color */
|
||||
//black := oI:SetColor( 0, 0, 0 )
|
||||
//blue := oI:SetColor( 0, 0, 255 )
|
||||
//red := oI:SetColor( 255, 0, 0 )
|
||||
//green := oI:SetColor( 0, 255, 0 )
|
||||
//cyan := oI:SetColor( 0, 255, 255 )
|
||||
|
||||
/* Draw rectangle */
|
||||
//oI:Rectangle( 0, 0, 200, 30, , blue )
|
||||
|
||||
/* Draw Digits */
|
||||
FOR n := 1 TO Len( cValue )
|
||||
// Retrieve the number from array in memory
|
||||
oTemp := aNumberImages[ Val( SubStr( cValue, n, 1 ) ) + 1 ]:Clone()
|
||||
// Save it to show the number for a position
|
||||
//oTemp:SaveGif( IMAGES_OUT + "Pos_" + StrZero( n, 2 ) + ".gif" )
|
||||
// Set the digit as tile that I have to use to fill position in counter
|
||||
oI:SetTile( oTemp )
|
||||
// Fill the position with the image digit
|
||||
oI:Rectangle( (n - 1) * nNumWidth, 0, (n - 1) * nNumWidth + nNumWidth, nHeight, TRUE, gdTiled )
|
||||
NEXT
|
||||
|
||||
/* Write Final Counter Image */
|
||||
cFile := "counter" + StrZero( hb_RandomInt( 1, 99 ), 2 ) + ".gif"
|
||||
//oI:SaveGif( IMAGES_OUT + cFile )
|
||||
|
||||
/* Destroy images in memory */
|
||||
// Class does it automatically
|
||||
|
||||
//?
|
||||
//? "Look at " + IMAGES_OUT + " folder for output images"
|
||||
//?
|
||||
|
||||
//RETURN cFile
|
||||
RETURN oI:ToStringGif()
|
||||
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* simple image counter
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
MEMVAR _SERVER // defined in uHTTPD
|
||||
MEMVAR _REQUEST // defined in uHTTPD
|
||||
|
||||
#include "common.ch"
|
||||
//#include "xhb.ch"
|
||||
#include "gd.ch"
|
||||
|
||||
#define IMAGES_IN "..\..\hbgd\tests\digits\"
|
||||
#define IMAGES_OUT ( _SERVER[ "DOCUMENT_ROOT" ] + "\counter\" )
|
||||
|
||||
#define DISPLAY_NUM 10
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
LOCAL cHtml
|
||||
LOCAL cBaseImage
|
||||
|
||||
IF HB_HHasKey( _REQUEST, "w" )
|
||||
|
||||
cHtml := CreateCounter( AllTrim( Str( Val( _REQUEST[ "w" ] ) ) ) )
|
||||
//hb_ToOutDebug( hb_sprintf( "CreateCounter = %s", cHtml ) )
|
||||
IF !Empty( cHtml )
|
||||
uAddHeader( "Content-Type", "image/gif" )
|
||||
uAddHeader( "Pragma", "no-cache" )
|
||||
uAddHeader( "Content-Disposition", "inline; filename=counter" + LTrim( Str( hb_randomint( 100 ) ) ) + ".gif" )
|
||||
uWrite( cHtml )
|
||||
ELSE
|
||||
uAddHeader( "Content-Type", "text/html" )
|
||||
uWrite( "<h1>Error: No image created</h1>" )
|
||||
ENDIF
|
||||
|
||||
|
||||
ELSE
|
||||
|
||||
uAddHeader( "Content-Type", "text/html" )
|
||||
uWrite( "<h1>Error: no parameters passed</h1>" )
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN TRUE
|
||||
|
||||
STATIC FUNCTION CreateCounter( cValue, cBaseImage )
|
||||
|
||||
LOCAL oI, oIDigits, nWidth, nHeight, nDigits, nNumWidth, oTemp
|
||||
//LOCAL black, white, blue, red, green, cyan, gray
|
||||
LOCAL white
|
||||
LOCAL aNumberImages := {}
|
||||
LOCAL n, nValue
|
||||
LOCAL cFile
|
||||
|
||||
// A value if not passed
|
||||
DEFAULT cValue TO Str( hb_RandomInt( 1, 10^DISPLAY_NUM ), DISPLAY_NUM )
|
||||
DEFAULT cBaseImage TO "57chevy.gif"
|
||||
|
||||
IF !File( IMAGES_IN + cBaseImage )
|
||||
//hb_ToOutDebug( "ERROR: Base Image File '" + IMAGES_IN + cBaseImage + "' not found" )
|
||||
//THROW( "ERROR: Base Image File '" + IMAGES_IN + cBaseImage + "' not found" )
|
||||
RETURN NIL
|
||||
ENDIF
|
||||
|
||||
nValue := Val( cValue )
|
||||
|
||||
// Fix num lenght
|
||||
IF nValue > 10^DISPLAY_NUM
|
||||
nValue := 10^DISPLAY_NUM
|
||||
ENDIF
|
||||
|
||||
cValue := StrZero( nValue, DISPLAY_NUM )
|
||||
|
||||
//? "Value = ", cValue
|
||||
|
||||
// To set fonts run this command:
|
||||
// for windows: SET GDFONTPATH=c:\windows\fonts
|
||||
// per linux : export GDFONTPATH=/usr/share/fonts/default/TrueType
|
||||
|
||||
// SET GDFONTPATH=c:\windows\fonts
|
||||
//IF GetEnv( "GDFONTPATH" ) == ""
|
||||
// ? "Please set GDFONTPATH"
|
||||
// ? "On Windows: SET GDFONTPATH=c:\windows\fonts"
|
||||
// ? "On Linux : export GDFONTPATH=/usr/share/fonts/default/TrueType"
|
||||
// ?
|
||||
//ENDIF
|
||||
|
||||
// Check output directory
|
||||
/*
|
||||
IF !ISDirectory( IMAGES_OUT )
|
||||
DirMake( IMAGES_OUT )
|
||||
ENDIF
|
||||
*/
|
||||
|
||||
/* Load a digits image in memory from file */
|
||||
oIDigits := GDImage():LoadFromGif( IMAGES_IN + cBaseImage )
|
||||
|
||||
/* Get single number images */
|
||||
|
||||
// Get dimensions
|
||||
nWidth := oIDigits:Width()
|
||||
nHeight := oIDigits:Height()
|
||||
|
||||
// Check base digits image
|
||||
DO CASE
|
||||
CASE nWidth % 10 == 0 // 0..9 digits
|
||||
nDigits := 10
|
||||
CASE nWidth % 11 == 0 // 0..9 :
|
||||
nDigits := 11
|
||||
CASE nWidth % 13 == 0 // 0..9 : am pm
|
||||
nDigits := 13
|
||||
OTHERWISE
|
||||
uWrite( "Error on digits image" )
|
||||
ENDCASE
|
||||
nNumWidth := nWidth / nDigits
|
||||
|
||||
//? "nNumWidth, nWidth, nHeight, nDigits = ", nNumWidth, nWidth, nHeight, nDigits
|
||||
|
||||
/* extracts single digits */
|
||||
FOR n := 1 TO nDigits
|
||||
oTemp := oIDigits:Copy( (n - 1) * nNumWidth, 0, nNumWidth, nHeight )
|
||||
//oTemp:SaveGif( IMAGES_OUT + StrZero( n-1, 2 ) + ".gif" )
|
||||
// Here I have to clone the image, otherwise on var destruction I loose
|
||||
// the image in memory
|
||||
aAdd( aNumberImages, oTemp:Clone() )
|
||||
NEXT
|
||||
|
||||
/* Create counter image in memory */
|
||||
oI := GDImage():New( nNumWidth * DISPLAY_NUM, nHeight ) // the counter
|
||||
//? "Image dimensions: ", oI:Width(), oI:Height()
|
||||
|
||||
/* Allocate background */
|
||||
white := oI:SetColor( 255, 255, 255 )
|
||||
|
||||
/* Allocate drawing color */
|
||||
//black := oI:SetColor( 0, 0, 0 )
|
||||
//blue := oI:SetColor( 0, 0, 255 )
|
||||
//red := oI:SetColor( 255, 0, 0 )
|
||||
//green := oI:SetColor( 0, 255, 0 )
|
||||
//cyan := oI:SetColor( 0, 255, 255 )
|
||||
|
||||
/* Draw rectangle */
|
||||
//oI:Rectangle( 0, 0, 200, 30, , blue )
|
||||
|
||||
/* Draw Digits */
|
||||
FOR n := 1 TO Len( cValue )
|
||||
// Retrieve the number from array in memory
|
||||
oTemp := aNumberImages[ Val( SubStr( cValue, n, 1 ) ) + 1 ]:Clone()
|
||||
// Save it to show the number for a position
|
||||
//oTemp:SaveGif( IMAGES_OUT + "Pos_" + StrZero( n, 2 ) + ".gif" )
|
||||
// Set the digit as tile that I have to use to fill position in counter
|
||||
oI:SetTile( oTemp )
|
||||
// Fill the position with the image digit
|
||||
oI:Rectangle( (n - 1) * nNumWidth, 0, (n - 1) * nNumWidth + nNumWidth, nHeight, TRUE, gdTiled )
|
||||
NEXT
|
||||
|
||||
/* Write Final Counter Image */
|
||||
cFile := "counter" + StrZero( hb_RandomInt( 1, 99 ), 2 ) + ".gif"
|
||||
//oI:SaveGif( IMAGES_OUT + cFile )
|
||||
|
||||
/* Destroy images in memory */
|
||||
// Class does it automatically
|
||||
|
||||
//?
|
||||
//? "Look at " + IMAGES_OUT + " folder for output images"
|
||||
//?
|
||||
|
||||
//RETURN cFile
|
||||
RETURN oI:ToStringGif()
|
||||
|
||||
|
||||
@@ -1,400 +1,400 @@
|
||||
/*
|
||||
* $Id: rlcdx.prg 9754 2008-10-27 22:40:04Z vszakats $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* xml table servlet
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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 "common.ch"
|
||||
#include "hbclass.ch"
|
||||
|
||||
#define CRLF ( chr(13)+chr(10) )
|
||||
#define TABLE_NAME_PATH "..\..\..\tests\test.dbf"
|
||||
#define SIMULATE_SLOW_REPLY
|
||||
|
||||
MEMVAR _REQUEST // defined in uHTTPD
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
|
||||
LOCAL cXml, cPage, cCount, nCount
|
||||
LOCAL oTM
|
||||
LOCAL hGets
|
||||
|
||||
hGets := _REQUEST
|
||||
|
||||
DEFAULT hGets TO hb_Hash()
|
||||
|
||||
IF HB_HHasKey( hGets, "page" )
|
||||
|
||||
cPage := hGets[ "page" ]
|
||||
|
||||
oTM := TableManager():New()
|
||||
|
||||
IF ( oTM:Open() )
|
||||
|
||||
oTM:Read()
|
||||
cXml := oTM:getXmlData( Val( cPage ) )
|
||||
|
||||
oTM:Close()
|
||||
|
||||
ENDIF
|
||||
|
||||
ELSEIF HB_HHasKey( hGets, "count" )
|
||||
|
||||
cCount := hGets[ "count" ]
|
||||
|
||||
IF cCount == "true"
|
||||
|
||||
oTM := TableManager():New()
|
||||
|
||||
IF ( oTM:Open() )
|
||||
|
||||
nCount := oTM:getLastRec()
|
||||
cXml := oTM:getXmlCount( nCount )
|
||||
|
||||
oTM:Close()
|
||||
|
||||
ENDIF
|
||||
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
|
||||
IF !Empty( cXml )
|
||||
|
||||
uAddHeader("Content-Type", "text/xml")
|
||||
// cache control
|
||||
uAddHeader( "Cache-Control", "no-cache, must-revalidate" )
|
||||
uAddHeader( "Expires", "Mon, 26 Jul 1997 05:00:00 GMT" )
|
||||
|
||||
uWrite( cXml )
|
||||
|
||||
ELSE
|
||||
|
||||
uAddHeader("Content-Type", "text/xml")
|
||||
uWrite( '<?xml version="1.0" encoding="ISO-8859-1"?>' )
|
||||
uWrite( '<pages><page>No Data</page></pages>' )
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN TRUE // I Handle HTML Output
|
||||
|
||||
/*
|
||||
TableManager
|
||||
*/
|
||||
|
||||
CLASS TableManager
|
||||
|
||||
CLASSVAR ROWS_PER_PAGE INIT 23
|
||||
|
||||
VAR aData INIT {}
|
||||
|
||||
VAR cTable INIT TABLE_NAME_PATH
|
||||
VAR lOpened INIT FALSE
|
||||
|
||||
METHOD New()
|
||||
METHOD Open()
|
||||
METHOD Close() INLINE IIF( ::lOpened, ( table->( dbCloseArea() ), ::lOpened := FALSE ), )
|
||||
METHOD Read()
|
||||
METHOD getLastRec() INLINE table->( LastRec() )
|
||||
METHOD getXmlData()
|
||||
METHOD getXmlCount()
|
||||
METHOD xmlEncode( input )
|
||||
ENDCLASS
|
||||
|
||||
METHOD New() CLASS TableManager
|
||||
RETURN Self
|
||||
|
||||
METHOD Open() CLASS TableManager
|
||||
LOCAL cDBF := ::cTable
|
||||
|
||||
IF !::lOpened
|
||||
|
||||
CLOSE ALL
|
||||
USE ( cDBF ) ALIAS table SHARED NEW
|
||||
::lOpened := USED()
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN ::lOpened
|
||||
|
||||
METHOD Read() CLASS TableManager
|
||||
LOCAL hMap, lOk := FALSE
|
||||
|
||||
#ifdef SIMULATE_SLOW_REPLY
|
||||
// force slow connection to simulate long reply
|
||||
HB_IDLESLEEP(0.5)
|
||||
#endif
|
||||
|
||||
IF ::lOpened
|
||||
|
||||
table->( dbGoTop() )
|
||||
//n := 0
|
||||
DO WHILE table->( !Eof() ) //.AND. ++n < 50
|
||||
|
||||
hMap := hb_Hash()
|
||||
hMap[ "recno" ] := StrZero( table->( RecNo() ), 4 )
|
||||
hMap[ "name" ] := RTrim( table->first ) + " " + RTrim( table->last )
|
||||
hMap[ "address" ] := RTrim( table->street )
|
||||
hMap[ "city" ] := RTrim( table->city )
|
||||
hMap[ "state" ] := table->state
|
||||
hMap[ "zip" ] := table->zip
|
||||
aAdd( ::aData, hMap )
|
||||
table->( dbSkip() )
|
||||
ENDDO
|
||||
|
||||
lOk := TRUE
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN lOK
|
||||
|
||||
/**
|
||||
* Builds a <code>String</code> of XML representing the aData for the
|
||||
* request table.
|
||||
*
|
||||
* For simplicity, we are using a hard-coded data set. In a production
|
||||
* system, you may wish to use DAOs to query a database for specific table
|
||||
* data. This may require additional parameters (e.g., the name of the
|
||||
* table, which could be used to look up instructions on retrieving the
|
||||
* necessary data).
|
||||
*
|
||||
* The returned XML will be formatted as follows:
|
||||
* <table><br />
|
||||
* <header><br />
|
||||
* <cell key="address">Address</cell><br />
|
||||
* </header><br />
|
||||
* <row><br />
|
||||
* <cell key="name">Hank</cell><br />
|
||||
* <cell key="address">1B Something Street</cell><br />
|
||||
* <cell key="city">Marietta</cell><br />
|
||||
* <cell key="state">GA</cell><br />
|
||||
* <cell key="zip">30339</cell><br />
|
||||
* </row><br />
|
||||
* ...<br />
|
||||
* </table>
|
||||
*
|
||||
* @param page
|
||||
* the page number to retrieve data for
|
||||
* @return a <code>String</code> of XML representing data for the
|
||||
* requested table
|
||||
* @throws IllegalArgumentException
|
||||
*/
|
||||
|
||||
METHOD getXmlData( page ) CLASS TableManager
|
||||
LOCAL startIndex, stopIndex
|
||||
LOCAL xml, i, map, key, cString
|
||||
|
||||
/*
|
||||
* For simplicity, we are creating XML as a String. In a production
|
||||
* system, you should create an XML document (org.w3c.dom.Document) to
|
||||
* ensure compliance with the DOM Level 2 Core Specification.
|
||||
*/
|
||||
|
||||
// Calculate the start and end indexes of the table data.
|
||||
startIndex := (page - 1) * ::ROWS_PER_PAGE
|
||||
stopIndex := startIndex + ::ROWS_PER_PAGE
|
||||
stopIndex := Min( Len( ::aData ), stopIndex )
|
||||
|
||||
// Check the validity of the page index.
|
||||
IF ( startIndex < 0 .OR. startIndex >= stopIndex )
|
||||
//throw new IllegalArgumentException("Page index is out of bounds.");
|
||||
ENDIF
|
||||
|
||||
xml := BasicXML():New()
|
||||
|
||||
xml:append( '<?xml version="1.0" encoding="ISO-8859-1"?>' )
|
||||
|
||||
// Add the opening <table> tag
|
||||
xml:append( "<table>" )
|
||||
|
||||
// Add nodes describing the table columns
|
||||
xml:append( "<header>" )
|
||||
xml:append( '<cell key="recno">RecNo</cell>')
|
||||
xml:append( '<cell key="name">Name</cell>')
|
||||
xml:append( '<cell key="address">Address</cell>' )
|
||||
xml:append( '<cell key="city">City</cell>' )
|
||||
xml:append( '<cell key="state">State</cell>' )
|
||||
xml:append( '<cell key="zip">Zip</cell>' )
|
||||
xml:append( "</header>" )
|
||||
|
||||
// Add nodes for each row.
|
||||
FOR i := startIndex + 1 TO stopIndex
|
||||
map := ::aData[ i ]
|
||||
|
||||
// Add the opening <row> tag
|
||||
xml:append( "<row>" )
|
||||
|
||||
// For each entry in the HashMap, add a node
|
||||
// e.g., <address>123 four street</address>
|
||||
FOR EACH key IN map:Keys
|
||||
|
||||
cString := '<cell key="' + key + '">'
|
||||
cString += ::xmlEncode( hb_cStr( map[ key ] ) )
|
||||
cString += "</cell>"
|
||||
|
||||
xml:append( cString )
|
||||
|
||||
NEXT
|
||||
|
||||
// Add the closing </row> tag
|
||||
xml:append( "</row>" )
|
||||
|
||||
NEXT
|
||||
|
||||
// Add the closing </table> tag
|
||||
xml:append( "</table>" )
|
||||
|
||||
RETURN xml:toString()
|
||||
|
||||
METHOD getXmlCount( nCount ) CLASS TableManager
|
||||
LOCAL xml, n
|
||||
LOCAL nPages := nCount / ::ROWS_PER_PAGE
|
||||
|
||||
IF Int( nPages ) < nPages
|
||||
nPages++
|
||||
ENDIF
|
||||
|
||||
xml := BasicXML():New()
|
||||
|
||||
xml:append( '<?xml version="1.0" encoding="ISO-8859-1"?>' )
|
||||
|
||||
xml:append( "<pages>" )
|
||||
FOR n := 1 TO nPages
|
||||
xml:append( "<page>" + LTrim( Str( n ) ) + "</page>" )
|
||||
NEXT
|
||||
xml:append( "</pages>" )
|
||||
|
||||
RETURN xml:toString()
|
||||
|
||||
/**
|
||||
* Replaces characters commonly used in XML with symbolic representations
|
||||
* such that they are interpretted correctly by XML parsers.
|
||||
*
|
||||
* @param input
|
||||
* the string to encode.
|
||||
* @return the encoded version of the specified string
|
||||
*/
|
||||
METHOD xmlEncode( input ) CLASS TableManager
|
||||
|
||||
LOCAL out, i, c
|
||||
|
||||
IF input == NIL
|
||||
RETURN input
|
||||
ENDIF
|
||||
|
||||
// Go through the input string and replace the following
|
||||
// characters:
|
||||
// & &
|
||||
// ' '
|
||||
// " "
|
||||
// < <
|
||||
// > >
|
||||
// [any non-ascii character] &#[character code];
|
||||
|
||||
out := ""
|
||||
|
||||
FOR i := 1 TO Len( input )
|
||||
c := SubStr( input, i, 1 )
|
||||
switch ( c )
|
||||
case '&'
|
||||
out += "&"
|
||||
exit
|
||||
case "'"
|
||||
out += "'"
|
||||
exit
|
||||
case '"'
|
||||
out += """
|
||||
exit
|
||||
case '<'
|
||||
out += "<"
|
||||
exit
|
||||
case '>'
|
||||
out += ">"
|
||||
exit
|
||||
//case ' '
|
||||
// out += " "
|
||||
// exit
|
||||
case Chr( 9 ) //E'\t'
|
||||
case Chr( 13 ) //E'\r'
|
||||
case Chr( 10 ) //E'\n'
|
||||
out += c
|
||||
exit
|
||||
OTHERWISE
|
||||
// All non-ascii
|
||||
if ( Asc( c ) <= 0x1F .OR. Asc( c ) >= 0x80 )
|
||||
out += "&#x" + hb_NumToHex( Asc( c ) ) + ";"
|
||||
else
|
||||
out += c
|
||||
endif
|
||||
exit
|
||||
end
|
||||
NEXT
|
||||
|
||||
RETURN out
|
||||
|
||||
CLASS BasicXML
|
||||
VAR aData INIT {}
|
||||
|
||||
METHOD New() CONSTRUCTOR
|
||||
METHOD Append( cString ) INLINE aAdd( ::aData, cString )
|
||||
METHOD ToString()
|
||||
|
||||
ENDCLASS
|
||||
|
||||
METHOD New() CLASS BasicXML
|
||||
|
||||
RETURN Self
|
||||
|
||||
METHOD ToString() CLASS BasicXML
|
||||
LOCAL s := ""
|
||||
|
||||
aEval( ::aData, {|c| s += c + IIF( Right( c, 1 ) == ">", CRLF, "" ) } )
|
||||
|
||||
RETURN s
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* xml table servlet
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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 "common.ch"
|
||||
#include "hbclass.ch"
|
||||
|
||||
#define CRLF ( chr(13)+chr(10) )
|
||||
#define TABLE_NAME_PATH "..\..\..\tests\test.dbf"
|
||||
#define SIMULATE_SLOW_REPLY
|
||||
|
||||
MEMVAR _REQUEST // defined in uHTTPD
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
|
||||
LOCAL cXml, cPage, cCount, nCount
|
||||
LOCAL oTM
|
||||
LOCAL hGets
|
||||
|
||||
hGets := _REQUEST
|
||||
|
||||
DEFAULT hGets TO hb_Hash()
|
||||
|
||||
IF HB_HHasKey( hGets, "page" )
|
||||
|
||||
cPage := hGets[ "page" ]
|
||||
|
||||
oTM := TableManager():New()
|
||||
|
||||
IF ( oTM:Open() )
|
||||
|
||||
oTM:Read()
|
||||
cXml := oTM:getXmlData( Val( cPage ) )
|
||||
|
||||
oTM:Close()
|
||||
|
||||
ENDIF
|
||||
|
||||
ELSEIF HB_HHasKey( hGets, "count" )
|
||||
|
||||
cCount := hGets[ "count" ]
|
||||
|
||||
IF cCount == "true"
|
||||
|
||||
oTM := TableManager():New()
|
||||
|
||||
IF ( oTM:Open() )
|
||||
|
||||
nCount := oTM:getLastRec()
|
||||
cXml := oTM:getXmlCount( nCount )
|
||||
|
||||
oTM:Close()
|
||||
|
||||
ENDIF
|
||||
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
|
||||
IF !Empty( cXml )
|
||||
|
||||
uAddHeader("Content-Type", "text/xml")
|
||||
// cache control
|
||||
uAddHeader( "Cache-Control", "no-cache, must-revalidate" )
|
||||
uAddHeader( "Expires", "Mon, 26 Jul 1997 05:00:00 GMT" )
|
||||
|
||||
uWrite( cXml )
|
||||
|
||||
ELSE
|
||||
|
||||
uAddHeader("Content-Type", "text/xml")
|
||||
uWrite( '<?xml version="1.0" encoding="ISO-8859-1"?>' )
|
||||
uWrite( '<pages><page>No Data</page></pages>' )
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN TRUE // I Handle HTML Output
|
||||
|
||||
/*
|
||||
TableManager
|
||||
*/
|
||||
|
||||
CLASS TableManager
|
||||
|
||||
CLASSVAR ROWS_PER_PAGE INIT 23
|
||||
|
||||
VAR aData INIT {}
|
||||
|
||||
VAR cTable INIT TABLE_NAME_PATH
|
||||
VAR lOpened INIT FALSE
|
||||
|
||||
METHOD New()
|
||||
METHOD Open()
|
||||
METHOD Close() INLINE IIF( ::lOpened, ( table->( dbCloseArea() ), ::lOpened := FALSE ), )
|
||||
METHOD Read()
|
||||
METHOD getLastRec() INLINE table->( LastRec() )
|
||||
METHOD getXmlData()
|
||||
METHOD getXmlCount()
|
||||
METHOD xmlEncode( input )
|
||||
ENDCLASS
|
||||
|
||||
METHOD New() CLASS TableManager
|
||||
RETURN Self
|
||||
|
||||
METHOD Open() CLASS TableManager
|
||||
LOCAL cDBF := ::cTable
|
||||
|
||||
IF !::lOpened
|
||||
|
||||
CLOSE ALL
|
||||
USE ( cDBF ) ALIAS table SHARED NEW
|
||||
::lOpened := USED()
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN ::lOpened
|
||||
|
||||
METHOD Read() CLASS TableManager
|
||||
LOCAL hMap, lOk := FALSE
|
||||
|
||||
#ifdef SIMULATE_SLOW_REPLY
|
||||
// force slow connection to simulate long reply
|
||||
HB_IDLESLEEP(0.5)
|
||||
#endif
|
||||
|
||||
IF ::lOpened
|
||||
|
||||
table->( dbGoTop() )
|
||||
//n := 0
|
||||
DO WHILE table->( !Eof() ) //.AND. ++n < 50
|
||||
|
||||
hMap := hb_Hash()
|
||||
hMap[ "recno" ] := StrZero( table->( RecNo() ), 4 )
|
||||
hMap[ "name" ] := RTrim( table->first ) + " " + RTrim( table->last )
|
||||
hMap[ "address" ] := RTrim( table->street )
|
||||
hMap[ "city" ] := RTrim( table->city )
|
||||
hMap[ "state" ] := table->state
|
||||
hMap[ "zip" ] := table->zip
|
||||
aAdd( ::aData, hMap )
|
||||
table->( dbSkip() )
|
||||
ENDDO
|
||||
|
||||
lOk := TRUE
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN lOK
|
||||
|
||||
/**
|
||||
* Builds a <code>String</code> of XML representing the aData for the
|
||||
* request table.
|
||||
*
|
||||
* For simplicity, we are using a hard-coded data set. In a production
|
||||
* system, you may wish to use DAOs to query a database for specific table
|
||||
* data. This may require additional parameters (e.g., the name of the
|
||||
* table, which could be used to look up instructions on retrieving the
|
||||
* necessary data).
|
||||
*
|
||||
* The returned XML will be formatted as follows:
|
||||
* <table><br />
|
||||
* <header><br />
|
||||
* <cell key="address">Address</cell><br />
|
||||
* </header><br />
|
||||
* <row><br />
|
||||
* <cell key="name">Hank</cell><br />
|
||||
* <cell key="address">1B Something Street</cell><br />
|
||||
* <cell key="city">Marietta</cell><br />
|
||||
* <cell key="state">GA</cell><br />
|
||||
* <cell key="zip">30339</cell><br />
|
||||
* </row><br />
|
||||
* ...<br />
|
||||
* </table>
|
||||
*
|
||||
* @param page
|
||||
* the page number to retrieve data for
|
||||
* @return a <code>String</code> of XML representing data for the
|
||||
* requested table
|
||||
* @throws IllegalArgumentException
|
||||
*/
|
||||
|
||||
METHOD getXmlData( page ) CLASS TableManager
|
||||
LOCAL startIndex, stopIndex
|
||||
LOCAL xml, i, map, key, cString
|
||||
|
||||
/*
|
||||
* For simplicity, we are creating XML as a String. In a production
|
||||
* system, you should create an XML document (org.w3c.dom.Document) to
|
||||
* ensure compliance with the DOM Level 2 Core Specification.
|
||||
*/
|
||||
|
||||
// Calculate the start and end indexes of the table data.
|
||||
startIndex := (page - 1) * ::ROWS_PER_PAGE
|
||||
stopIndex := startIndex + ::ROWS_PER_PAGE
|
||||
stopIndex := Min( Len( ::aData ), stopIndex )
|
||||
|
||||
// Check the validity of the page index.
|
||||
IF ( startIndex < 0 .OR. startIndex >= stopIndex )
|
||||
//throw new IllegalArgumentException("Page index is out of bounds.");
|
||||
ENDIF
|
||||
|
||||
xml := BasicXML():New()
|
||||
|
||||
xml:append( '<?xml version="1.0" encoding="ISO-8859-1"?>' )
|
||||
|
||||
// Add the opening <table> tag
|
||||
xml:append( "<table>" )
|
||||
|
||||
// Add nodes describing the table columns
|
||||
xml:append( "<header>" )
|
||||
xml:append( '<cell key="recno">RecNo</cell>')
|
||||
xml:append( '<cell key="name">Name</cell>')
|
||||
xml:append( '<cell key="address">Address</cell>' )
|
||||
xml:append( '<cell key="city">City</cell>' )
|
||||
xml:append( '<cell key="state">State</cell>' )
|
||||
xml:append( '<cell key="zip">Zip</cell>' )
|
||||
xml:append( "</header>" )
|
||||
|
||||
// Add nodes for each row.
|
||||
FOR i := startIndex + 1 TO stopIndex
|
||||
map := ::aData[ i ]
|
||||
|
||||
// Add the opening <row> tag
|
||||
xml:append( "<row>" )
|
||||
|
||||
// For each entry in the HashMap, add a node
|
||||
// e.g., <address>123 four street</address>
|
||||
FOR EACH key IN map:Keys
|
||||
|
||||
cString := '<cell key="' + key + '">'
|
||||
cString += ::xmlEncode( hb_cStr( map[ key ] ) )
|
||||
cString += "</cell>"
|
||||
|
||||
xml:append( cString )
|
||||
|
||||
NEXT
|
||||
|
||||
// Add the closing </row> tag
|
||||
xml:append( "</row>" )
|
||||
|
||||
NEXT
|
||||
|
||||
// Add the closing </table> tag
|
||||
xml:append( "</table>" )
|
||||
|
||||
RETURN xml:toString()
|
||||
|
||||
METHOD getXmlCount( nCount ) CLASS TableManager
|
||||
LOCAL xml, n
|
||||
LOCAL nPages := nCount / ::ROWS_PER_PAGE
|
||||
|
||||
IF Int( nPages ) < nPages
|
||||
nPages++
|
||||
ENDIF
|
||||
|
||||
xml := BasicXML():New()
|
||||
|
||||
xml:append( '<?xml version="1.0" encoding="ISO-8859-1"?>' )
|
||||
|
||||
xml:append( "<pages>" )
|
||||
FOR n := 1 TO nPages
|
||||
xml:append( "<page>" + LTrim( Str( n ) ) + "</page>" )
|
||||
NEXT
|
||||
xml:append( "</pages>" )
|
||||
|
||||
RETURN xml:toString()
|
||||
|
||||
/**
|
||||
* Replaces characters commonly used in XML with symbolic representations
|
||||
* such that they are interpretted correctly by XML parsers.
|
||||
*
|
||||
* @param input
|
||||
* the string to encode.
|
||||
* @return the encoded version of the specified string
|
||||
*/
|
||||
METHOD xmlEncode( input ) CLASS TableManager
|
||||
|
||||
LOCAL out, i, c
|
||||
|
||||
IF input == NIL
|
||||
RETURN input
|
||||
ENDIF
|
||||
|
||||
// Go through the input string and replace the following
|
||||
// characters:
|
||||
// & &
|
||||
// ' '
|
||||
// " "
|
||||
// < <
|
||||
// > >
|
||||
// [any non-ascii character] &#[character code];
|
||||
|
||||
out := ""
|
||||
|
||||
FOR i := 1 TO Len( input )
|
||||
c := SubStr( input, i, 1 )
|
||||
switch ( c )
|
||||
case '&'
|
||||
out += "&"
|
||||
exit
|
||||
case "'"
|
||||
out += "'"
|
||||
exit
|
||||
case '"'
|
||||
out += """
|
||||
exit
|
||||
case '<'
|
||||
out += "<"
|
||||
exit
|
||||
case '>'
|
||||
out += ">"
|
||||
exit
|
||||
//case ' '
|
||||
// out += " "
|
||||
// exit
|
||||
case Chr( 9 ) //E'\t'
|
||||
case Chr( 13 ) //E'\r'
|
||||
case Chr( 10 ) //E'\n'
|
||||
out += c
|
||||
exit
|
||||
OTHERWISE
|
||||
// All non-ascii
|
||||
if ( Asc( c ) <= 0x1F .OR. Asc( c ) >= 0x80 )
|
||||
out += "&#x" + hb_NumToHex( Asc( c ) ) + ";"
|
||||
else
|
||||
out += c
|
||||
endif
|
||||
exit
|
||||
end
|
||||
NEXT
|
||||
|
||||
RETURN out
|
||||
|
||||
CLASS BasicXML
|
||||
VAR aData INIT {}
|
||||
|
||||
METHOD New() CONSTRUCTOR
|
||||
METHOD Append( cString ) INLINE aAdd( ::aData, cString )
|
||||
METHOD ToString()
|
||||
|
||||
ENDCLASS
|
||||
|
||||
METHOD New() CLASS BasicXML
|
||||
|
||||
RETURN Self
|
||||
|
||||
METHOD ToString() CLASS BasicXML
|
||||
LOCAL s := ""
|
||||
|
||||
aEval( ::aData, {|c| s += c + IIF( Right( c, 1 ) == ">", CRLF, "" ) } )
|
||||
|
||||
RETURN s
|
||||
|
||||
|
||||
@@ -1,69 +1,69 @@
|
||||
/*
|
||||
* $Id: rlcdx.prg 9754 2008-10-27 22:40:04Z vszakats $
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* simple ajax responder
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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 "common.ch"
|
||||
|
||||
MEMVAR _REQUEST
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
LOCAL cW
|
||||
LOCAL cHtml := ""
|
||||
|
||||
IF HB_HHasKey( _REQUEST, "w" )
|
||||
IF !Empty( cW := _REQUEST[ "w" ] )
|
||||
cHtml += "This is a reply from testajax : " + cW
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN cHtml
|
||||
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* simple ajax responder
|
||||
*
|
||||
* Copyright 2009 Francesco Saverio Giudice <info / at / fsgiudice.com>
|
||||
* www - http://www.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. 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 "common.ch"
|
||||
|
||||
MEMVAR _REQUEST
|
||||
|
||||
FUNCTION HRBMAIN()
|
||||
LOCAL cW
|
||||
LOCAL cHtml := ""
|
||||
|
||||
IF HB_HHasKey( _REQUEST, "w" )
|
||||
IF !Empty( cW := _REQUEST[ "w" ] )
|
||||
cHtml += "This is a reply from testajax : " + cW
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN cHtml
|
||||
|
||||
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
|
||||
uHTTPD micro web server
|
||||
|
||||
Build it using hbmk*.bat
|
||||
Parameters accepted: --without-gd (disable Lib GD support)
|
||||
|
||||
To see accepted parameters run: uhttpd -?
|
||||
Parameters can also be defined using uhttpd.ini file.
|
||||
|
||||
Before starting please build modules in modules folder using bldhrb.bat
|
||||
|
||||
Once started connect to uhttpd using:
|
||||
http://localhost:8082
|
||||
to see default index page.
|
||||
|
||||
Francesco
|
||||
|
||||
|
||||
|
||||
uHTTPD micro web server
|
||||
|
||||
Build it using hbmk*.bat
|
||||
Parameters accepted: --without-gd (disable Lib GD support)
|
||||
|
||||
To see accepted parameters run: uhttpd -?
|
||||
Parameters can also be defined using uhttpd.ini file.
|
||||
|
||||
Before starting please build modules in modules folder using bldhrb.bat
|
||||
|
||||
Once started connect to uhttpd using:
|
||||
http://localhost:8082
|
||||
to see default index page.
|
||||
|
||||
Francesco
|
||||
|
||||
|
||||
|
||||
@@ -1,416 +1,416 @@
|
||||
#include <windows.h>
|
||||
#include "hbapi.h"
|
||||
#include "hbapiitm.h"
|
||||
|
||||
/*
|
||||
|
||||
Function naming:
|
||||
The intention of this library is to be as close as possible to the original
|
||||
socket implementation. This supposed to be valid for function names also,
|
||||
but some of the names are very platform dependent, ex., WSA*() functions.
|
||||
select() function name is reserved for standard Harbour's function, so,
|
||||
socket_*() prefix was used:
|
||||
socket_init() - WSAStartup()
|
||||
socket_exit() - WSACleanup()
|
||||
socket_error() - WSALastError()
|
||||
socket_select() - select()
|
||||
Finally I renamed all functions to have socket_*() prefix to be more "prefix
|
||||
compatible" and not to occupy a general function names like send(), bind(),
|
||||
accept(), listen(), etc.:
|
||||
socket_create() - socket()
|
||||
socket_close() - closesocket()
|
||||
socket_shutdown() - shutdown()
|
||||
socket_bind() - bind()
|
||||
socket_listen() - listen()
|
||||
socket_accept() - accept()
|
||||
socket_send() - send()
|
||||
socket_recv() - recv()
|
||||
socket_recv() - recv()
|
||||
socket_getsockname() - getsockname()
|
||||
socket_getpeername() - getpeername()
|
||||
|
||||
|
||||
Types mapping:
|
||||
SOCKET
|
||||
UINT_PTR in Windows, let's map it to pointer type, and INVALID_SOCKET value to NIL
|
||||
|
||||
struct sockaddr
|
||||
It is not only IP addresses, also can be IPX, etc. All network-host byte order
|
||||
conversion should be hidden from Harbour API. So, let's map to:
|
||||
{ adress_familly, ... }
|
||||
AF_INET: { AF_INET, cAddr, nPort }
|
||||
other: { AF_?, cAddressDump }
|
||||
*/
|
||||
|
||||
#ifdef hb_parnidef
|
||||
#undef hb_parnidef
|
||||
#endif
|
||||
|
||||
|
||||
static int hb_parnidef( int iParam, int iValue )
|
||||
{
|
||||
return ISNUM( iParam ) ? hb_parni( iParam ) : iValue;
|
||||
}
|
||||
|
||||
|
||||
static SOCKET hb_parsocket( int iParam )
|
||||
{
|
||||
return ISPOINTER( iParam ) ? ( SOCKET ) hb_parptr( 1 ) : INVALID_SOCKET;
|
||||
}
|
||||
|
||||
|
||||
static void hb_retsocket( SOCKET hSocket )
|
||||
{
|
||||
if( hSocket == INVALID_SOCKET )
|
||||
hb_ret();
|
||||
else
|
||||
hb_retptr( ( void* ) hSocket );
|
||||
}
|
||||
|
||||
|
||||
static SOCKET hb_itemGetSocket( PHB_ITEM pItem )
|
||||
{
|
||||
return HB_IS_POINTER( pItem ) ? ( SOCKET ) hb_itemGetPtr( pItem ) : INVALID_SOCKET;
|
||||
}
|
||||
|
||||
|
||||
static PHB_ITEM hb_itemPutSocket( PHB_ITEM pItem, SOCKET hSocket )
|
||||
{
|
||||
if( ! pItem )
|
||||
pItem = hb_itemNew( NULL );
|
||||
|
||||
if( hSocket == INVALID_SOCKET )
|
||||
hb_itemClear( pItem );
|
||||
else
|
||||
hb_itemPutPtr( pItem, ( void* ) hSocket );
|
||||
|
||||
return pItem;
|
||||
}
|
||||
|
||||
|
||||
static void hb_itemGetSockaddr( PHB_ITEM pItem, struct sockaddr* sa )
|
||||
{
|
||||
memset( sa, 0, sizeof( struct sockaddr ) );
|
||||
|
||||
if( HB_IS_ARRAY( pItem ) )
|
||||
{
|
||||
sa->sa_family = hb_arrayGetNI( pItem, 1 );
|
||||
|
||||
if( sa->sa_family == AF_INET )
|
||||
{
|
||||
( ( struct sockaddr_in* ) sa)->sin_addr.S_un.S_addr = inet_addr( hb_arrayGetCPtr( pItem, 2 ) );
|
||||
( ( struct sockaddr_in* ) sa)->sin_port = htons( hb_arrayGetNI( pItem, 3 ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
ULONG ulLen = hb_arrayGetCLen( pItem, 2 );
|
||||
|
||||
if( ulLen > sizeof( sa->sa_data ) )
|
||||
ulLen = sizeof( sa->sa_data );
|
||||
memcpy( sa->sa_data, hb_arrayGetCPtr( pItem, 2 ), ulLen );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static PHB_ITEM hb_itemPutSockaddr( PHB_ITEM pItem, const struct sockaddr* saddr )
|
||||
{
|
||||
pItem = hb_itemNew( pItem );
|
||||
|
||||
if( saddr->sa_family == AF_INET )
|
||||
{
|
||||
hb_arrayNew( pItem, 3 );
|
||||
hb_arraySetNI( pItem, 1, saddr->sa_family );
|
||||
hb_arraySetC( pItem, 2, inet_ntoa( ( ( struct sockaddr_in* ) saddr )->sin_addr ) );
|
||||
hb_arraySetNI( pItem, 3, ntohs( ( ( struct sockaddr_in* ) saddr )->sin_port ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_arrayNew( pItem, 2 );
|
||||
hb_arraySetNI( pItem, 1, saddr->sa_family );
|
||||
hb_arraySetCL( pItem, 2, saddr->sa_data, sizeof( saddr->sa_data ) );
|
||||
}
|
||||
return pItem;
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_INIT )
|
||||
{
|
||||
WSADATA wsad;
|
||||
|
||||
hb_retni( WSAStartup( hb_parnidef( 1, 257 ), &wsad ) );
|
||||
hb_storclen( (char*) &wsad, sizeof( WSADATA ), 2 );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_EXIT )
|
||||
{
|
||||
hb_retni( WSACleanup() );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_ERROR )
|
||||
{
|
||||
hb_retni( WSAGetLastError() );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_CREATE )
|
||||
{
|
||||
hb_retsocket( socket( hb_parnidef( 1, PF_INET ),
|
||||
hb_parnidef( 2, SOCK_STREAM ),
|
||||
hb_parnidef( 3, IPPROTO_TCP ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_CLOSE )
|
||||
{
|
||||
hb_retni( closesocket( hb_parsocket( 1 ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_BIND )
|
||||
{
|
||||
struct sockaddr sa;
|
||||
|
||||
hb_itemGetSockaddr( hb_param( 2, HB_IT_ANY ), &sa );
|
||||
hb_retni( bind( hb_parsocket( 1 ), &sa, sizeof( struct sockaddr ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_LISTEN )
|
||||
{
|
||||
hb_retni( listen( hb_parsocket( 1 ), hb_parnidef( 2, 10 ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_ACCEPT )
|
||||
{
|
||||
struct sockaddr saddr;
|
||||
int iSize = sizeof( struct sockaddr );
|
||||
|
||||
hb_retsocket( accept( hb_parsocket( 1 ), &saddr, &iSize ) );
|
||||
|
||||
if( ISBYREF( 2 ) )
|
||||
{
|
||||
hb_itemParamStoreForward( 2, hb_itemPutSockaddr( NULL, &saddr ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_SHUTDOWN )
|
||||
{
|
||||
hb_retni( shutdown( hb_parsocket( 1 ), hb_parnidef( 2, SD_BOTH ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_RECV )
|
||||
{
|
||||
int iLen, iRet;
|
||||
char* pBuf;
|
||||
|
||||
iLen = hb_parni( 3 );
|
||||
|
||||
if( iLen > 65536 || iLen <= 0 )
|
||||
iLen = 4096;
|
||||
|
||||
pBuf = ( char* ) hb_xgrab( ( ULONG ) iLen );
|
||||
iRet = recv( hb_parsocket( 1 ), pBuf, iLen, hb_parnidef( 4, 0 ) );
|
||||
hb_retni( iRet );
|
||||
hb_storclen( pBuf, iRet > 0 ? iRet : 0, 2 );
|
||||
hb_xfree( pBuf );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_SEND )
|
||||
{
|
||||
hb_retni( send( hb_parsocket( 1 ), hb_parc( 2 ), hb_parclen( 2 ), hb_parni( 3, 0 ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_SELECT )
|
||||
{
|
||||
fd_set setread, setwrite, seterror;
|
||||
BOOL bRead = 0, bWrite = 0, bError = 0;
|
||||
struct timeval tv;
|
||||
SOCKET socket, maxsocket;
|
||||
PHB_ITEM pArray, pItem;
|
||||
ULONG ulLen, ulIndex, ulCount;
|
||||
LONG lTimeout;
|
||||
int iRet;
|
||||
|
||||
|
||||
FD_ZERO( &setread );
|
||||
FD_ZERO( &setwrite );
|
||||
FD_ZERO( &seterror );
|
||||
|
||||
maxsocket = (SOCKET) 0;
|
||||
|
||||
pArray = hb_param( 1, HB_IT_ARRAY );
|
||||
if( pArray )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
bRead = 1;
|
||||
FD_SET( socket, &setread );
|
||||
if( socket > maxsocket )
|
||||
maxsocket = socket;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pArray = hb_param( 2, HB_IT_ARRAY );
|
||||
if( pArray )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
bWrite = 1;
|
||||
FD_SET( socket, &setwrite );
|
||||
if( socket > maxsocket )
|
||||
maxsocket = socket;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pArray = hb_param( 3, HB_IT_ARRAY );
|
||||
if( pArray )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
bError = 1;
|
||||
FD_SET( socket, &seterror );
|
||||
if( socket > maxsocket )
|
||||
maxsocket = socket;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Default forever */
|
||||
lTimeout = ISNUM( 4 ) ? hb_parnl( 4 ) : -1;
|
||||
|
||||
if( lTimeout == -1 )
|
||||
{
|
||||
iRet = select( maxsocket + 1, bRead ? &setread : NULL, bWrite ? &setwrite: NULL,
|
||||
bError ? &seterror : NULL, NULL );
|
||||
}
|
||||
else
|
||||
{
|
||||
tv.tv_sec = lTimeout / 1000;
|
||||
tv.tv_usec = ( lTimeout % 1000 ) * 1000;
|
||||
iRet = select( maxsocket + 1, bRead ? &setread : NULL, bWrite ? &setwrite: NULL,
|
||||
bError ? &seterror : NULL, &tv );
|
||||
}
|
||||
|
||||
pArray = hb_param( 1, HB_IT_ARRAY );
|
||||
if( pArray && ISBYREF( 1 ) )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
pItem = hb_itemNew( NULL );
|
||||
hb_arrayNew( pItem, ulLen );
|
||||
ulCount = 0;
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
if( FD_ISSET( socket, &setread ) )
|
||||
{
|
||||
hb_arraySetForward( pItem, ++ulCount, hb_itemPutSocket( NULL, socket ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
hb_itemParamStoreForward( 1, pItem );
|
||||
}
|
||||
|
||||
pArray = hb_param( 2, HB_IT_ARRAY );
|
||||
if( pArray && ISBYREF( 2 ) )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
pItem = hb_itemNew( NULL );
|
||||
hb_arrayNew( pItem, ulLen );
|
||||
ulCount = 0;
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
if( FD_ISSET( socket, &setwrite ) )
|
||||
{
|
||||
hb_arraySetForward( pItem, ++ulCount, hb_itemPutSocket( NULL, socket ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
hb_itemParamStoreForward( 2, pItem );
|
||||
}
|
||||
|
||||
pArray = hb_param( 3, HB_IT_ARRAY );
|
||||
if( pArray && ISBYREF( 3 ) )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
pItem = hb_itemNew( NULL );
|
||||
hb_arrayNew( pItem, ulLen );
|
||||
ulCount = 0;
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
if( FD_ISSET( socket, &seterror ) )
|
||||
{
|
||||
hb_arraySetForward( pItem, ++ulCount, hb_itemPutSocket( NULL, socket ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
hb_itemParamStoreForward( 3, pItem );
|
||||
}
|
||||
|
||||
hb_retni( iRet );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_GETSOCKNAME )
|
||||
{
|
||||
struct sockaddr saddr;
|
||||
int iSize = sizeof( struct sockaddr );
|
||||
|
||||
hb_retni( getsockname( hb_parsocket( 1 ), &saddr, &iSize ) );
|
||||
if( ISBYREF( 2 ) )
|
||||
{
|
||||
hb_itemParamStoreForward( 2, hb_itemPutSockaddr( NULL, &saddr ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_GETPEERNAME )
|
||||
{
|
||||
struct sockaddr saddr;
|
||||
int iSize = sizeof( struct sockaddr );
|
||||
|
||||
hb_retni( getpeername( hb_parsocket( 1 ), &saddr, &iSize ) );
|
||||
if( ISBYREF( 2 ) )
|
||||
{
|
||||
hb_itemParamStoreForward( 2, hb_itemPutSockaddr( NULL, &saddr ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( CONNECT )
|
||||
{
|
||||
struct sockaddr sa;
|
||||
|
||||
hb_itemGetSockaddr( hb_param( 2, HB_IT_ANY ), &sa );
|
||||
hb_retni( connect( hb_parsocket( 1 ), &sa, sizeof( struct sockaddr ) ) );
|
||||
}
|
||||
|
||||
#include <windows.h>
|
||||
#include "hbapi.h"
|
||||
#include "hbapiitm.h"
|
||||
|
||||
/*
|
||||
|
||||
Function naming:
|
||||
The intention of this library is to be as close as possible to the original
|
||||
socket implementation. This supposed to be valid for function names also,
|
||||
but some of the names are very platform dependent, ex., WSA*() functions.
|
||||
select() function name is reserved for standard Harbour's function, so,
|
||||
socket_*() prefix was used:
|
||||
socket_init() - WSAStartup()
|
||||
socket_exit() - WSACleanup()
|
||||
socket_error() - WSALastError()
|
||||
socket_select() - select()
|
||||
Finally I renamed all functions to have socket_*() prefix to be more "prefix
|
||||
compatible" and not to occupy a general function names like send(), bind(),
|
||||
accept(), listen(), etc.:
|
||||
socket_create() - socket()
|
||||
socket_close() - closesocket()
|
||||
socket_shutdown() - shutdown()
|
||||
socket_bind() - bind()
|
||||
socket_listen() - listen()
|
||||
socket_accept() - accept()
|
||||
socket_send() - send()
|
||||
socket_recv() - recv()
|
||||
socket_recv() - recv()
|
||||
socket_getsockname() - getsockname()
|
||||
socket_getpeername() - getpeername()
|
||||
|
||||
|
||||
Types mapping:
|
||||
SOCKET
|
||||
UINT_PTR in Windows, let's map it to pointer type, and INVALID_SOCKET value to NIL
|
||||
|
||||
struct sockaddr
|
||||
It is not only IP addresses, also can be IPX, etc. All network-host byte order
|
||||
conversion should be hidden from Harbour API. So, let's map to:
|
||||
{ adress_familly, ... }
|
||||
AF_INET: { AF_INET, cAddr, nPort }
|
||||
other: { AF_?, cAddressDump }
|
||||
*/
|
||||
|
||||
#ifdef hb_parnidef
|
||||
#undef hb_parnidef
|
||||
#endif
|
||||
|
||||
|
||||
static int hb_parnidef( int iParam, int iValue )
|
||||
{
|
||||
return ISNUM( iParam ) ? hb_parni( iParam ) : iValue;
|
||||
}
|
||||
|
||||
|
||||
static SOCKET hb_parsocket( int iParam )
|
||||
{
|
||||
return ISPOINTER( iParam ) ? ( SOCKET ) hb_parptr( 1 ) : INVALID_SOCKET;
|
||||
}
|
||||
|
||||
|
||||
static void hb_retsocket( SOCKET hSocket )
|
||||
{
|
||||
if( hSocket == INVALID_SOCKET )
|
||||
hb_ret();
|
||||
else
|
||||
hb_retptr( ( void* ) hSocket );
|
||||
}
|
||||
|
||||
|
||||
static SOCKET hb_itemGetSocket( PHB_ITEM pItem )
|
||||
{
|
||||
return HB_IS_POINTER( pItem ) ? ( SOCKET ) hb_itemGetPtr( pItem ) : INVALID_SOCKET;
|
||||
}
|
||||
|
||||
|
||||
static PHB_ITEM hb_itemPutSocket( PHB_ITEM pItem, SOCKET hSocket )
|
||||
{
|
||||
if( ! pItem )
|
||||
pItem = hb_itemNew( NULL );
|
||||
|
||||
if( hSocket == INVALID_SOCKET )
|
||||
hb_itemClear( pItem );
|
||||
else
|
||||
hb_itemPutPtr( pItem, ( void* ) hSocket );
|
||||
|
||||
return pItem;
|
||||
}
|
||||
|
||||
|
||||
static void hb_itemGetSockaddr( PHB_ITEM pItem, struct sockaddr* sa )
|
||||
{
|
||||
memset( sa, 0, sizeof( struct sockaddr ) );
|
||||
|
||||
if( HB_IS_ARRAY( pItem ) )
|
||||
{
|
||||
sa->sa_family = hb_arrayGetNI( pItem, 1 );
|
||||
|
||||
if( sa->sa_family == AF_INET )
|
||||
{
|
||||
( ( struct sockaddr_in* ) sa)->sin_addr.S_un.S_addr = inet_addr( hb_arrayGetCPtr( pItem, 2 ) );
|
||||
( ( struct sockaddr_in* ) sa)->sin_port = htons( hb_arrayGetNI( pItem, 3 ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
ULONG ulLen = hb_arrayGetCLen( pItem, 2 );
|
||||
|
||||
if( ulLen > sizeof( sa->sa_data ) )
|
||||
ulLen = sizeof( sa->sa_data );
|
||||
memcpy( sa->sa_data, hb_arrayGetCPtr( pItem, 2 ), ulLen );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static PHB_ITEM hb_itemPutSockaddr( PHB_ITEM pItem, const struct sockaddr* saddr )
|
||||
{
|
||||
pItem = hb_itemNew( pItem );
|
||||
|
||||
if( saddr->sa_family == AF_INET )
|
||||
{
|
||||
hb_arrayNew( pItem, 3 );
|
||||
hb_arraySetNI( pItem, 1, saddr->sa_family );
|
||||
hb_arraySetC( pItem, 2, inet_ntoa( ( ( struct sockaddr_in* ) saddr )->sin_addr ) );
|
||||
hb_arraySetNI( pItem, 3, ntohs( ( ( struct sockaddr_in* ) saddr )->sin_port ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_arrayNew( pItem, 2 );
|
||||
hb_arraySetNI( pItem, 1, saddr->sa_family );
|
||||
hb_arraySetCL( pItem, 2, saddr->sa_data, sizeof( saddr->sa_data ) );
|
||||
}
|
||||
return pItem;
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_INIT )
|
||||
{
|
||||
WSADATA wsad;
|
||||
|
||||
hb_retni( WSAStartup( hb_parnidef( 1, 257 ), &wsad ) );
|
||||
hb_storclen( (char*) &wsad, sizeof( WSADATA ), 2 );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_EXIT )
|
||||
{
|
||||
hb_retni( WSACleanup() );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_ERROR )
|
||||
{
|
||||
hb_retni( WSAGetLastError() );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_CREATE )
|
||||
{
|
||||
hb_retsocket( socket( hb_parnidef( 1, PF_INET ),
|
||||
hb_parnidef( 2, SOCK_STREAM ),
|
||||
hb_parnidef( 3, IPPROTO_TCP ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_CLOSE )
|
||||
{
|
||||
hb_retni( closesocket( hb_parsocket( 1 ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_BIND )
|
||||
{
|
||||
struct sockaddr sa;
|
||||
|
||||
hb_itemGetSockaddr( hb_param( 2, HB_IT_ANY ), &sa );
|
||||
hb_retni( bind( hb_parsocket( 1 ), &sa, sizeof( struct sockaddr ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_LISTEN )
|
||||
{
|
||||
hb_retni( listen( hb_parsocket( 1 ), hb_parnidef( 2, 10 ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_ACCEPT )
|
||||
{
|
||||
struct sockaddr saddr;
|
||||
int iSize = sizeof( struct sockaddr );
|
||||
|
||||
hb_retsocket( accept( hb_parsocket( 1 ), &saddr, &iSize ) );
|
||||
|
||||
if( ISBYREF( 2 ) )
|
||||
{
|
||||
hb_itemParamStoreForward( 2, hb_itemPutSockaddr( NULL, &saddr ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_SHUTDOWN )
|
||||
{
|
||||
hb_retni( shutdown( hb_parsocket( 1 ), hb_parnidef( 2, SD_BOTH ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_RECV )
|
||||
{
|
||||
int iLen, iRet;
|
||||
char* pBuf;
|
||||
|
||||
iLen = hb_parni( 3 );
|
||||
|
||||
if( iLen > 65536 || iLen <= 0 )
|
||||
iLen = 4096;
|
||||
|
||||
pBuf = ( char* ) hb_xgrab( ( ULONG ) iLen );
|
||||
iRet = recv( hb_parsocket( 1 ), pBuf, iLen, hb_parnidef( 4, 0 ) );
|
||||
hb_retni( iRet );
|
||||
hb_storclen( pBuf, iRet > 0 ? iRet : 0, 2 );
|
||||
hb_xfree( pBuf );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_SEND )
|
||||
{
|
||||
hb_retni( send( hb_parsocket( 1 ), hb_parc( 2 ), hb_parclen( 2 ), hb_parni( 3, 0 ) ) );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_SELECT )
|
||||
{
|
||||
fd_set setread, setwrite, seterror;
|
||||
BOOL bRead = 0, bWrite = 0, bError = 0;
|
||||
struct timeval tv;
|
||||
SOCKET socket, maxsocket;
|
||||
PHB_ITEM pArray, pItem;
|
||||
ULONG ulLen, ulIndex, ulCount;
|
||||
LONG lTimeout;
|
||||
int iRet;
|
||||
|
||||
|
||||
FD_ZERO( &setread );
|
||||
FD_ZERO( &setwrite );
|
||||
FD_ZERO( &seterror );
|
||||
|
||||
maxsocket = (SOCKET) 0;
|
||||
|
||||
pArray = hb_param( 1, HB_IT_ARRAY );
|
||||
if( pArray )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
bRead = 1;
|
||||
FD_SET( socket, &setread );
|
||||
if( socket > maxsocket )
|
||||
maxsocket = socket;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pArray = hb_param( 2, HB_IT_ARRAY );
|
||||
if( pArray )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
bWrite = 1;
|
||||
FD_SET( socket, &setwrite );
|
||||
if( socket > maxsocket )
|
||||
maxsocket = socket;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pArray = hb_param( 3, HB_IT_ARRAY );
|
||||
if( pArray )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
bError = 1;
|
||||
FD_SET( socket, &seterror );
|
||||
if( socket > maxsocket )
|
||||
maxsocket = socket;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Default forever */
|
||||
lTimeout = ISNUM( 4 ) ? hb_parnl( 4 ) : -1;
|
||||
|
||||
if( lTimeout == -1 )
|
||||
{
|
||||
iRet = select( maxsocket + 1, bRead ? &setread : NULL, bWrite ? &setwrite: NULL,
|
||||
bError ? &seterror : NULL, NULL );
|
||||
}
|
||||
else
|
||||
{
|
||||
tv.tv_sec = lTimeout / 1000;
|
||||
tv.tv_usec = ( lTimeout % 1000 ) * 1000;
|
||||
iRet = select( maxsocket + 1, bRead ? &setread : NULL, bWrite ? &setwrite: NULL,
|
||||
bError ? &seterror : NULL, &tv );
|
||||
}
|
||||
|
||||
pArray = hb_param( 1, HB_IT_ARRAY );
|
||||
if( pArray && ISBYREF( 1 ) )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
pItem = hb_itemNew( NULL );
|
||||
hb_arrayNew( pItem, ulLen );
|
||||
ulCount = 0;
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
if( FD_ISSET( socket, &setread ) )
|
||||
{
|
||||
hb_arraySetForward( pItem, ++ulCount, hb_itemPutSocket( NULL, socket ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
hb_itemParamStoreForward( 1, pItem );
|
||||
}
|
||||
|
||||
pArray = hb_param( 2, HB_IT_ARRAY );
|
||||
if( pArray && ISBYREF( 2 ) )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
pItem = hb_itemNew( NULL );
|
||||
hb_arrayNew( pItem, ulLen );
|
||||
ulCount = 0;
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
if( FD_ISSET( socket, &setwrite ) )
|
||||
{
|
||||
hb_arraySetForward( pItem, ++ulCount, hb_itemPutSocket( NULL, socket ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
hb_itemParamStoreForward( 2, pItem );
|
||||
}
|
||||
|
||||
pArray = hb_param( 3, HB_IT_ARRAY );
|
||||
if( pArray && ISBYREF( 3 ) )
|
||||
{
|
||||
ulLen = hb_arrayLen( pArray );
|
||||
pItem = hb_itemNew( NULL );
|
||||
hb_arrayNew( pItem, ulLen );
|
||||
ulCount = 0;
|
||||
for( ulIndex = 1; ulIndex <= ulLen; ulIndex++ )
|
||||
{
|
||||
socket = hb_itemGetSocket( hb_arrayGetItemPtr( pArray, ulIndex ) );
|
||||
if( socket != INVALID_SOCKET )
|
||||
{
|
||||
if( FD_ISSET( socket, &seterror ) )
|
||||
{
|
||||
hb_arraySetForward( pItem, ++ulCount, hb_itemPutSocket( NULL, socket ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
hb_itemParamStoreForward( 3, pItem );
|
||||
}
|
||||
|
||||
hb_retni( iRet );
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_GETSOCKNAME )
|
||||
{
|
||||
struct sockaddr saddr;
|
||||
int iSize = sizeof( struct sockaddr );
|
||||
|
||||
hb_retni( getsockname( hb_parsocket( 1 ), &saddr, &iSize ) );
|
||||
if( ISBYREF( 2 ) )
|
||||
{
|
||||
hb_itemParamStoreForward( 2, hb_itemPutSockaddr( NULL, &saddr ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( SOCKET_GETPEERNAME )
|
||||
{
|
||||
struct sockaddr saddr;
|
||||
int iSize = sizeof( struct sockaddr );
|
||||
|
||||
hb_retni( getpeername( hb_parsocket( 1 ), &saddr, &iSize ) );
|
||||
if( ISBYREF( 2 ) )
|
||||
{
|
||||
hb_itemParamStoreForward( 2, hb_itemPutSockaddr( NULL, &saddr ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HB_FUNC ( CONNECT )
|
||||
{
|
||||
struct sockaddr sa;
|
||||
|
||||
hb_itemGetSockaddr( hb_param( 2, HB_IT_ANY ), &sa );
|
||||
hb_retni( connect( hb_parsocket( 1 ), &sa, sizeof( struct sockaddr ) ) );
|
||||
}
|
||||
|
||||
|
||||
@@ -1,35 +1,35 @@
|
||||
#
|
||||
# uHTTPD ini file (defaults are commented)
|
||||
#
|
||||
|
||||
# --- server listen port
|
||||
#Port = 8082
|
||||
|
||||
# --- document flags - $(APP_DIR) is application folder
|
||||
#document_root = $(APP_DIR)\home
|
||||
|
||||
# --- display folder content
|
||||
#show_indexes = .f.
|
||||
|
||||
[THREADS]
|
||||
# --- how much a thread has to wait a connection before quit
|
||||
#max_wait = 60
|
||||
|
||||
# --- how many threads have to run always
|
||||
#start_num = 4
|
||||
|
||||
# --- how many threads can be added to initial threads
|
||||
# (over this number server replies with BUSY error)
|
||||
#max_num = 20
|
||||
|
||||
[LOGFILES]
|
||||
# --- path for access lot
|
||||
#access = logs\access.log
|
||||
|
||||
# --- path for error log
|
||||
#error = logs\error.log
|
||||
|
||||
[ALIASES]
|
||||
# --- here put aliases to real path
|
||||
# (under document_root path defined above)
|
||||
/info = /cgi-bin/info.hrb
|
||||
#
|
||||
# uHTTPD ini file (defaults are commented)
|
||||
#
|
||||
|
||||
# --- server listen port
|
||||
#Port = 8082
|
||||
|
||||
# --- document flags - $(APP_DIR) is application folder
|
||||
#document_root = $(APP_DIR)\home
|
||||
|
||||
# --- display folder content
|
||||
#show_indexes = .f.
|
||||
|
||||
[THREADS]
|
||||
# --- how much a thread has to wait a connection before quit
|
||||
#max_wait = 60
|
||||
|
||||
# --- how many threads have to run always
|
||||
#start_num = 4
|
||||
|
||||
# --- how many threads can be added to initial threads
|
||||
# (over this number server replies with BUSY error)
|
||||
#max_num = 20
|
||||
|
||||
[LOGFILES]
|
||||
# --- path for access lot
|
||||
#access = logs\access.log
|
||||
|
||||
# --- path for error log
|
||||
#error = logs\error.log
|
||||
|
||||
[ALIASES]
|
||||
# --- here put aliases to real path
|
||||
# (under document_root path defined above)
|
||||
/info = /cgi-bin/info.hrb
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
44
harbour/contrib/hbssl/Makefile
Normal file
44
harbour/contrib/hbssl/Makefile
Normal file
@@ -0,0 +1,44 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
ROOT = ../../
|
||||
|
||||
LIBNAME=hbssl
|
||||
|
||||
HB_INC_OPENSSL_OK =
|
||||
|
||||
ifneq ($(HB_ARCHITECTURE),dos)
|
||||
|
||||
ifeq ($(HB_INC_OPENSSL),)
|
||||
ifeq ($(HB_XBUILD),)
|
||||
HB_INC_OPENSSL = /usr/include
|
||||
endif
|
||||
endif
|
||||
|
||||
HB_INC_OPENSSL_OK += $(foreach d, $(HB_INC_OPENSSL), $(if $(wildcard $(d)/openssl/ssl.h),$(d),))
|
||||
|
||||
endif
|
||||
|
||||
ifneq ($(strip $(HB_INC_OPENSSL_OK)),)
|
||||
|
||||
C_USR += $(foreach d, $(HB_INC_OPENSSL_OK), -I$(d))
|
||||
|
||||
C_SOURCES=\
|
||||
ssl.c \
|
||||
sslctx.c \
|
||||
sslrand.c \
|
||||
|
||||
PRG_HEADERS=\
|
||||
hbssl.ch \
|
||||
|
||||
include $(TOP)$(ROOT)config/header.cf
|
||||
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
|
||||
include $(TOP)$(ROOT)config/lib.cf
|
||||
|
||||
install::
|
||||
$(INSTALL_RULE_HEADERS)
|
||||
|
||||
else
|
||||
include $(TOP)$(ROOT)config/none.cf
|
||||
endif
|
||||
18
harbour/contrib/hbssl/common.mak
Normal file
18
harbour/contrib/hbssl/common.mak
Normal file
@@ -0,0 +1,18 @@
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
LIBNAME = $(LIBPREF)hbssl
|
||||
|
||||
LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
|
||||
|
||||
PRG_HEADERS = \
|
||||
hbssl.ch \
|
||||
|
||||
LIB_OBJS = \
|
||||
$(OBJ_DIR)ssl$(OBJEXT) \
|
||||
$(OBJ_DIR)sslctx$(OBJEXT) \
|
||||
$(OBJ_DIR)sslrand$(OBJEXT) \
|
||||
|
||||
all: \
|
||||
$(LIB_PATH) \
|
||||
77
harbour/contrib/hbssl/hbssl.ch
Normal file
77
harbour/contrib/hbssl/hbssl.ch
Normal file
@@ -0,0 +1,77 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* OpenSSL API - Harbour header.
|
||||
*
|
||||
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef HBSSL_CH_
|
||||
#define HBSSL_CH_
|
||||
|
||||
/* NOTE: This file is also used by C code. */
|
||||
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV2 0
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV2_SERVER 1
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV2_CLIENT 2
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV3 3
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV3_SERVER 4
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV3_CLIENT 5
|
||||
#define HB_SSL_CTX_NEW_METHOD_TLSV1 6
|
||||
#define HB_SSL_CTX_NEW_METHOD_TLSV1_SERVER 7
|
||||
#define HB_SSL_CTX_NEW_METHOD_TLSV1_CLIENT 8
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV23 9
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV23_SERVER 10
|
||||
#define HB_SSL_CTX_NEW_METHOD_SSLV23_CLIENT 11
|
||||
|
||||
#define HB_SSLEAY_VERSION 0
|
||||
#define HB_SSLEAY_CFLAGS 1
|
||||
#define HB_SSLEAY_BUILT_ON 2
|
||||
#define HB_SSLEAY_PLATFORM 3
|
||||
#define HB_SSLEAY_DIR 4
|
||||
|
||||
#endif /* HBSSL_CH_ */
|
||||
66
harbour/contrib/hbssl/hbssl.h
Normal file
66
harbour/contrib/hbssl/hbssl.h
Normal file
@@ -0,0 +1,66 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* OpenSSL API - C header.
|
||||
*
|
||||
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef HBSSL_H_
|
||||
#define HBSSL_H_
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
#include "hbssl.ch"
|
||||
|
||||
extern void * hb_SSL_CTX_is( int iParam );
|
||||
extern SSL_CTX * hb_SSL_CTX_par( int iParam );
|
||||
|
||||
extern void * hb_SSL_is( int iParam );
|
||||
extern SSL * hb_SSL_par( int iParam );
|
||||
|
||||
#endif /* HBSSL_H_ */
|
||||
81
harbour/contrib/hbssl/make_b32.bat
Normal file
81
harbour/contrib/hbssl/make_b32.bat
Normal file
@@ -0,0 +1,81 @@
|
||||
@echo off
|
||||
rem
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
if not "%HB_INC_OPENSSL%%HB_DIR_OPENSSL%" == "" goto DIR_OK
|
||||
|
||||
echo ---------------------------------------------------------------
|
||||
echo IMPORTANT: You'll need the 'OpenSSL' package and this envvar
|
||||
echo to be set to successfully build this library:
|
||||
echo set HB_INC_OPENSSL=C:\openssl
|
||||
echo or
|
||||
echo set HB_DIR_OPENSSL=C:\openssl
|
||||
echo if you want to generate .lib for the .dll.
|
||||
echo ---------------------------------------------------------------
|
||||
goto POST_EXIT
|
||||
|
||||
:DIR_OK
|
||||
|
||||
if "%HB_INC_OPENSSL%" == "" set HB_INC_OPENSSL=%HB_DIR_OPENSSL%\inc32
|
||||
set CFLAGS=-I"%HB_INC_OPENSSL%"
|
||||
set _HB_DLL_NAME1=libeay32
|
||||
set _HB_DLL_NAME2=ssleay32
|
||||
if exist "%HB_DIR_OPENSSL%\out32dll\%_HB_DLL_NAME1%.dll" set _HB_DLL_DIR=%HB_DIR_OPENSSL%\out32dll
|
||||
if exist "%HB_DIR_OPENSSL%\dll\%_HB_DLL_NAME1%.dll" set _HB_DLL_DIR=%HB_DIR_OPENSSL%\dll
|
||||
if exist "%HB_DIR_OPENSSL%\%_HB_DLL_NAME1%.dll" set _HB_DLL_DIR=%HB_DIR_OPENSSL%
|
||||
|
||||
if not "%HB_DIR_OPENSSL%" == "" echo Using .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME1%.dll"
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
if "%HB_DIR_OPENSSL%" == "" goto POST_EXIT
|
||||
|
||||
set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
|
||||
if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
|
||||
set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
|
||||
if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib
|
||||
|
||||
if "%1" == "clean" goto POST_CLEAN
|
||||
if "%1" == "Clean" goto POST_CLEAN
|
||||
if "%1" == "CLEAN" goto POST_CLEAN
|
||||
if "%1" == "install" goto POST_INSTALL
|
||||
if "%1" == "Install" goto POST_INSTALL
|
||||
if "%1" == "INSTALL" goto POST_INSTALL
|
||||
|
||||
:POST_BUILD
|
||||
|
||||
implib -a ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME1%.dll" >> %_HB_MAKELOG%
|
||||
implib -a ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME2%.dll" >> %_HB_MAKELOG%
|
||||
goto POST_EXIT
|
||||
|
||||
:POST_CLEAN
|
||||
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib > nul
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.exp > nul
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib > nul
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib > nul
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.exp > nul
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib > nul
|
||||
goto POST_EXIT
|
||||
|
||||
:POST_INSTALL
|
||||
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib %_HB_LIB_INSTALL%
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib %_HB_LIB_INSTALL%
|
||||
goto POST_EXIT
|
||||
|
||||
:POST_EXIT
|
||||
|
||||
set CFLAGS=
|
||||
set _HB_DLL_NAME1=
|
||||
set _HB_DLL_NAME2=
|
||||
set _HB_DLL_DIR=
|
||||
set _HB_INSTALL_PREFIX=
|
||||
set _HB_LIB_INSTALL=
|
||||
24
harbour/contrib/hbssl/make_gcc.sh
Executable file
24
harbour/contrib/hbssl/make_gcc.sh
Executable file
@@ -0,0 +1,24 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
if [ "${HB_INC_OPENSSL}" = "" ]
|
||||
then
|
||||
echo "---------------------------------------------------------------"
|
||||
echo "IMPORTANT: You will need the 'OpenSSL' package installed and this"
|
||||
echo " envvar to be set to successfully build this library:"
|
||||
echo " export HB_INC_OPENSSL=C:/openssl/inc32"
|
||||
echo " or"
|
||||
echo " export HB_INC_OPENSSL=/usr/include"
|
||||
echo "---------------------------------------------------------------"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export CFLAGS=""
|
||||
for I in ${HB_INC_OPENSSL}; do
|
||||
CFLAGS="${CFLAGS} -I${I}"
|
||||
done
|
||||
../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
|
||||
unset CFLAGS
|
||||
82
harbour/contrib/hbssl/make_vc.bat
Normal file
82
harbour/contrib/hbssl/make_vc.bat
Normal file
@@ -0,0 +1,82 @@
|
||||
@echo off
|
||||
rem
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
if not "%HB_INC_OPENSSL%%HB_DIR_OPENSSL%" == "" goto DIR_OK
|
||||
|
||||
echo ---------------------------------------------------------------
|
||||
echo IMPORTANT: You'll need the 'OpenSSL' package and this envvar
|
||||
echo to be set to successfully build this library:
|
||||
echo set HB_INC_OPENSSL=C:\openssl
|
||||
echo or
|
||||
echo set HB_DIR_OPENSSL=C:\openssl
|
||||
echo if you want to generate .lib for the .dll.
|
||||
echo ---------------------------------------------------------------
|
||||
goto POST_EXIT
|
||||
|
||||
:DIR_OK
|
||||
|
||||
if "%HB_INC_OPENSSL%" == "" set HB_INC_OPENSSL=%HB_DIR_OPENSSL%\inc32
|
||||
set CFLAGS=-I"%HB_INC_OPENSSL%"
|
||||
set _HB_DLL_NAME1=libeay32
|
||||
set _HB_DLL_NAME2=ssleay32
|
||||
if exist "%HB_DIR_OPENSSL%\out32dll\%_HB_DLL_NAME1%.dll" set _HB_DLL_DIR=%HB_DIR_OPENSSL%\out32dll
|
||||
if exist "%HB_DIR_OPENSSL%\dll\%_HB_DLL_NAME1%.dll" set _HB_DLL_DIR=%HB_DIR_OPENSSL%\dll
|
||||
if exist "%HB_DIR_OPENSSL%\%_HB_DLL_NAME1%.dll" set _HB_DLL_DIR=%HB_DIR_OPENSSL%
|
||||
|
||||
if not "%HB_DIR_OPENSSL%" == "" echo Using .dll: "%_HB_DLL_DIR%\%_HB_DLL_NAME1%.dll"
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
||||
rem ---------------------------------------------------------------
|
||||
|
||||
if "%HB_DIR_OPENSSL%" == "" goto POST_EXIT
|
||||
|
||||
set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
|
||||
if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
|
||||
set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
|
||||
if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib
|
||||
|
||||
if "%1" == "clean" goto POST_CLEAN
|
||||
if "%1" == "Clean" goto POST_CLEAN
|
||||
if "%1" == "CLEAN" goto POST_CLEAN
|
||||
if "%1" == "install" goto POST_INSTALL
|
||||
if "%1" == "Install" goto POST_INSTALL
|
||||
if "%1" == "INSTALL" goto POST_INSTALL
|
||||
|
||||
:POST_BUILD
|
||||
|
||||
rem Use supplied .lib file.
|
||||
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME1%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib > nul
|
||||
if not exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib copy "%_HB_DLL_DIR%\%_HB_DLL_NAME2%.lib" ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib > nul
|
||||
goto POST_EXIT
|
||||
|
||||
:POST_CLEAN
|
||||
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib > nul
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.exp > nul
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib > nul
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib > nul
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.exp del ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.exp > nul
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib > nul
|
||||
goto POST_EXIT
|
||||
|
||||
:POST_INSTALL
|
||||
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME1%.lib
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME1%.lib %_HB_LIB_INSTALL%
|
||||
if exist %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib del %_HB_LIB_INSTALL%\%_HB_DLL_NAME2%.lib
|
||||
if exist ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib copy ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME2%.lib %_HB_LIB_INSTALL%
|
||||
goto POST_EXIT
|
||||
|
||||
:POST_EXIT
|
||||
|
||||
set CFLAGS=
|
||||
set _HB_DLL_NAME1=
|
||||
set _HB_DLL_NAME2=
|
||||
set _HB_DLL_DIR=
|
||||
set _HB_INSTALL_PREFIX=
|
||||
set _HB_LIB_INSTALL=
|
||||
440
harbour/contrib/hbssl/ssl.c
Normal file
440
harbour/contrib/hbssl/ssl.c
Normal file
@@ -0,0 +1,440 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* OpenSSL API (SSL) - Harbour interface.
|
||||
*
|
||||
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
|
||||
* www - http://www.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. 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 "hbapi.h"
|
||||
#include "hbapierr.h"
|
||||
#include "hbapiitm.h"
|
||||
|
||||
#include "hbssl.h"
|
||||
|
||||
static HB_GARBAGE_FUNC( SSL_release )
|
||||
{
|
||||
void ** ph = ( void ** ) Cargo;
|
||||
|
||||
/* Check if pointer is not NULL to avoid multiple freeing */
|
||||
if( ph && * ph )
|
||||
{
|
||||
/* Destroy the object */
|
||||
SSL_free( ( SSL * ) * ph );
|
||||
|
||||
/* set pointer to NULL just in case */
|
||||
* ph = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void * hb_SSL_is( int iParam )
|
||||
{
|
||||
return hb_parptrGC( SSL_release, iParam );
|
||||
}
|
||||
|
||||
SSL * hb_SSL_par( int iParam )
|
||||
{
|
||||
void ** ph = ( void ** ) hb_parptrGC( SSL_release, iParam );
|
||||
|
||||
return ph ? ( SSL * ) * ph : NULL;
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_NEW )
|
||||
{
|
||||
if( hb_SSL_CTX_is( 1 ) )
|
||||
{
|
||||
SSL_CTX * ctx = hb_SSL_CTX_par( 1 );
|
||||
|
||||
if( ctx )
|
||||
{
|
||||
void ** ph = ( void ** ) hb_gcAlloc( sizeof( SSL * ), SSL_release );
|
||||
|
||||
SSL * ssl = SSL_new( ctx );
|
||||
|
||||
* ph = ( void * ) ssl;
|
||||
|
||||
hb_retptrGC( ph );
|
||||
}
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_DUP )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl_par = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl_par )
|
||||
{
|
||||
void ** ph = ( void ** ) hb_gcAlloc( sizeof( SSL * ), SSL_release );
|
||||
|
||||
SSL * ssl = SSL_dup( ssl_par );
|
||||
|
||||
* ph = ( void * ) ssl;
|
||||
|
||||
hb_retptrGC( ph );
|
||||
}
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_ACCEPT )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_accept( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CLEAR )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
SSL_clear( ssl );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_STATE )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_state( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_PENDING )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_pending( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CONNECT )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_connect( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_SHUTDOWN )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_shutdown( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_VERSION )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_version( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_GET_VERSION )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retc( SSL_get_version( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_GET_CIPHER )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retc_const( SSL_get_cipher( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_DO_HANDSHAKE )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_do_handshake( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_RENEGOTIATE )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_renegotiate( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_SET_FD )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_set_fd( ssl, hb_parni( 2 ) ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_WANT )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_want( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_WANT_NOTHING )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_want_nothing( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_WANT_X509_LOOKUP )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_want_x509_lookup( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_WANT_READ )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_want_read( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_READ )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
{
|
||||
PHB_ITEM pBuffer = hb_param( 2, HB_IT_STRING );
|
||||
int nRead;
|
||||
|
||||
if( pBuffer && ISBYREF( 2 ) && ISNUM( 3 ) )
|
||||
{
|
||||
nRead = hb_parni( 3 );
|
||||
|
||||
if( ( ULONG ) nRead <= hb_parcsiz( 2 ) )
|
||||
{
|
||||
pBuffer = hb_itemUnShareString( pBuffer );
|
||||
|
||||
nRead = SSL_read( ssl, ( void * ) hb_itemGetCPtr( pBuffer ), nRead );
|
||||
}
|
||||
else
|
||||
nRead = 0;
|
||||
}
|
||||
else
|
||||
nRead = 0;
|
||||
|
||||
hb_retni( nRead );
|
||||
}
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_PEEK )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
{
|
||||
PHB_ITEM pBuffer = hb_param( 2, HB_IT_STRING );
|
||||
int nRead;
|
||||
|
||||
if( pBuffer && ISBYREF( 2 ) && ISNUM( 3 ) )
|
||||
{
|
||||
nRead = hb_parni( 3 );
|
||||
|
||||
if( ( ULONG ) nRead <= hb_parcsiz( 2 ) )
|
||||
{
|
||||
pBuffer = hb_itemUnShareString( pBuffer );
|
||||
|
||||
nRead = SSL_peek( ssl, ( void * ) hb_itemGetCPtr( pBuffer ), nRead );
|
||||
}
|
||||
else
|
||||
nRead = 0;
|
||||
}
|
||||
else
|
||||
nRead = 0;
|
||||
|
||||
hb_retni( nRead );
|
||||
}
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_WANT_WRITE )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
hb_retni( SSL_want_write( ssl ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_WRITE )
|
||||
{
|
||||
if( hb_SSL_is( 1 ) )
|
||||
{
|
||||
SSL * ssl = hb_SSL_par( 1 );
|
||||
|
||||
if( ssl )
|
||||
{
|
||||
PHB_ITEM pBuffer = hb_param( 2, HB_IT_STRING );
|
||||
ULONG nLen = hb_itemGetCLen( pBuffer );
|
||||
|
||||
if( ISNUM( 3 ) )
|
||||
{
|
||||
ULONG nWrite = ( ULONG ) hb_parnl( 3 );
|
||||
if( nWrite < nLen )
|
||||
nLen = nWrite;
|
||||
}
|
||||
|
||||
hb_retni( SSL_read( ssl, ( void * ) hb_itemGetCPtr( pBuffer ), ( int ) nLen ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
193
harbour/contrib/hbssl/sslctx.c
Normal file
193
harbour/contrib/hbssl/sslctx.c
Normal file
@@ -0,0 +1,193 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* OpenSSL API (SSL_CTX) - Harbour interface.
|
||||
*
|
||||
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
|
||||
* www - http://www.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. 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 "hbapi.h"
|
||||
#include "hbapierr.h"
|
||||
|
||||
#include "hbssl.h"
|
||||
|
||||
HB_FUNC( SSL_INIT )
|
||||
{
|
||||
SSL_load_error_strings();
|
||||
SSL_library_init();
|
||||
}
|
||||
|
||||
HB_FUNC( SSLEAY_VERSION )
|
||||
{
|
||||
int value = hb_parni( 1 );
|
||||
|
||||
switch( value )
|
||||
{
|
||||
case HB_SSLEAY_VERSION : value = SSLEAY_VERSION; break;
|
||||
case HB_SSLEAY_CFLAGS : value = SSLEAY_CFLAGS; break;
|
||||
case HB_SSLEAY_BUILT_ON : value = SSLEAY_BUILT_ON; break;
|
||||
case HB_SSLEAY_PLATFORM : value = SSLEAY_PLATFORM; break;
|
||||
case HB_SSLEAY_DIR : value = SSLEAY_DIR; break;
|
||||
}
|
||||
|
||||
hb_retc_const( SSLeay_version( value ) );
|
||||
}
|
||||
|
||||
static HB_GARBAGE_FUNC( SSL_CTX_release )
|
||||
{
|
||||
void ** ph = ( void ** ) Cargo;
|
||||
|
||||
/* Check if pointer is not NULL to avoid multiple freeing */
|
||||
if( ph && * ph )
|
||||
{
|
||||
/* Destroy the object */
|
||||
SSL_CTX_free( ( SSL_CTX * ) * ph );
|
||||
|
||||
/* set pointer to NULL just in case */
|
||||
* ph = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void * hb_SSL_CTX_is( int iParam )
|
||||
{
|
||||
return hb_parptrGC( SSL_CTX_release, iParam );
|
||||
}
|
||||
|
||||
SSL_CTX * hb_SSL_CTX_par( int iParam )
|
||||
{
|
||||
void ** ph = ( void ** ) hb_parptrGC( SSL_CTX_release, iParam );
|
||||
|
||||
return ph ? ( SSL_CTX * ) * ph : NULL;
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CTX_NEW )
|
||||
{
|
||||
void ** ph = ( void ** ) hb_gcAlloc( sizeof( SSL_CTX * ), SSL_CTX_release );
|
||||
|
||||
SSL_CTX * ctx;
|
||||
SSL_METHOD * method;
|
||||
|
||||
switch( hb_parni( 1 ) )
|
||||
{
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV2 : method = SSLv2_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV2_SERVER : method = SSLv2_server_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV2_CLIENT : method = SSLv2_client_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV3 : method = SSLv3_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV3_SERVER : method = SSLv3_server_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV3_CLIENT : method = SSLv3_client_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_TLSV1 : method = TLSv1_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_TLSV1_SERVER : method = TLSv1_server_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_TLSV1_CLIENT : method = TLSv1_client_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV23 : method = SSLv23_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV23_SERVER : method = SSLv23_server_method(); break;
|
||||
case HB_SSL_CTX_NEW_METHOD_SSLV23_CLIENT : method = SSLv23_client_method(); break;
|
||||
default : method = SSLv23_method();
|
||||
}
|
||||
|
||||
ctx = SSL_CTX_new( method );
|
||||
|
||||
* ph = ( void * ) ctx;
|
||||
|
||||
hb_retptrGC( ph );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CTX_FLUSH_SESSIONS )
|
||||
{
|
||||
if( hb_SSL_CTX_is( 1 ) )
|
||||
{
|
||||
SSL_CTX * ctx = hb_SSL_CTX_par( 1 );
|
||||
|
||||
if( ctx )
|
||||
SSL_CTX_flush_sessions( ctx, hb_parnl( 2 ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CTX_GET_TIMEOUT )
|
||||
{
|
||||
if( hb_SSL_CTX_is( 1 ) )
|
||||
{
|
||||
SSL_CTX * ctx = hb_SSL_CTX_par( 1 );
|
||||
|
||||
if( ctx )
|
||||
hb_retnl( SSL_CTX_get_timeout( ctx ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CTX_SET_TIMEOUT )
|
||||
{
|
||||
if( hb_SSL_CTX_is( 1 ) )
|
||||
{
|
||||
SSL_CTX * ctx = hb_SSL_CTX_par( 1 );
|
||||
|
||||
if( ctx )
|
||||
SSL_CTX_set_timeout( ctx, hb_parnl( 2 ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_CTX_SET_CIPHER_LIST )
|
||||
{
|
||||
if( hb_SSL_CTX_is( 1 ) )
|
||||
{
|
||||
SSL_CTX * ctx = hb_SSL_CTX_par( 1 );
|
||||
|
||||
if( ctx )
|
||||
SSL_CTX_set_cipher_list( ctx, hb_parcx( 2 ) );
|
||||
}
|
||||
else
|
||||
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
||||
}
|
||||
|
||||
/*
|
||||
X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
|
||||
void SSL_CTX_set_cert_store(SSL_CTX *,X509_STORE *);
|
||||
*/
|
||||
89
harbour/contrib/hbssl/sslrand.c
Normal file
89
harbour/contrib/hbssl/sslrand.c
Normal file
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* OpenSSL API (RAND) - Harbour interface.
|
||||
*
|
||||
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
|
||||
* www - http://www.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. 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
|
||||
#include "hbapi.h"
|
||||
#include "hbapierr.h"
|
||||
|
||||
#include <openssl/rand.h>
|
||||
|
||||
HB_FUNC( SSL_RAND_SEED )
|
||||
{
|
||||
RAND_seed( hb_parcx( 1 ), hb_parclen( 1 ) );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_RAND_ADD )
|
||||
{
|
||||
RAND_add( hb_parcx( 1 ), hb_parclen( 1 ), hb_parnd( 2 ) );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_RAND_STATUS )
|
||||
{
|
||||
hb_retni( RAND_status() );
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_RAND_EVENT )
|
||||
{
|
||||
#if defined( HB_OS_WIN_32 )
|
||||
hb_retni( RAND_event( hb_parni( 1 ), ( WPARAM ) hb_parnint( 2 ), ( LPARAM ) hb_parnint( 3 ) ) );
|
||||
#else
|
||||
hb_retni( 0 );
|
||||
#endif
|
||||
}
|
||||
|
||||
HB_FUNC( SSL_RAND_SCREEN )
|
||||
{
|
||||
#if defined( HB_OS_WIN_32 )
|
||||
RAND_screen();
|
||||
#endif
|
||||
}
|
||||
14
harbour/contrib/hbssl/tests/hbmk_b32.bat
Normal file
14
harbour/contrib/hbssl/tests/hbmk_b32.bat
Normal file
@@ -0,0 +1,14 @@
|
||||
@echo off
|
||||
rem
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin
|
||||
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib
|
||||
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
|
||||
|
||||
set HB_ARCHITECTURE=w32
|
||||
set HB_COMPILER=bcc32
|
||||
set HB_USER_LIBS=hbssl.lib libeay32.lib ssleay32.lib
|
||||
|
||||
call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
14
harbour/contrib/hbssl/tests/hbmk_vc.bat
Normal file
14
harbour/contrib/hbssl/tests/hbmk_vc.bat
Normal file
@@ -0,0 +1,14 @@
|
||||
@echo off
|
||||
rem
|
||||
rem $Id$
|
||||
rem
|
||||
|
||||
if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin
|
||||
if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib
|
||||
if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
|
||||
|
||||
set HB_ARCHITECTURE=w32
|
||||
set HB_COMPILER=msvc
|
||||
set HB_USER_LIBS=hbssl.lib libeay32.lib ssleay32.lib
|
||||
|
||||
call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
37
harbour/contrib/hbssl/tests/test.prg
Normal file
37
harbour/contrib/hbssl/tests/test.prg
Normal file
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
|
||||
* www - http://www.harbour-project.org
|
||||
*/
|
||||
|
||||
#include "hbssl.ch"
|
||||
|
||||
PROCEDURE Main()
|
||||
LOCAL ssl_ctx
|
||||
LOCAL ssl
|
||||
|
||||
SSL_INIT()
|
||||
|
||||
? SSLEAY_VERSION()
|
||||
? SSLEAY_VERSION( HB_SSLEAY_VERSION )
|
||||
? SSLEAY_VERSION( HB_SSLEAY_CFLAGS )
|
||||
? SSLEAY_VERSION( HB_SSLEAY_BUILT_ON )
|
||||
? SSLEAY_VERSION( HB_SSLEAY_PLATFORM )
|
||||
? SSLEAY_VERSION( HB_SSLEAY_DIR )
|
||||
|
||||
SSL_RAND_seed( "some entropy" )
|
||||
|
||||
ssl_ctx := SSL_CTX_NEW()
|
||||
|
||||
? ssl_ctx
|
||||
|
||||
ssl := SSL_NEW( ssl_ctx )
|
||||
|
||||
? ssl
|
||||
? SSL_VERSION( ssl )
|
||||
? SSL_GET_VERSION( ssl )
|
||||
|
||||
RETURN
|
||||
@@ -61,6 +61,7 @@ if not "%HB_INC_GD%%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd
|
||||
if not "%HB_INC_LIBHARU%%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
|
||||
if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
|
||||
if not "%HB_INC_PGSQL%%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
|
||||
if not "%HB_INC_OPENSSL%%HB_DIR_OPENSSL%" == "" set _HB_DIRS=%_HB_DIRS% hbssl
|
||||
if not "%HB_INC_ADS%%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads
|
||||
if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% rddsql
|
||||
:OVERRIDE
|
||||
|
||||
@@ -59,6 +59,7 @@ else
|
||||
if [ "${HB_INC_LIBHARU}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbhpdf" ; fi;
|
||||
if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql" ; fi;
|
||||
if [ "${HB_INC_PGSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql" ; fi;
|
||||
if [ "${HB_INC_OPENSSL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbssl" ; fi;
|
||||
if [ "${HB_INC_ADS}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddads" ; fi;
|
||||
if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddsql" ; fi;
|
||||
fi
|
||||
|
||||
@@ -61,6 +61,7 @@ if not "%HB_INC_GD%%HB_DIR_GD%" == "" set _HB_DIRS=%_HB_DIRS% hbgd
|
||||
if not "%HB_INC_LIBHARU%%HB_DIR_LIBHARU%" == "" set _HB_DIRS=%_HB_DIRS% hbhpdf
|
||||
if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbmysql
|
||||
if not "%HB_INC_PGSQL%%HB_DIR_PGSQL%" == "" set _HB_DIRS=%_HB_DIRS% hbpgsql
|
||||
if not "%HB_INC_OPENSSL%%HB_DIR_OPENSSL%" == "" set _HB_DIRS=%_HB_DIRS% hbssl
|
||||
if not "%HB_INC_ADS%%HB_DIR_ADS%" == "" set _HB_DIRS=%_HB_DIRS% rddads
|
||||
if not "%HB_INC_MYSQL%%HB_DIR_MYSQL%" == "" set _HB_DIRS=%_HB_DIRS% rddsql
|
||||
:OVERRIDE
|
||||
|
||||
Reference in New Issue
Block a user