Changeset 13 for trunk/SunriseChatNetworkCoreUnit.pas

Timestamp:

Feb 11, 2008, 2:14:42 PM (16 years ago)

Author:

george

Message:

Opraveno: Načítání seznamu síťových adaptérů na Linuxu.
Přidáno: Úpravy pro potřeby ladění problému s nepřijímáním UDP paketů.

File:

• trunk/SunriseChatNetworkCoreUnit.pas (modified) (6 diffs)

trunk/SunriseChatNetworkCoreUnit.pas

@@ -80 +80 @@
 
 uses
-  IpHlpApi, IpTypes;
+  IpHlpApi, IpTypes, Dialogs, UProtocolMessageLog;
 
 procedure Register;
@@ -137 +137 @@
   if Sender.Socket.InBufferSize > 0 then begin
     Data := Sender.Socket.ReadAvailable;
+    ProtocolMessageLogForm.Memo1.Lines.Add('TCPClientDataAvailable: ' + Data);
     if Pos(#13, Data) > 0 then begin
       repeat
@@ -151 +152 @@
 var
   Text: string;
+  I: Integer;
 begin
   if Sender.Socket.InBufferSize > 0 then begin
     Text := Sender.Socket.ReadAvailable;
+    for I := 0 to fndTCPServer1.ClientCount - 1 do
+      fndTCPServer1.Client[I].Socket.SendStr(Text);
+    ProtocolMessageLogForm.Memo1.Lines.Add('TCPServerDataAvailable: ' + Text);
     if BroadcastType = btGlobal then
       fndUDPClientSocket1.Broadcast(IntToStr(UDPPort), Text) else
@@ -166 +171 @@
   Address : TSockAddr;
   I: Integer;
-  LocalIPs: TInAddrArray;
-begin
+begin
+  ProtocolMessageLogForm.Memo1.Lines.Add('UDBClientDataAvailable: ' + Text);
   if FConnected then begin
     Sender.ReadPacket(Text, Address);
-    for I := 0 to fndTCPServer1.ClientCount-1 do
+    for I := 0 to fndTCPServer1.ClientCount - 1 do
       with fndTCPServer1.Client[I] do Socket.SendStr(Text);
   end;
@@ -192 +197 @@
 var
   I, II: Integer;
-  Status: Cardinal;
   AdaptersList : array of IP_ADAPTER_INFO;
   BufSize: Cardinal;
@@ -218 +222 @@
     // Windows NT/2000/XP/Vista
     BufSize := 0;
-    Status := GetAdaptersInfo(@AdaptersList[0], BufSize);
+    GetAdaptersInfo(@AdaptersList[0], BufSize);
     SetLength(AdaptersList, BufSize div SizeOf(IP_ADAPTER_INFO));
-    Status := GetAdaptersInfo(@AdaptersList[0], BufSize);
+    GetAdaptersInfo(@AdaptersList[0], BufSize);
     for I := 0 to High(AdaptersList) do with AdaptersList[I] do begin
-      NewNetworkInterface := TNetworkInterface.Create(Self);
-      with NewNetworkInterface do begin
-        IPAddress := IpAddressList.IPAddress.S;
-        SubNetMask := IpAddressList.IPMask.s;
-        GUID := AdapterName;
-        Name := Description;
-        SubnetParts := Explode('.', SubNetMask);
-        IPParts := Explode('.', IPAddress);
-        for II := 0 to 3 do
-          IPParts[II] := IntToStr(StrToInt(IPParts[II]) or (StrToInt(SubnetParts[II]) xor $ff));
-        BroadcastIPAddress := IPParts[0]+'.'+IPParts[1]+'.'+IPParts[2]+'.'+IPParts[3];
+      if IpAddressList.IPAddress.S <> '' then begin
+        NewNetworkInterface := TNetworkInterface.Create(Self);
+        with NewNetworkInterface do begin
+          IPAddress := IpAddressList.IPAddress.S;
+          SubNetMask := IpAddressList.IPMask.s;
+          GUID := AdapterName;
+          Name := Description;
+          if Name = '' then Name := 'Network adapter ' + IntToStr(I);
+          SubnetParts := Explode('.', SubNetMask);
+          IPParts := Explode('.', IPAddress);
+          for II := 0 to 3 do
+            IPParts[II] := IntToStr(StrToInt(IPParts[II]) or (StrToInt(SubnetParts[II]) xor $ff));
+          BroadcastIPAddress := IPParts[0]+'.'+IPParts[1]+'.'+IPParts[2]+'.'+IPParts[3];
+        end;
+        NetworkInterfaces.Add(NewNetworkInterface);
       end;
-      NetworkInterfaces.Add(NewNetworkInterface);
     end;
   end else begin