From f820e85a419deb5c7ed3c8f1abe400436b2d6122 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sat, 3 Oct 2020 15:24:31 +0200 Subject: [PATCH] Testsuite: Use 127.x.x.x for PROXY v2 This avoids depencies on DNS timeouts on the host running the testsuite. --- test/log/4030 | 8 ++++---- test/scripts/4030-proxy-protocol/4030 | 2 +- test/stdout/4030 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/log/4030 b/test/log/4030 index 0d7c79acc..07838f869 100644 --- a/test/log/4030 +++ b/test/log/4030 @@ -14,10 +14,10 @@ 1999-03-02 09:44:33 proxy external [127.42.42.42]:1114 1999-03-02 09:44:33 remote [127.0.0.2]:1115 1999-03-02 09:44:33 10HmaY-0005vi-00 <= c@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss -1999-03-02 09:44:33 no host name found for IP address 192.168.0.15 +1999-03-02 09:44:33 no host name found for IP address 127.0.0.2 1999-03-02 09:44:33 proxy session: yes 1999-03-02 09:44:33 local [ip4.ip4.ip4.ip4]:1111 1999-03-02 09:44:33 proxy internal [ip4.ip4.ip4.ip4]:1116 -1999-03-02 09:44:33 proxy external [192.168.0.5]:1117 -1999-03-02 09:44:33 remote [192.168.0.15]:1118 -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= e@test.ex H=(clientname) [192.168.0.15]:1118 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss +1999-03-02 09:44:33 proxy external [127.42.42.42]:1117 +1999-03-02 09:44:33 remote [127.0.0.2]:1118 +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= e@test.ex H=(clientname) [127.0.0.2]:1118 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss diff --git a/test/scripts/4030-proxy-protocol/4030 b/test/scripts/4030-proxy-protocol/4030 index 50dca160a..1eece1112 100644 --- a/test/scripts/4030-proxy-protocol/4030 +++ b/test/scripts/4030-proxy-protocol/4030 @@ -50,7 +50,7 @@ QUIT # # protocol v2 plain receive client HOSTIPV4 PORT_D ->>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\xc0\xa8\x00\x0f\xc0\xa8\x00\x05\xc2\x95\x04\x01 +>>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01 ??? 220 HELO clientname ??? 250 diff --git a/test/stdout/4030 b/test/stdout/4030 index 6e567fd2c..c37aaa963 100644 --- a/test/stdout/4030 +++ b/test/stdout/4030 @@ -50,12 +50,12 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 221 myhost.test.ex closing connection End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ->>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\xc0\xa8\x00\x0f\xc0\xa8\x00\x05\xc2\x95\x04\x01 +>>> \x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A\x21\x11\x00\x0c\x7f\x00\x00\x02\x7f\x2a\x2a\x2a\xc2\x95\x04\x01 ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> HELO clientname ??? 250 -<<< 250 myhost.test.ex Hello clientname [192.168.0.15] +<<< 250 myhost.test.ex Hello clientname [127.0.0.2] >>> MAIL FROM: ??? 250 <<< 250 OK -- 2.30.2