X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/6cb6b7ede2d178e03fa817bc28474c175f5a93b9..94dd0df9f67acf39e8e85e44ade8021a98c417a1:/lcore.pas

diff --git a/lcore.pas b/lcore.pas
index 30e9c09..99e6339 100755
--- a/lcore.pas
+++ b/lcore.pas
@@ -35,7 +35,14 @@ interface
 
 
   const
-    receivebufsize=1460;
+    {how this number is made up:
+    - ethernet: MTU 1500
+    - be safe for either "ethernet v1" or "PPPoE", both take 8 bytes
+    - IPv6 header: 40 bytes (IPv4 is 20)
+    - TCP/UDP header: 20 bytes
+    }
+    packetbasesize = 1432;
+    receivebufsize=packetbasesize*8;
 
   var
     absoloutemaxs:integer=0;
@@ -99,6 +106,7 @@ interface
       onfdwrite           : procedure (Sender: TObject; Error: word) of object; //added for bewarehttpd
       lasterror:integer;
       destroying:boolean;
+      recvbufsize:integer;
       function receivestr:string; virtual;
       procedure close;
       procedure abort;
@@ -120,7 +128,7 @@ interface
 
       //procedure messageloop;
       function Receive(Buf:Pointer;BufSize:integer):integer; virtual;
-      procedure flush;virtual;{$ifdef win32} abstract;{$endif}
+      procedure flush;virtual;
       procedure dodatasent(wparam,lparam:longint);
       procedure doreceiveloop(wparam,lparam:longint);
       procedure sinkdata(sender:tobject;error:word);
@@ -489,7 +497,7 @@ var
 begin
   if state <> wsconnected then exit;
 
-  lensent := sendq.get(data,2920);
+  lensent := sendq.get(data,packetbasesize*2);
   if assigned(data) then result := myfdwrite(fdhandleout,data^,lensent) else result := 0;
 
   if result = -1 then lensent := 0 else lensent := result;
@@ -552,6 +560,7 @@ procedure tlasio.handlefdtrigger(readtrigger,writetrigger:boolean);
 var
   sendflushresult : integer;
   tempbuf:array[0..receivebufsize-1] of byte;
+  a:integer;
 begin
   if (state=wsconnected) and writetrigger then begin
     //writeln('write trigger');
@@ -578,7 +587,9 @@ begin
   writtenthiscycle := false;
   if (state =wsconnected) and readtrigger then begin
     if recvq.size=0 then begin
-      numread := myfdread(fdhandlein,tempbuf,sizeof(tempbuf));
+      a := recvbufsize;
+      if (a <= 0) or (a > sizeof(tempbuf)) then a := sizeof(tempbuf);
+      numread := myfdread(fdhandlein,tempbuf,a);
       if (numread=0) and (not mustrefreshfds) then begin
         {if i remember correctly numread=0 is caused by eof
         if this isn't dealt with then you get a cpu eating infinite loop
@@ -613,19 +624,20 @@ begin
   end;
 end;
 
-{$ifndef win32}
-  procedure tlasio.flush;
-  var
-    fds : fdset;
-  begin
-    fd_zero(fds);
-    fd_set(fdhandleout,fds);
-    while sendq.size>0 do begin
-      select(fdhandleout+1,nil,@fds,nil,nil);
-      if sendflush <= 0 then exit;
-    end;
-  end;
+procedure tlasio.flush;
+{$ifdef win32}
+type fdset = tfdset;
 {$endif}
+var
+  fds : fdset;
+begin
+  fd_zero(fds);
+  fd_set(fdhandleout,fds);
+  while sendq.size>0 do begin
+    select(fdhandleout+1,nil,@fds,nil,nil);
+    if sendflush <= 0 then exit;
+  end;
+end;
 
 procedure tlasio.dodatasent(wparam,lparam:longint);
 begin