diff options
| author | Zoran Pericic <zpericic@netst.org> | 2020-01-25 19:38:39 +0100 |
|---|---|---|
| committer | Zoran Peričić <zpericic@netst.org> | 2020-10-12 19:34:53 +0200 |
| commit | 354196c027e81affb05163a6c3676eef1ba06dd9 (patch) | |
| tree | 21ba82f823b772d559f1d0b4a3a92fa136dca3c5 /nhrpd | |
| parent | Merge pull request #6927 from donaldsharp/16_coverity (diff) | |
| download | frr-354196c027e81affb05163a6c3676eef1ba06dd9.tar.xz frr-354196c027e81affb05163a6c3676eef1ba06dd9.zip | |
nhrp: Make vici socket path configurable
nhrp: Configure vici socket path using
configure --with-vici-socket=/var/run/charon.vici
If not specified default to /var/run/charon.vici
Signed-off-by: Zoran Peričić <zpericic@netst.org>
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/README.nhrpd | 3 | ||||
| -rw-r--r-- | nhrpd/vici.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nhrpd/README.nhrpd b/nhrpd/README.nhrpd index 569b3f446..8bb5f69be 100644 --- a/nhrpd/README.nhrpd +++ b/nhrpd/README.nhrpd @@ -126,7 +126,8 @@ Integration with strongSwan Contrary to opennhrp, Quagga/NHRP has tight integration with IKE daemon. Currently strongSwan is supported using the VICI protocol. strongSwan -is connected using UNIX socket (hardcoded now as /var/run/charon.vici). +is connected using UNIX socket (default /var/run/charon.vici use configure +argument --with-vici-socket= to change). Thus nhrpd needs to be run as user that can open that file. Currently, you will need patched strongSwan. The working tree is at: diff --git a/nhrpd/vici.c b/nhrpd/vici.c index 2dc05a4aa..86554f53d 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -478,7 +478,7 @@ static int vici_reconnect(struct thread *t) if (vici->fd >= 0) return 0; - fd = sock_open_unix("/var/run/charon.vici"); + fd = sock_open_unix(VICI_SOCKET); if (fd < 0) { debugf(NHRP_DEBUG_VICI, "%s: failure connecting VICI socket: %s", __func__, |