Use zero port instead of Get_Free_Port in tests

* regtests/0024_tcom/tcom.adb
  regtests/0062_smtp_2/smtp_2.adb
  regtests/0116_test_hotplug/test_hotplug.adb
  regtests/0128_test_soap_hotplug/test_soap_hotplug.adb:
Use zero port instead of Get_Free_Port.

* regtests/common/get_free_port.adb:
Source file removed.

* src/extended/aws-communication-server.ad[sb]
(Start): Port parameter is Natural now to be able to set zero.
(Port): New routine.

* src/extended/aws-server-hotplug.ad[sb] (Activate):
Access parameter Bound_Port to get bound port on activation.

* src/extended/aws-smtp.ad[sb] (Initialize):
Port parameter is Natural to be able to put zero value.

* src/extended/aws-smtp-server.ad[sb] (Port):
New routine to get mail server bound port.

Author: anisimkov

regtests/0024_tcom/tcom.adb

@@ -32,8 +32,6 @@ with AWS.Parameters;
 with AWS.Messages;
 with AWS.Utils;
 
-with Get_Free_Port;
-
 procedure Tcom is
 
    use Ada;
@@ -47,8 +45,6 @@ procedure Tcom is
 
    type Context_Access is access all Context;
 
-   Free_Port : Positive := 1254;
-
    function Callback
      (Server     : String;
       Name       : String;
@@ -105,24 +101,21 @@ procedure Tcom is
    LH : constant String := Net.Localhost (Net.IPv6_Available);
 
 begin
-   Get_Free_Port (Free_Port);
-
-   Com_Server.Start
-     (Context => C'Access, Host => LH, Port => Free_Port);
+   Com_Server.Start (Context => C'Access, Host => LH, Port => 0);
 
-   R := Communication.Client.Send_Message (LH, Free_Port, "zero");
+   R := Communication.Client.Send_Message (LH, Com_Server.Port, "zero");
 
    Put_Line ("R1 : " & Response.Message_Body (R));
    New_Line;
 
    R := Communication.Client.Send_Message
-     (LH, Free_Port, "one", (1 => +"first"));
+     (LH, Com_Server.Port, "one", (1 => +"first"));
 
    Put_Line ("R2 : " & Response.Message_Body (R));
    New_Line;
 
    R := Communication.Client.Send_Message
-     (LH, Free_Port, "two", (+"first", +"second"));
+     (LH, Com_Server.Port, "two", (+"first", +"second"));
 
    Put_Line ("R3 : " & Response.Message_Body (R));
    New_Line;

regtests/0062_smtp_2/smtp_2.adb

@@ -29,8 +29,6 @@ with AWS.SMTP.Server;
 
 with SMTP_Pck;
 
-with Get_Free_Port;
-
 procedure SMTP_2 is
 
    use Ada;
@@ -41,7 +39,6 @@ procedure SMTP_2 is
    From_Email : constant String := "[email protected]";
    Filename   : constant String := "ada.gif";
 
-   Port   : Positive := 9025;
    Family : Net.Family_Type;
    Host   : SMTP.Receiver;
    Server : SMTP.Server.Handle;
@@ -51,20 +48,24 @@ procedure SMTP_2 is
    EOL    : constant String := ASCII.CR & ASCII.LF;
 
 begin
-   Get_Free_Port (Port);
-
    if Net.IPv6_Available then
       Family := Net.Family_Inet6;
    else
       Family := Net.Family_Inet;
    end if;
 
    Host := SMTP.Initialize
-             (Net.Localhost (Net.IPv6_Available), Port,
+             (Net.Localhost (Net.IPv6_Available), 0,
               AWS.Net.SSL.Is_Supported, Family => Family, Timeout => 1.0);
 
    SMTP.Server.Start (Server, Host, SMTP_Pck.Dump_Mail'Access);
 
+   --  Recreate Host with port defined
+
+   Host := SMTP.Initialize
+     (Net.Localhost (Net.IPv6_Available), SMTP.Server.Port (Server),
+      AWS.Net.SSL.Is_Supported, Family => Family, Timeout => 1.0);
+
    --  Send simple message
 
    Text_IO.Put_Line ("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 1");

regtests/0116_test_hotplug/test_hotplug.adb

@@ -30,7 +30,6 @@ with AWS.Server.Status;
 with AWS.Utils;
 
 with Hotplug_Pack;
-with Get_Free_Port;
 
 procedure Test_Hotplug is
 
@@ -43,8 +42,8 @@ procedure Test_Hotplug is
    procedure Request (URI : String);
    --  Request URI resource to main server, output result
 
-   Hotplug_Port : Natural := 1235;
-   Com_Port     : Natural := 2222;
+
+   Com_Port : aliased Positive;
 
    -------------
    -- Request --
@@ -64,24 +63,12 @@ procedure Test_Hotplug is
    CFG : Config.Object;
    R   : Response.Data;
 
+   function Hotplug_Port return Positive is
+     (AWS.Server.Status.Port (WS));
+
 begin
    Text_IO.Put_Line ("Starting main server...");
 
-   Get_Free_Port (Hotplug_Port);
-   Get_Free_Port (Com_Port);
-
-   --  Write access file
-
-   declare
-      F : Text_IO.File_Type;
-   begin
-      Text_IO.Create (F, Text_IO.Out_File, "hotplug_access.ini");
-      Text_IO.Put_Line
-        (F, "hp_test:f8de61f1f97df3613fbe29b031eb52c6:" & Localhost & ':'
-         & Utils.Image (Hotplug_Port));
-      Text_IO.Close (F);
-   end;
-
    Config.Set.Server_Name    (CFG, "Main");
    Config.Set.Admin_URI      (CFG, "/Admin-Page");
    Config.Set.Server_Host    (CFG, Localhost);
@@ -90,10 +77,6 @@ begin
 
    Server.Start (Hotplug_Pack.Main_Server, Hotplug_Pack.Main'Access, CFG);
 
-   Server.Hotplug.Activate
-     (Hotplug_Pack.Main_Server'Access, Com_Port, "hotplug_access.ini",
-      Host => Localhost);
-
    --  Send some requests
 
    Request ("MkHuoi");
@@ -103,10 +86,26 @@ begin
    --  Start hotplug now
 
    Config.Set.Server_Name    (CFG, "Hotplug");
-   Config.Set.Server_Port    (CFG, Hotplug_Port);
+   Config.Set.Server_Port    (CFG, 0);
 
    Server.Start (WS, Hotplug_Pack.Hotplug'Access, CFG);
 
+   --  Write access file
+
+   declare
+      F : Text_IO.File_Type;
+   begin
+      Text_IO.Create (F, Text_IO.Out_File, "hotplug_access.ini");
+      Text_IO.Put_Line
+        (F, "hp_test:f8de61f1f97df3613fbe29b031eb52c6:" & Localhost & ':'
+         & Utils.Image (Hotplug_Port));
+      Text_IO.Close (F);
+   end;
+
+   Server.Hotplug.Activate
+     (Hotplug_Pack.Main_Server'Access, 0, "hotplug_access.ini",
+      Host => Localhost, Bound_Port => Com_Port'Access);
+
    R := Client.Hotplug.Register
           ("hp_test", Hotplug_Pack.Password,
            "http://" & Localhost & ':' & Utils.Image (Com_Port),

regtests/0128_test_soap_hotplug/test_soap_hotplug.adb

@@ -32,7 +32,6 @@ with AWS.Utils;
 with SOAP_Hotplug_Pack;
 with SOAP_Hotplug_CB;
 with SOAP_Hotplug_Pack_Service.Client;
-with Get_Free_Port;
 
 procedure Test_SOAP_Hotplug is
 
@@ -47,8 +46,7 @@ procedure Test_SOAP_Hotplug is
 
    Localhost    : constant String := "127.0.0.1";
    HTTP_Local   : constant String := "http://" & Localhost & ':';
-   Hotplug_Port : Natural := 1135;
-   Com_Port     : Natural := 2122;
+   Com_Port     : aliased Positive;
 
    -------------
    -- Request --
@@ -71,24 +69,12 @@ procedure Test_SOAP_Hotplug is
    R  : Response.Data;
    CF : Config.Object;
 
+   function Hotplug_Port return Positive is
+     (AWS.Server.Status.Port (WS));
+
 begin
    Text_IO.Put_Line ("Starting main server...");
 
-   Get_Free_Port (Hotplug_Port);
-   Get_Free_Port (Com_Port);
-
-   --  Write access file
-
-   declare
-      F : Text_IO.File_Type;
-   begin
-      Text_IO.Create (F, Text_IO.Out_File, "hotplug_access.ini");
-      Text_IO.Put_Line
-        (F, "hp_test:f8de61f1f97df3613fbe29b031eb52c6:" & Localhost & ':'
-         & Utils.Image (Hotplug_Port));
-      Text_IO.Close (F);
-   end;
-
    Config.Set.Server_Name    (CF, "Main");
    Config.Set.Admin_URI      (CF, "/Admin-Page");
    Config.Set.Server_Host    (CF, Localhost);
@@ -97,10 +83,6 @@ begin
 
    Server.Start (SOAP_Hotplug_CB.Main_Server, SOAP_Hotplug_CB.Main'Access, CF);
 
-   Server.Hotplug.Activate
-     (SOAP_Hotplug_CB.Main_Server'Access, Com_Port, "hotplug_access.ini",
-      Host => Localhost);
-
    --  Send some requests
 
    Request (3, 7);
@@ -109,10 +91,26 @@ begin
    --  Start hotplug now
 
    Config.Set.Server_Name    (CF, "Hotplug");
-   Config.Set.Server_Port    (CF, Hotplug_Port);
+   Config.Set.Server_Port    (CF, 0);
 
    Server.Start (WS, SOAP_Hotplug_CB.Hotplug'Access, CF);
 
+   --  Write access file
+
+   declare
+      F : Text_IO.File_Type;
+   begin
+      Text_IO.Create (F, Text_IO.Out_File, "hotplug_access.ini");
+      Text_IO.Put_Line
+        (F, "hp_test:f8de61f1f97df3613fbe29b031eb52c6:" & Localhost & ':'
+         & Utils.Image (Hotplug_Port));
+      Text_IO.Close (F);
+   end;
+
+   Server.Hotplug.Activate
+     (SOAP_Hotplug_CB.Main_Server'Access, 0, "hotplug_access.ini",
+      Host => Localhost, Bound_Port => Com_Port'Access);
+
    R := Client.Hotplug.Register
           ("hp_test", SOAP_Hotplug_CB.Password,
            HTTP_Local & Utils.Image (Com_Port), Filter,

regtests/common/get_free_port.adb

@@ -32,7 +32,7 @@ with Ada.Unchecked_Conversion;
 with AWS.Config.Set;
 with AWS.Messages;
 with AWS.Parameters;
-with AWS.Server;
+with AWS.Server.Status;
 with AWS.Status;
 with AWS.Utils;
 
@@ -60,6 +60,15 @@ package body AWS.Communication.Server is
    function Receive (Request : Status.Data) return Response.Data;
    --  Handle communication server message
 
+   ----------
+   -- Port --
+   ----------
+
+   function Port return Positive is
+   begin
+      return AWS.Server.Status.Port (Com_Server);
+   end Port;
+
    -------------
    -- Receive --
    -------------
@@ -125,7 +134,7 @@ package body AWS.Communication.Server is
    -----------
 
    procedure Start
-     (Port : Positive; Context : T_Access; Host : String := "")
+     (Port : Natural; Context : T_Access; Host : String := "")
    is
       CB  : constant Internal_Callback := Receive'Access;
       CNF : Config.Object;

src/extended/aws-communication-server.adb

@@ -48,8 +48,13 @@ package AWS.Communication.Server is
    --  parameter. This communication server must be started with the Start
    --  procedure and can be stopped with the procedure Shutdown below.
 
-   procedure Start (Port : Positive; Context : T_Access; Host : String := "");
+   procedure Start (Port : Natural; Context : T_Access; Host : String := "");
    --  Start communication HTTP server listening at the given port
+   --  If Port is zero, server started at any free port and it can be taken by
+   --  the Port call.
+
+   function Port return Positive;
+   --  Get the port where the server is binded
 
    procedure Shutdown;
    --  Shutdown the communication HTTP server

src/extended/aws-communication-server.ads

@@ -100,10 +100,11 @@ package body AWS.Server.Hotplug is
 
    procedure Activate
      (Web_Server         : not null access HTTP;
-      Port               : Positive;
+      Port               : Natural;
       Authorization_File : String;
       Register_Mode      : AWS.Hotplug.Register_Mode := AWS.Hotplug.Add;
-      Host               : String                    := "")
+      Host               : String                    := "";
+      Bound_Port         : access Positive           := null)
    is
       use Ada.Characters.Handling;
 
@@ -121,6 +122,11 @@ package body AWS.Server.Hotplug is
       N      : Natural := 0;
    begin
       Hotplug_Server.Start (Port, HTTP_Access (Web_Server), Host => Host);
+
+      if Bound_Port /= null then
+         Bound_Port.all := Hotplug_Server.Port;
+      end if;
+
       AWS.Hotplug.Set_Mode (Web_Server.Filters, Register_Mode);
 
       Text_IO.Open (File, Text_IO.In_File, Authorization_File);

src/extended/aws-server-hotplug.adb

@@ -52,14 +52,18 @@ package AWS.Server.Hotplug is
 
    procedure Activate
      (Web_Server         : not null access HTTP;
-      Port               : Positive;
+      Port               : Natural;
       Authorization_File : String;
       Register_Mode      : AWS.Hotplug.Register_Mode := AWS.Hotplug.Add;
-      Host               : String                    := "");
+      Host               : String                    := "";
+      Bound_Port         : access Positive           := null);
    --  Start hotplug server listening at the specified Port for the Web_Server.
    --  Only client modules listed in the authorization file will be able to
    --  connect to this server. For better securite the host of redictection
    --  must also be specified.
+   --  If Port is zero then the hotplug will be bound on any free port. The
+   --  Bound_Port access parameter should be defined in this case and bound
+   --  port will be written there.
 
    procedure Shutdown;
    --  Shutdown hotplug server