morningman commented on code in PR #14063:
URL: https://github.com/apache/doris/pull/14063#discussion_r1103756592
##########
fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/BaseController.java:
##########
@@ -296,6 +296,6 @@ protected long checkLongParam(String strParam) {
}
protected String getCurrentFrontendURL() {
- return "http://"; + FrontendOptions.getLocalHostAddress() + ":" +
Config.http_port;
+ return "http://"; + FrontendOptions.getHostname() + ":" +
Config.http_port;
Review Comment:
What is diff between `getLocalHostAddress` and `getHostname`?
##########
be/src/util/network_util.cpp:
##########
@@ -39,22 +39,38 @@
namespace doris {
InetAddress::InetAddress(struct sockaddr* addr) {
- this->addr = *(struct sockaddr_in*)addr;
+ this->addr = *addr;
}
-bool InetAddress::is_address_v4() const {
- return addr.sin_family == AF_INET;
+bool InetAddress::is_loopback() {
+ if (addr.sa_family == AF_INET) {
+ in_addr_t s_addr = ((struct sockaddr_in*)&addr)->sin_addr.s_addr;
+ return (ntohl(s_addr) & 0xFF000000) == 0x7F000000;
+ } else if (addr.sa_family == AF_INET6) {
+ struct in6_addr in6_addr = ((struct sockaddr_in6*)&addr)->sin6_addr;
+ return IN6_IS_ADDR_LOOPBACK(&in6_addr);
+ } else {
+ LOG(WARNING) << "unknow address";
Review Comment:
```suggestion
LOG(WARNING) << "unknow address: " << addr.sa_family;
```
##########
be/src/util/network_util.cpp:
##########
@@ -39,22 +39,38 @@
namespace doris {
InetAddress::InetAddress(struct sockaddr* addr) {
- this->addr = *(struct sockaddr_in*)addr;
+ this->addr = *addr;
}
-bool InetAddress::is_address_v4() const {
- return addr.sin_family == AF_INET;
+bool InetAddress::is_loopback() {
+ if (addr.sa_family == AF_INET) {
+ in_addr_t s_addr = ((struct sockaddr_in*)&addr)->sin_addr.s_addr;
+ return (ntohl(s_addr) & 0xFF000000) == 0x7F000000;
+ } else if (addr.sa_family == AF_INET6) {
+ struct in6_addr in6_addr = ((struct sockaddr_in6*)&addr)->sin6_addr;
+ return IN6_IS_ADDR_LOOPBACK(&in6_addr);
+ } else {
+ LOG(WARNING) << "unknow address";
+ return false;
+ }
}
-bool InetAddress::is_loopback_v4() {
- in_addr_t s_addr = addr.sin_addr.s_addr;
- return (ntohl(s_addr) & 0xFF000000) == 0x7F000000;
+std::string InetAddress::get_host_address() {
+ if (addr.sa_family == AF_INET) {
+ char addr_buf[INET_ADDRSTRLEN];
+ inet_ntop(AF_INET, &(((struct sockaddr_in*)&addr)->sin_addr),
addr_buf, INET_ADDRSTRLEN);
+ return std::string(addr_buf);
+ } else if (addr.sa_family == AF_INET6) {
+ char addr_buf[INET6_ADDRSTRLEN];
+ inet_ntop(AF_INET6, &(((struct sockaddr_in6*)&addr)->sin6_addr),
addr_buf,
+ INET6_ADDRSTRLEN);
+ return std::string(addr_buf);
+ } else {
+ return std::string {"unknown address"};
Review Comment:
```suggestion
return std::string {"unknown address: " + addr.sa_family};
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
