* added setsocketoptions + pulled it through source beautifier

docs/sockex/serverex.pp

@@ -38,6 +38,8 @@ Program Socket_Comms_Test;
  bcampbel@omen.net.au
   ***************************************************************************}
 
+{$mode ObjFPC}
+
 Uses Linux, Sockets, Sysutils{, dbu};
 
 Const
@@ -53,7 +55,7 @@ Type	ConnectionType = Record
 
 
 Var
-	Connection : Array[1..NumberofConnections] of ConnectionType;
+ Connection : Array[1..NumberofConnections] Of ConnectionType;
  FDS        : FDSet;
  S          : LongInt;
  PortNumber : Word;
@@ -62,41 +64,43 @@ Var
  Command    : String;
 
 Procedure ZeroConnection;
+
 Var Loop : Integer;
 Begin
-For Loop := 1 to NumberOfConnections do
+ For Loop := 1 To NumberOfConnections Do
-Connection[Loop].Connected := False;
+  Connection[Loop].Connected := False;
 End;
 
 
 Function FreeConnections : Integer;
+
 Var Loop : Integer;
-	Result : Integer;
+
 Begin
-Result := 0;
+ Result := 0;
-For Loop := 1 to NumberOfConnections do
+ For Loop := 1 To NumberOfConnections Do
-If Not Connection[Loop].Connected then Result := Result + 1;
+  If Not Connection[Loop].Connected Then Inc(Result);
-FreeConnections := Result;
+ FreeConnections := Result;
 End;
 
 Function GetFreeConnection : Integer;
+
 Var Loop : Integer;
-	Result : Integer;
    Found : Boolean;
 Begin
-Result := 0;
+ Result := 0;
-Loop := 1;
+ Loop := 1;
-Found := False;
+ Found := False;
-While (Loop < NumberOfConnections + 1) and (Not Found) do
+ While (Loop < NumberOfConnections + 1) and (Not Found) Do
-Begin
+ Begin
-	If Not Connection[Loop].Connected then 
+  If Not Connection[Loop].Connected Then
    Begin
     Found := True;
     Result := Loop;
    End;
-	Loop := Loop + 1;
+  Inc(Loop);
-GetFreeConnection := Result;
+  GetFreeConnection := Result;
-End;
+ End;
 End;
 
 Procedure PError(S : String);
@@ -134,148 +138,161 @@ Begin
 End;
 
 Procedure WelcomeHandle(Handle, ConnNum : Integer);
+
 Var Buffer : String;
  Sent : Integer;
 Begin
-Buffer := 'Welcome to Brads Server 1.0'+#10+#13+'You Are Connection '+
+ Buffer := 'Welcome to Brads Server 1.0'+#10+#13+'You Are Connection '+
-InttoStr(ConnNum)+' Of '+InttoStr(NumberofConnections)+
+           InttoStr(ConnNum)+' Of '+InttoStr(NumberofConnections)+
-', With '+InttoStr(FreeConnections)+' Connections Free'#13+#10;
+           ', With '+InttoStr(FreeConnections)+' Connections Free'#13+#10;
-Sent := Send(Handle,Buffer[1],Length(Buffer),0);
+ Sent := Send(Handle,Buffer[1],Length(Buffer),0);
-If Sent <> Length(Buffer) then PDebug('Wanted to Send : '
+ If Sent <> Length(Buffer) Then
-+InttoStr(Length(Buffer))+' Sent Only : '+InttoStr(Sent)+
+  PDebug('Wanted to Send : ' +InttoStr(Length(Buffer))+' Sent Only : '
-' to Connection : '+InttoStr(ConnNum));
+          +InttoStr(Sent)+' to Connection : '+InttoStr(ConnNum));
 End;
 
 Procedure AcceptNewConnection;
+
 Var ConnectionNumber : Integer;
     Handle           : LongInt;
     FromAddrSize     : LongInt;
     FromAddr         : TInetSockAddr;
 
 Begin
