diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-12-08 22:21:58 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-12-08 22:21:58 +0000 |
| commit | e6d2a9894df8c3b65920e903ab21076a0a37e20e (patch) | |
| tree | bc16ffffb09ef638f391b4511166bde9d1371421 /test | |
| parent | cee5f132d1b81d3b8738944036eb02af418b54be (diff) | |
SOCKS: Add log_selector support.
Also make the proxy_* variables meaningful for events associated with proxied transports.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/4020 | 4 | ||||
| -rw-r--r-- | test/log/4020 | 4 | ||||
| -rw-r--r-- | test/scripts/4020-socks/4020 | 4 | ||||
| -rw-r--r-- | test/stdout/4020 | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/test/confs/4020 b/test/confs/4020 index 8e2f6b052..794272e6d 100644 --- a/test/confs/4020 +++ b/test/confs/4020 @@ -13,6 +13,8 @@ tls_advertise_hosts = # ----- Main settings ----- +log_selector = +proxy +outgoing_port + domainlist local_domains = test.ex : *.test.ex acl_smtp_rcpt = accept @@ -38,7 +40,7 @@ my_smtp: driver = smtp interface = HOSTIPV4 port = PORT_S - socks_proxy = 127.0.0.1 port=PORT_S OPT + socks_proxy = 127.0.0.1 port=PORT_D OPT debug_print = transport_name <$transport_name> diff --git a/test/log/4020 b/test/log/4020 index f289beffd..b5e1f7bef 100644 --- a/test/log/4020 +++ b/test/log/4020 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 accepted OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1]:1224 PRX=[127.0.0.1]:1225 C="250 accepted OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 accepted OK" +1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1]:1224 PRX=[127.0.0.1]:1225 C="250 accepted OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/scripts/4020-socks/4020 b/test/scripts/4020-socks/4020 index 49d97c05f..44c885b8d 100644 --- a/test/scripts/4020-socks/4020 +++ b/test/scripts/4020-socks/4020 @@ -3,7 +3,7 @@ munge loopback # # auth: null -server PORT_S +server PORT_D <<\x05\x01\x00 >>\x05\x00 <<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 @@ -42,7 +42,7 @@ quit # # # auth: username/password -server PORT_S +server PORT_D <<\x05\x01\x02 >>\x05\x02 <<\x01\x04fred\x05fubar diff --git a/test/stdout/4020 b/test/stdout/4020 index 720c954fd..293f5136e 100644 --- a/test/stdout/4020 +++ b/test/stdout/4020 @@ -22,7 +22,7 @@ 221 myhost.test.ex closing connection
******** SERVER ******** -Listening on port 1224 ... +Listening on port 1225 ... Connection request from [ip4.ip4.ip4.ip4] <<\x05\x01\x00 >>\x05\x00 @@ -43,7 +43,7 @@ R QUIT 250 bye End of script -Listening on port 1224 ... +Listening on port 1225 ... Connection request from [ip4.ip4.ip4.ip4] <<\x05\x01\x02 >>\x05\x02 |