paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-04 07:34:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Some improvements from yang jixian (bug ID 30270)

Browse Source 
git-svn-id: trunk@34486 -
This commit is contained in:
michael 2016-09-10 17:21:43 +00:00
parent ee40c7618c
commit 8ef43da4ee
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
utils/fppkg/lnet/lnet.pp
View File

@ -157,7 +157,7 @@ type
property SocketState: TLSocketStates read FSocketState;
property Creator: TLComponent read FCreator;
property Session: TLSession read FSession;
Property MsgBufferSize : Integer Read FMsgBufferSize Write FMsgBufferSize;
Property MsgBufferSize: Integer Read FMsgBufferSize Write FMsgBufferSize;
end;
TLSocketClass = class of TLSocket;
@ -350,6 +350,7 @@ type
FSocketNet: Integer;
FCount: Integer;
FReuseAddress: Boolean;
FMsgBufferSize: integer;
function InitSocket(aSocket: TLSocket): TLSocket; override;
function GetConnected: Boolean; override;
@ -393,6 +394,7 @@ type
property OnConnect: TLSocketEvent read FOnConnect write FOnConnect;
property ReuseAddress: Boolean read FReuseAddress write SetReuseAddress;
property SocketNet: Integer read FSocketNet write SetSocketNet;
property MsgBufferSize: integer read FMsgBufferSize write FMsgBufferSize;
end;
{ TLSession }
@ -648,13 +650,16 @@ begin
Result := DoGet(aData, aSize);
if Result = 0 then
begin
FConnectionStatus := scNone;
if FSocketType = SOCK_STREAM then
Disconnect(True)
else begin
Bail('Receive Error [0 on recvfrom with UDP]', 0);
Exit(0);
end;
end;
Result := HandleResult(Result, soReceive);
end;
end;
@ -801,7 +806,10 @@ end;
function TLSocket.GetPeerPort: Word;
begin
Result := ntohs(FPeerAddress.IPv4.sin_port);
if FSocketType = SOCK_STREAM then
Result := ntohs(FAddress.IPv4.sin_port)
else
Result := ntohs(FPeerAddress.IPv4.sin_port);
end;
function TLSocket.Listen(const APort: Word; const AIntf: string = LADDR_ANY): Boolean;
@ -1345,6 +1353,7 @@ begin
FRootSock := InitSocket(SocketClass.Create);
FRootSock.SetReuseAddress(FReuseAddress);
FRootSock.MsgBufferSize:= MsgBufferSize;
if FRootSock.Listen(APort, AIntf) then begin
FRootSock.SetState(ssServerSocket);
FRootSock.FConnectionStatus := scConnected;
@ -1418,6 +1427,8 @@ end;
procedure TLTcp.Disconnect(const Forced: Boolean = True);
begin
if Assigned(FOnDisconnect) then
FOnDisconnect(FRootSock);
FreeSocks(Forced);
FRootSock := nil;
FCount := 0;