diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-02-17 12:32:04 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-03-02 08:27:30 +0100 |
| commit | 2283c8148a2d67357c68256be3811a3059d7ef77 (patch) | |
| tree | e085bfadfd1f3f1064d9d1e30d4f42d85cc2d5e7 | |
| parent | d8e12fdb130a3b9413260ef74f646b3b243c6e1e (diff) | |
| download | strongswan-2283c8148a2d67357c68256be3811a3059d7ef77.tar.bz2 strongswan-2283c8148a2d67357c68256be3811a3059d7ef77.tar.xz | |
host: Don't log port if it is zero
| -rw-r--r-- | src/libstrongswan/networking/host.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/tests/suites/test_host.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libstrongswan/networking/host.c b/src/libstrongswan/networking/host.c index b71d2da16..953720498 100644 --- a/src/libstrongswan/networking/host.c +++ b/src/libstrongswan/networking/host.c @@ -139,7 +139,7 @@ int host_printf_hook(printf_hook_data_t *data, printf_hook_spec_t *spec, snprintf(buffer, sizeof(buffer), "(address conversion failed)"); } - else if (spec->hash) + else if (spec->hash && port) { len = strlen(buffer); snprintf(buffer + len, sizeof(buffer) - len, diff --git a/src/libstrongswan/tests/suites/test_host.c b/src/libstrongswan/tests/suites/test_host.c index 5d054577a..63f0eb20a 100644 --- a/src/libstrongswan/tests/suites/test_host.c +++ b/src/libstrongswan/tests/suites/test_host.c @@ -657,18 +657,18 @@ END_TEST static struct { char *addr; uint16_t port; - /* results for %H, %+H, %#H (falls back to [0]) */ + /* results for %H, %+H, %#H (falls back to the first entry) */ char *result[3]; } printf_data[] = { {NULL, 0, { "(null)" }}, {NULL, 500, { "(null)" }}, - {"%any", 0, { "%any", "0.0.0.0", "0.0.0.0[0]" }}, + {"%any", 0, { "%any", "0.0.0.0", "0.0.0.0" }}, {"%any", 500, { "%any", "0.0.0.0", "0.0.0.0[500]" }}, - {"%any6", 0, { "%any6", "::", "::[0]" }}, + {"%any6", 0, { "%any6", "::", "::" }}, {"%any6", 500, { "%any6", "::", "::[500]" }}, - {"192.168.0.1", 0, { "192.168.0.1", "192.168.0.1", "192.168.0.1[0]" }}, + {"192.168.0.1", 0, { "192.168.0.1" }}, {"192.168.0.1", 500, { "192.168.0.1", "192.168.0.1", "192.168.0.1[500]" }}, - {"fec1::1", 0, { "fec1::1", "fec1::1", "fec1::1[0]" }}, + {"fec1::1", 0, { "fec1::1" }}, {"fec1::1", 500, { "fec1::1", "fec1::1", "fec1::1[500]" }}, }; |