proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 18:42:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the error message when execute ldpd with --enable-tcp-zebra

Browse Source 
- If we use the option "--enable-tcp-zebra " to configure, the zclient will use the tcp socket instead of unix domain socket.
- The ldpd will pass the "-z path" options to `frr_opt` and that will execute zclient_serv_path_set to check the domain socket.
- Add the define to ldpd, if the "HAVE_TCP_ZEBRA" has been define, don't pass the "-z path" to `frr_opt`.

Signed-off-by: Hung-Weic Chiu <sppsorrg@gmail.com>
This commit is contained in:
Hung-Weic Chiu 2017-05-03 13:27:29 +00:00
parent 5503498dda
commit 2a3886acd5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ldpd/ldpd.c
View File

@ -500,8 +500,11 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync,
argv[argc++] = (char *)ctl_sock_custom_path; argv[argc++] = (char *)ctl_sock_custom_path;
} }
/* zclient serv path */ /* zclient serv path */
#ifdef HAVE_TCP_ZEBRA
#else
argv[argc++] = (char *)"-z"; argv[argc++] = (char *)"-z";
argv[argc++] = (char *)zclient_serv_path_get(); argv[argc++] = (char *)zclient_serv_path_get();
#endif
/* instance */ /* instance */
if (instance) { if (instance) {
argv[argc++] = (char *)"-n"; argv[argc++] = (char *)"-n";