ipv6

src/main.cpp

@@ -20,7 +20,7 @@ struct Meta {
 
 unsigned char local_id;
 unsigned char remote_id;
-sockaddr_in remote_addr{.sin_family = AF_INET};
+sockaddr_storage remote_addr{};
 
 /* Checksum a block of data */
 uint16_t csum(uint16_t *packet, int packlen) {
@@ -71,7 +71,7 @@ Secret *remoteSecret;
 // internet -> tun
 void inbound(int raw, int tun) {
     unsigned char buffer[ETH_DATA_LEN];
-    sockaddr_in address{.sin_family = AF_INET};
+    sockaddr_storage address;
     socklen_t address_length = sizeof(address);
     size_t packet_length;
     while ((packet_length = recvfrom(raw, buffer, sizeof(buffer), 0, (sockaddr *) &address, &address_length)) >= 0) {
@@ -98,9 +98,9 @@ void inbound(int raw, int tun) {
 //                  << " tot_len " << ntohs(packet->tot_len)
 //                  << " inner->tot_len " << ntohs(inner->tot_len)
 //                  << " from " << inet_ntoa(address.sin_addr) << std::endl;
-        if (remote_addr.sin_addr.s_addr != address.sin_addr.s_addr) {
-            std::cout << "float ip: " << inet_ntoa(address.sin_addr) << std::endl;
-        }
+//        if (remote_addr.sin_addr.s_addr != address.sin_addr.s_addr) {
+//            std::cout << "float ip: " << inet_ntoa(address.sin_addr) << std::endl;
+//        }
         remote_addr = address;
 
         if (write(tun, inner, payload_length) < 0) {
@@ -121,7 +121,7 @@ void outbound(int raw, int tun) {
     size_t packet_length;
     while ((packet_length = read(tun, inner, sizeof(buffer) - sizeof(Meta))) >= 0) {
 //        std::cout << "sendto: " << inet_ntoa(remote_addr.sin_addr) << std::endl;
-        if (!remote_addr.sin_addr.s_addr) continue;
+        if (!remote_addr.ss_family) continue;
         localSecret->encrypt(inner, packet_length);
         if (sendto(raw, buffer, packet_length + sizeof(Meta), 0, (sockaddr *) &remote_addr, sizeof(remote_addr)) < 0) {
             perror("outbound write");
@@ -158,15 +158,20 @@ int main(int argc, char *argv[]) {
     auto mark = get_var_number("MARK");
 
     if (endpoint != nullptr) {
-        auto he = gethostbyname(endpoint);
-        if (he == nullptr) {
-            perror("gethostbyname error");
-            return -1;
+        addrinfo hints = {
+                // .ai_family = AF_UNSPEC // AF_INET, AF_INET6 如果你需要只请求A或AAAA
+        };
+        addrinfo *result;
+
+        if (getaddrinfo(argv[1], argv[2], &hints, &result) != 0) {
+            perror("getaddrinfo");
         }
-        if (he->h_addr_list[0] == nullptr) {
-            perror("gethostbyname error 2");
+
+        for (auto rp = result; rp != nullptr; rp = rp->ai_next) {
+            remote_addr = *(sockaddr_storage *) rp->ai_addr;
+            break; // remote_addr.ss_family 如果你需要从结果里筛选
         }
-        remote_addr.sin_addr.s_addr = *(in_addr_t *) he->h_addr_list[0];
+        freeaddrinfo(result);           /* No longer needed */
     }
     ifreq ifr{};
     ifr.ifr_flags = IFF_TUN | IFF_NO_PI;