diff --git a/src/sbbs3/ctrl/ClientFormUnit.cpp b/src/sbbs3/ctrl/ClientFormUnit.cpp index 977bf0428b593b30f5620aa24d7306491a645c34..abab17f46015363edee9ce9b144e9c344150b779 100644 --- a/src/sbbs3/ctrl/ClientFormUnit.cpp +++ b/src/sbbs3/ctrl/ClientFormUnit.cpp @@ -41,6 +41,7 @@ #include <stdio.h> // sprintf #include <winsock.h> // closesocket #include "ClientFormUnit.h" +#include "sbbs.h" // filter_ip void socket_open(BOOL open); //--------------------------------------------------------------------------- @@ -118,6 +119,7 @@ void __fastcall TClientForm::FilterIpMenuItemClick(TObject *Sender) AnsiString prot = ListItem->SubItems->Strings[0]; AnsiString username = ListItem->SubItems->Strings[1]; AnsiString ip_addr = ListItem->SubItems->Strings[2]; + AnsiString hostname = ListItem->SubItems->Strings[3]; wsprintf(str,"Disallow future connections from %s" ,ip_addr); @@ -126,7 +128,8 @@ void __fastcall TClientForm::FilterIpMenuItemClick(TObject *Sender) if(res==IDCANCEL) break; if(res==IDYES) - MainForm->FilterIP(ip_addr.c_str(),prot.c_str(),username.c_str()); + filter_ip(&MainForm->cfg,prot.c_str(),"abuse",hostname.c_str() + ,ip_addr.c_str(),username.c_str()); if(ListView->Selected == NULL) break; ListItem=ListView->GetNextItem(ListItem,sdAll,State); diff --git a/src/sbbs3/ctrl/MainFormUnit.cpp b/src/sbbs3/ctrl/MainFormUnit.cpp index 66331f483140b5f09f510b2f0755adce70f94a79..27a91600093cf330207f56ca90c390e4847c6ab2 100644 --- a/src/sbbs3/ctrl/MainFormUnit.cpp +++ b/src/sbbs3/ctrl/MainFormUnit.cpp @@ -2981,12 +2981,6 @@ void __fastcall TMainForm::TelnetRecycleExecute(TObject *Sender) TelnetRecycle->Enabled=false; } //--------------------------------------------------------------------------- -void __fastcall TMainForm::FilterIP(char* ip_addr - ,char* prot, char* username) -{ - filter_ip(&cfg,prot,"abuse",ip_addr,username); -} -//--------------------------------------------------------------------------- void __fastcall TMainForm::FileEditTextFilesClick(TObject *Sender) { diff --git a/src/sbbs3/ctrl/MainFormUnit.h b/src/sbbs3/ctrl/MainFormUnit.h index 31ba47313f3bd84cf57a69ccee9eb4d2ede1d89d..b68f9cb7f2aa5f5ba940a12b1011a01069002ff8 100644 --- a/src/sbbs3/ctrl/MainFormUnit.h +++ b/src/sbbs3/ctrl/MainFormUnit.h @@ -386,8 +386,6 @@ public: // User declarations void __fastcall WriteColor(TRegistry*, AnsiString, TColor); void __fastcall ReadFont(AnsiString, TFont*); void __fastcall WriteFont(AnsiString, TFont*); - void __fastcall FilterIP(char* ip_addr - ,char* prot, char* username); }; //---------------------------------------------------------------------------