+ Added resolve tests

fcl/tests/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/01/14]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/10/05]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -58,7 +58,7 @@ ifdef inUnix
 PATHSEP=/
 else
 PATHSEP:=$(subst /,\,/)
-ifdef inCygWin
+ifneq ($(findstring sh.exe,$(SHELL)),)
 PATHSEP=/
 endif
 endif
@@ -111,11 +111,38 @@ endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 ifndef FPC_VERSION
-FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
+FPC_VERSION:=$(shell $(FPC) -iV)
-FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
 endif
-export FPC FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION
 unexport CHECKDEPEND ALLDEPENDENCIES
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(word 1,$(COMPILERINFO))
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(word 2,$(COMPILERINFO))
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(word 3,$(COMPILERINFO))
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(word 4,$(COMPILERINFO))
+endif
+else
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(shell $(FPC) -iSP)
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(shell $(FPC) -iTP)
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(shell $(FPC) -iSO)
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(shell $(FPC) -iTO)
+endif
+endif
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
 CPU_TARGET=$(CPU_TARGET_DEFAULT)
@@ -126,24 +153,6 @@ ifdef OS_TARGET_DEFAULT
 OS_TARGET=$(OS_TARGET_DEFAULT)
 endif
 endif
-ifneq ($(words $(FPC_COMPILERINFO)),5)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
-endif
-ifndef CPU_SOURCE
-CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
-endif
-ifndef CPU_TARGET
-CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
-endif
-ifndef OS_TARGET
-OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
-endif
 FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -205,10 +214,10 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testcgi tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont
 ifeq ($(OS_TARGET),linux)
-override TARGET_PROGRAMS+=sockcli isockcli dsockcli socksvr isocksvr dsocksvr
+override TARGET_PROGRAMS+=sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre
 endif
 ifeq ($(OS_TARGET),win32)
-override TARGET_PROGRAMS+=showver testproc
+override TARGET_PROGRAMS+=showver testproc testhres testnres testsres testrhre testrnre testrsre
 endif
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2
@@ -555,15 +564,6 @@ FPCMADE=fpcmade.nw
 ZIPSUFFIX=nw
 EXEEXT=.nlm
 endif