-FromAddrSize := Sizeof(FromAddr);
+ FromAddrSize := Sizeof(FromAddr);
-If FreeConnections > 0 then Begin
+ If FreeConnections > 0 Then
-ConnectionNumber := GetFreeConnection;
+  Begin
-PDebug('Accepting New Connection Number : '+InttoStr(ConnectionNumber));
+   ConnectionNumber := GetFreeConnection;
-Handle := Accept(S,FromAddr,FromAddrSize);
+   PDebug('Accepting New Connection Number : '+InttoStr(ConnectionNumber));
-If Handle < 0 then PError('Accept Error!!');
+   Handle := Accept(S,FromAddr,FromAddrSize);
-PDebug('Accepted From : '+SockAddrtoString(FromAddr.Addr)+' Port : '
+   If Handle < 0 Then PError('Accept Error!!');
-+Inttostr(Swap(FromAddr.Port)));
+   PDebug('Accepted From : '+SockAddrtoString(FromAddr.Addr)+' Port : '
-Connection[ConnectionNumber].Handle := Handle;
+   +Inttostr(Swap(FromAddr.Port)));
-Connection[ConnectionNumber].IP := FromAddr.Addr;
+   Connection[ConnectionNumber].Handle := Handle;
-Connection[ConnectionNumber].Port := FromAddr.Port;
+   Connection[ConnectionNumber].IP := FromAddr.Addr;
-Connection[ConnectionNumber].Connected := True;
+   Connection[ConnectionNumber].Port := FromAddr.Port;
-Connection[ConnectionNumber].IdleTimer := 0;
+   Connection[ConnectionNumber].Connected := True;
-WelcomeHandle(Handle,ConnectionNumber);
+   Connection[ConnectionNumber].IdleTimer := 0;
-End;
+   WelcomeHandle(Handle,ConnectionNumber);
+  End;
 End;
 
 Procedure SetUpSocket;
+
 Var
  SockAddr : TInetSockAddr;
+ yes  : longint;
 
 Begin
-SockAddr.Family := AF_INET;
+ SockAddr.Family := AF_INET;
-SockAddr.Port := Swap(PortNumber);
+ SockAddr.Port := Swap(PortNumber);
-SockAddr.Addr := 0;
+ SockAddr.Addr := 0;
-S := Socket(AF_INET,SOCK_STREAM,0);
+ S := Socket(AF_INET,SOCK_STREAM,0);
-If SocketError <> 0 then PError('Socket Error : ');
+ If SocketError <> 0 Then PError('Socket Error : ');
-If not Bind(S,SockAddr,SizeOf(SockAddr)) then PError('Bind Error : ');
+ yes := $1010101;  {Copied this from existing code. Value is empiric,
-If not Listen(S,5) then PError('Listen Error : ');
+                    but works. (yes=true<>0) }
+ SetSocketOptions(s, SOL_SOCKET, SO_REUSEADDR,yes,sizeof(yes));
+ If Not Bind(S,SockAddr,SizeOf(SockAddr)) Then PError('Bind Error : ');
+ If Not Listen(S,5) Then PError('Listen Error : ');
 End;
 
 Procedure LoadConnectedFDS;
+
 Var Loop : Integer;
 Begin
-For Loop := 1 to NumberOfConnections Do
+ For Loop := 1 To NumberOfConnections Do
-If Connection[Loop].Connected then 
+  If Connection[Loop].Connected Then
    Begin
     FD_SET(Connection[Loop].Handle,FDS);
-	If Connection[Loop].Handle > GreatestHandle then
+    If Connection[Loop].Handle > GreatestHandle Then
      GreatestHandle := Connection[Loop].Handle;
    End;
 End;
 
-
 Procedure ServiceHandle(Handle, ConnectionNum : Integer);
+
 Var Buffer : String;
  Sent, BufferLength : Integer;
 
 Begin
-Writeln('Service Handle : ',Handle);
+ Writeln('Service Handle : ',Handle);
-BufferLength := Recv(Handle,Buffer[1],200,0);
+ BufferLength := Recv(Handle,Buffer[1],200,0);
-Setlength(Buffer,BufferLength);
+ Setlength(Buffer,BufferLength);
-If SocketError <> 0 then PDebug('Reciceved Socket Error : '
+ If SocketError <> 0 Then
-+InttoStr(SocketError)+' OnHandle '+InttoStr(Handle));
+  PDebug('Reciceved Socket Error : '
+  +InttoStr(SocketError)+' OnHandle '+InttoStr(Handle));
 
