From 5ffe0aec2677ce7ecd45fe34ffdfba83e535e52c Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 23 Apr 2025 00:22:46 +0800 Subject: [PATCH] =?UTF-8?q?List=E6=A8=A1=E6=9D=BF=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E4=B8=BAArrayList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/network/IP.h | 12 ++++++------ inc/hgl/network/SocketEvent.h | 2 +- src/IPAddress.cpp | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/inc/hgl/network/IP.h b/inc/hgl/network/IP.h index 50ebd85..f27810e 100644 --- a/inc/hgl/network/IP.h +++ b/inc/hgl/network/IP.h @@ -123,8 +123,8 @@ namespace hgl }; }; - int GetIPSupport(List &); ///<取得本机IP支持列表 - bool CheckIPSupport(const List &ips_list,uint family,uint socktype,uint protocol); + int GetIPSupport(ArrayList &); ///<取得本机IP支持列表 + bool CheckIPSupport(const ArrayList &ips_list,uint family,uint socktype,uint protocol); bool CheckIPSupport(uint family,uint socktype,uint protocol); inline bool CheckIPv4SupportTCP (){return CheckIPSupport(AF_INET,SOCK_STREAM, IPPROTO_TCP );} @@ -328,8 +328,8 @@ namespace hgl static void ToString(char *str,const int,const sockaddr_in *); void ToString(char *str,const int)const override; - static int GetDomainIPList(List &addr_list,const char *domain,int _socktype,int _protocol); ///<取得当指定域名的IPv4地址列表 - static int GetLocalIPList(List &addr_list,int _socktype,int _protocol); ///<取得本机的IPv4地址列表 + static int GetDomainIPList(ArrayList &addr_list,const char *domain,int _socktype,int _protocol); ///<取得当指定域名的IPv4地址列表 + static int GetLocalIPList(ArrayList &addr_list,int _socktype,int _protocol); ///<取得本机的IPv4地址列表 IPAddress *CreateCopy()const override{return(new IPv4Address(this));} IPAddress *Create()const override{return(new IPv4Address());} @@ -396,8 +396,8 @@ namespace hgl static void ToString(char *str,const int,const sockaddr_in6 *); void ToString(char *str,const int)const override; - static int GetDomainIPList(List &addr_list,const char *domain,int _socktype,int _protocol); ///<取得指定域名的IPv6地址列表 - static int GetLocalIPList(List &addr_list,int _socktype,int _protocol); ///<取得本机的IPv6地址列表 + static int GetDomainIPList(ArrayList &addr_list,const char *domain,int _socktype,int _protocol); ///<取得指定域名的IPv6地址列表 + static int GetLocalIPList(ArrayList &addr_list,int _socktype,int _protocol); ///<取得本机的IPv6地址列表 IPAddress *CreateCopy()const override{return(new IPv6Address(this));} IPAddress *Create()const override{return(new IPv6Address());} diff --git a/inc/hgl/network/SocketEvent.h b/inc/hgl/network/SocketEvent.h index b6414ec..e8c6a4a 100644 --- a/inc/hgl/network/SocketEvent.h +++ b/inc/hgl/network/SocketEvent.h @@ -18,7 +18,7 @@ namespace hgl }; };//struct SocketEvent - using SocketEventList=List; + using SocketEventList=ArrayList; }//namespace network }//namespace hgl #endif//HGL_NETWORK_SOCKET_EVENT_INCLUDE diff --git a/src/IPAddress.cpp b/src/IPAddress.cpp index 739ae47..3ea0dd2 100644 --- a/src/IPAddress.cpp +++ b/src/IPAddress.cpp @@ -98,18 +98,18 @@ namespace hgl return(true); } - void AddAddrToList(List &addr_list, const sockaddr_in *sai) + void AddAddrToList(ArrayList &addr_list, const sockaddr_in *sai) { addr_list.Add(sai->sin_addr); } - void AddAddrToList(List &addr_list, const sockaddr_in6 *sai) + void AddAddrToList(ArrayList &addr_list, const sockaddr_in6 *sai) { addr_list.Add(sai->sin6_addr); } template - int GetIPList(List &addr_list,const char *addr_string, int socktype,int protocol) + int GetIPList(ArrayList &addr_list,const char *addr_string, int socktype,int protocol) { struct addrinfo hints, *answer, *ptr; @@ -138,7 +138,7 @@ namespace hgl * @return -1 出错，无法获取主机名称 * @return -2 出错，无法获取地址信息 */ - int GetIPSupport(List &ipsl) + int GetIPSupport(ArrayList &ipsl) { char hostname[NI_MAXHOST]; @@ -193,7 +193,7 @@ namespace hgl * @param protocol 协议类型 * @return 是否支持 */ - bool CheckIPSupport(const List &ips_list,uint family,uint socktype,uint protocol) + bool CheckIPSupport(const ArrayList &ips_list,uint family,uint socktype,uint protocol) { int count=ips_list.GetCount(); @@ -224,7 +224,7 @@ namespace hgl */ bool CheckIPSupport(uint family,uint socktype,uint protocol) { - List ips_list; + ArrayList ips_list; const int count=GetIPSupport(ips_list); @@ -308,7 +308,7 @@ namespace hgl * @param _protocol 协议类型(可以为IPPROTO_TCP、IPPROTO_UDP、IPPROTO_SCTP),默认为所有类型。 * @return 地址个数,-1表示出错 */ - int IPv4Address::GetDomainIPList(List &addr_list,const char *domain,int socktype,int protocol) + int IPv4Address::GetDomainIPList(ArrayList &addr_list,const char *domain,int socktype,int protocol) { return GetIPList(addr_list,domain,socktype,protocol); } @@ -320,7 +320,7 @@ namespace hgl * @param _protocol 协议类型(可以为IPPROTO_TCP、IPPROTO_UDP、IPPROTO_SCTP),默认为所有类型。 * @return 地址个数,-1表示出错 */ - int IPv4Address::GetLocalIPList(List &addr_list,int _socktype,int _protocol) + int IPv4Address::GetLocalIPList(ArrayList &addr_list,int _socktype,int _protocol) { char hostname[NI_MAXHOST]; @@ -398,7 +398,7 @@ namespace hgl * @param _protocol 协议类型(可以为IPPROTO_TCP、IPPROTO_UDP、IPPROTO_SCTP),默认为所有类型。 * @return 地址个数,-1表示出错 */ - int IPv6Address::GetDomainIPList(List &addr_list,const char *domain,int socktype,int protocol) + int IPv6Address::GetDomainIPList(ArrayList &addr_list,const char *domain,int socktype,int protocol) { return GetIPList(addr_list,domain,socktype,protocol); } @@ -410,7 +410,7 @@ namespace hgl * @param _protocol 协议类型(可以为IPPROTO_TCP、IPPROTO_UDP、IPPROTO_SCTP),默认为所有类型。 * @return 地址个数,-1表示出错 */ - int IPv6Address::GetLocalIPList(List &addr_list,int _socktype,int _protocol) + int IPv6Address::GetLocalIPList(ArrayList &addr_list,int _socktype,int _protocol) { char hostname[NI_MAXHOST];