From 92e26a89ad5a737325b33dbc9bcda141c2646ed7 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 16 Jan 2015 13:11:07 +0000 Subject: [PATCH] - unit test for local unix connection. Documentation and log_addr does not inspect port for AF_LOCAL. git-svn-id: file:///svn/unbound/trunk@3315 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ doc/example.conf.in | 4 ++++ testdata/ctrl_pipe.tpkg | Bin 0 -> 5808 bytes util/net_help.c | 7 ++++++- 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 testdata/ctrl_pipe.tpkg diff --git a/doc/Changelog b/doc/Changelog index 7bd1ea8c7..db5ad8cde 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +16 January 2015: Wouter + - unit test for local unix connection. Documentation and log_addr + does not inspect port for AF_LOCAL. + 13 January 2015: Wouter - iana portlist update. diff --git a/doc/example.conf.in b/doc/example.conf.in index e4a01d634..c6e47a279 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -553,6 +553,10 @@ remote-control: # set up the keys and certificates with unbound-control-setup. # control-enable: no + # Set to no and use an absolute path as control-interface to use + # a unix local named pipe for unbound-control. + # control-use-cert: yes + # what interfaces are listened to for remote control. # give 0.0.0.0 and ::0 to listen to all interfaces. # control-interface: 127.0.0.1 diff --git a/testdata/ctrl_pipe.tpkg b/testdata/ctrl_pipe.tpkg new file mode 100644 index 0000000000000000000000000000000000000000..06695e8200773dab73a1ed383fa6ae9b8344ad97 GIT binary patch literal 5808 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 break; - case AF_LOCAL: family="local"; break; + case AF_LOCAL: + dest[0]=0; + (void)inet_ntop(af, sinaddr, dest, + (socklen_t)sizeof(dest)); + verbose(v, "%s local %s", str, dest); + return; /* do not continue and try to get port */ default: break; } if(inet_ntop(af, sinaddr, dest, (socklen_t)sizeof(dest)) == 0) {