-ifeq ($(OS_TARGET),macos)
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-FPCMADE=fpcmade.mcc
-endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -870,21 +870,6 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
-ifeq ($(OS_TARGET),palmos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-endif
-ifeq ($(OS_TARGET),macos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-endif
-ifeq ($(OS_TARGET),macosx)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -1131,11 +1116,6 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
-ifeq ($(OS_TARGET),linux)
-ifeq ($(FPC_VERSION),1.0.6)
-override FPCOPTDEF+=HASUNIX
-endif
-endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
 endif

fcl/tests/Makefile.fpc

@@ -7,8 +7,10 @@ programs=stringl dparser fstream mstream list threads testrtf \
          cfgtest xmldump htdump testcgi tidea \
          b64test b64test2 b64enc b64dec restest testz testz2 \
          istream doecho testol testcont
-programs_win32=showver testproc
+programs_win32=showver testproc testhres testnres testsres testrhre \
-programs_linux=sockcli isockcli dsockcli socksvr isocksvr dsocksvr
+               testrnre testrsre
+programs_linux=sockcli isockcli dsockcli socksvr isocksvr dsocksvr \
+               testhres testnres testsres testrhre testrnre testrsre
 rst=restest
 
 [require]

fcl/tests/README

@@ -46,3 +46,9 @@ dsockcli.pp  Dual socket server application. Tests ssockets.
 sstream.pp   Tests TStringStream object.
 testol.pp    Tests TObjectList in contnrs. (MVC)
 testcont.pp  Tests TStack/TQueue in contnrs. (MVC)
+testhres.pp  Test hostresolver in resolve
+testnres.pp  Test netresolver in resolve
+testsres.pp  Test serviceresolver in resolve
+testrhre.pp  Test reverse hostresolver in resolve
+testrnre.pp  Test reverse netresolver in resolve
+testrsre.pp  Test reverse serviceresolver in resolve

fcl/tests/testhres.pp

@@ -0,0 +1,38 @@
+{$mode objfpc}
+{$h+ }
+
+{ test host resolve }
+
+program testhostresolve;
+
+uses resolve;
+
+Var
+  I : integer;
+  S : String;
+  
+  
+begin
+  If (ParamCount>0) then
+    S:=Paramstr(1)
+  else
+    S:='www.freepascal.org';  
+  With THostResolver.Create(Nil) do
+    try
+      If Not NameLookup(S) then
+        Writeln('Lookup failed : ',LastError)
+      else
+        begin
+        Writeln('Name          : ',ResolvedName);
+        Writeln('Addres        : ',AddressAsString);
+        Writeln('Address count : ',AddressCount);
+        For I:=0 to AddressCount-1 do
+          Writeln('Adress ',I:2,'     : ',HostAddrToStr(Addresses[I]));
+        Writeln('Alias count   : ',AliasCount);
+        For I:=0 to AliasCount-1 do 
+          Writeln('Alias ',i:2,'  : ',Aliases[I]);
+        end;    
+    finally
+      Free;
+    end;
+end.

fcl/tests/testnres.pp

@@ -0,0 +1,40 @@
+{$mode objfpc}
+{$h+ }
+
+{ test network resolve }
+
+program testnres;
+
+uses resolve;
+
+Var
+  I : integer;
+  S : String;
+  
+  
+begin
+  If (ParamCount>0) then
+    S:=Paramstr(1)
+  else
+    S:='loopback';  
+  With TNetResolver.Create(Nil) do
+    try
+      If Not NameLookup(S) then
+        Writeln('Lookup failed : ',LastError)
+      else
+        begin
+        Writeln('Name          : ',ResolvedName);
+        Writeln('Addres        : ',AddressAsString);
+{
+        Writeln('Address count : ',);
+        For I:=0 to AddressCount-1 do
+          Writeln('Adress ',I:2,'     : ',HostAddrToStr(Addresses[I]));
+}
+        Writeln('Alias count   : ',AliasCount);
+        For I:=0 to AliasCount-1 do 
+          Writeln('Alias ',i:2,'  : ',Aliases[I]);
+        end;    
+    finally
+      Free;
+    end;
+end.

fcl/tests/testrhre.pp

@@ -0,0 +1,38 @@
+{$mode objfpc}
+{$h+ }
+
+{ test reverse host resolve }
+
+program testrhre;
+
+uses resolve,sysutils;
+
+Var
+  I : integer;
+  S : String;
+  
+  
+begin
+  If (ParamCount>0) then
+    S:=Paramstr(1)
+  else
+    S:='212.224.143.202';  
+  With THostResolver.Create(Nil) do
+    try
+      If Not AddressLookup(S) then
+        Writeln('Lookup failed : ',LastError)
+      else
+        begin
+        Writeln('Name          : ',ResolvedName);
+        Writeln('Addres        : ',AddressAsString);
+        Writeln('Address count : ',AddressCount);
+        For I:=0 to AddressCount-1 do
+          Writeln('Adress ',I:2,'     : ',HostAddrToStr(Addresses[I]));
+        Writeln('Alias count   : ',AliasCount);
+        For I:=0 to AliasCount-1 do 
+          Writeln('Alias ',i:2,'  : ',Aliases[I]);
+        end;    
+    finally
+       Free;
+    end;
+end.

fcl/tests/testrnre.pp

@@ -0,0 +1,35 @@
+{$mode objfpc}
+{$h+ }
+
+{ Test reverse net resolve }
+
+program testrnre;
+
+uses resolve;
+
+Var
+  I : integer;
+  S : String;
+  
+  
+begin
+  If (ParamCount>0) then
+    S:=Paramstr(1)
+  else
+    S:='127.0.0.0';  
+  With TNetResolver.Create(Nil) do
+    try
+      If Not AddressLookup(S) then
+        Writeln('Lookup failed : ',LastError)
+      else
+        begin
+        Writeln('Name          : ',ResolvedName);
+        Writeln('Addres        : ',AddressAsString);
+        Writeln('Alias count   : ',AliasCount);
+        For I:=0 to AliasCount-1 do 
+          Writeln('Alias ',i:2,'  : ',Aliases[I]);
+        end;    
+    finally
+      Free;
+    end;
+end.

fcl/tests/testrsre.pp

@@ -0,0 +1,41 @@
+{$mode objfpc}
+{$h+ }
+
+{ test reverse service resolve }
+
+program testrsre;
+
+uses sysutils,resolve;
+
+Var
+  I : integer;
+  S : longint; 
+  P : String;
+  
+  
+begin
+  If (ParamCount>0) then
+    S:=StrToIntDef(Paramstr(1),0)
+  else
+    S:=23;  
+  If (ParamCount>1) then
+    P:=Paramstr(2)
+  else
+    P:='';  
+  With TServiceResolver.Create(Nil) do
+    try
+      If Not PortLookup(S,P) then
+        Writeln('Lookup failed : ',LastError)
+      else
+        begin
+        Writeln('Name          : ',ResolvedName);
+        Writeln('Protocol      : ',Protocol);
+        Writeln('Port          : ',port);
+        Writeln('Aliases       : ',AliasCount);
+        For I:=0 to AliasCount-1 do 
+          Writeln('Alias ',i:2,'  : ',Aliases[I]);
+        end;    
+    finally
+      Free;
+    end;
+end.

fcl/tests/testsres.pp

@@ -0,0 +1,40 @@
+{$mode objfpc}
+{$h+ }
+
+{ test service resolve }
+
+program testsres;
+
+uses resolve;
+
+Var
+  I : integer;
+  S,P : String;
+  
+  
+begin
+  If (ParamCount>0) then
+    S:=Paramstr(1)
+  else
+    S:='telnet';  
+  If (ParamCount>1) then
+    P:=Paramstr(2)
+  else
+    P:='';  
+  With TServiceResolver.Create(Nil) do
+    try
+      If Not NameLookup(S,P) then
+        Writeln('Lookup failed : ',LastError)
+      else
+        begin
+        Writeln('Name          : ',ResolvedName);
+        Writeln('Protocol      : ',Protocol);
+        Writeln('Port          : ',port);
+        Writeln('Aliases       : ',AliasCount);
+        For I:=0 to AliasCount-1 do 
+          Writeln('Alias ',i:2,'  : ',Aliases[I]);
+        end;    
+    finally
+      Free;
+    end;
+end.