-If BufferLength = 0 then 	{It's EOF, Socket has been closed}
+ If BufferLength = 0 Then  {It's EOF, Socket has been closed}
-Begin
+  Begin
-PDebug('Socket Handle '+InttoStr(Handle)+' Closed');
+   PDebug('Socket Handle '+InttoStr(Handle)+' Closed');
-Connection[ConnectionNum].Connected := False;
+   Connection[ConnectionNum].Connected := False;
-Shutdown(Handle,2);
+   Shutdown(Handle,2);
-fdClose(Handle);
+   fdClose(Handle);
-End
+  End
 
-Else Begin
+ Else
-PDebug(InttoStr(BufferLength)+' Bytes Recieved');
+  Begin
-{Buffer := Db_Query(Buffer);}
+   PDebug(InttoStr(BufferLength)+' Bytes Recieved');
-Sent := Send(Handle,Buffer[1],Length(Buffer),0); 
+  {Buffer := Db_Query(Buffer);}
-If Sent <> Bufferlength then
+   Sent := Send(Handle,Buffer[1],Length(Buffer),0);
-PDebug('Wanted to Send : '+InttoStr(Length(Buffer))+' Only Sent : '+InttoStr(Sent));
+   If Sent <> Bufferlength Then
-End;
+    PDebug('Wanted to Send : '+InttoStr(Length(Buffer))+' Only Sent : '+InttoStr(Sent));
+  End;
 End;
 
 Procedure ServiceSockets;
+
 Var Loop : Integer;
 
 Begin
-For Loop := 1 to NumberOfConnections do
+ For Loop := 1 To NumberOfConnections Do
-If Connection[Loop].Connected then
+  If Connection[Loop].Connected Then
    If FD_ISSET(Connection[Loop].Handle,FDS) Then
     ServiceHandle(Connection[Loop].Handle,Loop);
 
-IF FD_ISSET(S,FDS) then AcceptNewConnection;
+ If FD_ISSET(S,FDS) Then AcceptNewConnection;
 End;
 
 Procedure CloseAllOpen;
+
 Var Loop : Integer;
 Begin
-For Loop := 1 to NumberOfConnections do
+ For Loop := 1 To NumberOfConnections Do
-Begin
+  Begin
-If Connection[Loop].Connected = True then
+   If Connection[Loop].Connected = True Then
-Begin
+    Begin
      Shutdown(Connection[Loop].Handle,1);
 { fdClose(Connection[Loop].Handle);}
  {Connection[Loop].Connected := False;}
-End;
+    End;
-End;
+  End;
 End;
 
-begin
-ZeroConnection;		{Clear Connected Array}
-Quit := False;
-PortNumber := 5000;
-SetupSocket;
-Repeat
-FD_ZERO(FDS);
-FD_SET(S,FDS); { Socket Looking for new connections }
-FD_SET(1,FDS); { Terminal }
-GreatestHandle := S;
-LoadConnectedFDS;
-If Select(GreatestHandle+1,@FDS,nil,nil,1000) > 0 then
 Begin
-ServiceSockets;
+ ZeroConnection;  {Clear Connected Array}
-If FD_ISSET(1,FDS) then 
+ Quit := False;
+ PortNumber := 5000;
+ SetupSocket;
+ Repeat
+  FD_ZERO(FDS);
+  FD_SET(S,FDS); { Socket Looking for new connections }
+  FD_SET(1,FDS); { Terminal }
+  GreatestHandle := S;
+  LoadConnectedFDS;
+  If Select(GreatestHandle+1,@FDS,Nil,Nil,1000) > 0 Then
+   Begin
+    ServiceSockets;
+    If FD_ISSET(1,FDS) Then
      Begin
       PDebug('Reading Console');
       Readln(Command);
-	If Command='quit' then quit := True;
+      If Command='quit' Then quit := True;
 {	Else Writeln(DB_Query(Command));}
       Command := '';
      End;
-End;
+   End;
 {DB_Tic;} {Updates Database Internals, Needs at Least 1 run per second}
-Until Quit = True;
+ Until Quit = True;
-CloseAllOpen;
+ CloseAllOpen;
 
 End.