Fix the error message when execute ldpd with --enable-tcp-zebra #452
Conversation
- 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>
|
Looks good to me. @rwestphal should look at it too. |
| @@ -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; | |||
| } | |||
| /* zclient serv path */ | |||
| #ifdef HAVE_TCP_ZEBRA | |||
There was a problem hiding this comment.
Why not use #ifndef and get rid of the else?
There was a problem hiding this comment.
Since the other file use the same pattern "ifdef ... else ...." and I want to keep the coding style consistency.
If we have to add third definition about zcliet connection in the future, I think the pattern consistency can avoid us rearranging the code.
Continous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-597/ This is a comment from an EXPERIMENTAL automated CI system. |
If we configure the frr with enable-tcp-zebra and execute the ldpd, we will get the following message.
unknown: zclient_serv_path_set: zebra socket `/var/run/frr/zserv.api' does not exist
Since the zclient will use the tcp socket instead of unix domain socket, it won't generate the domain socket file in /var/run/frr/zserv.api.
After we execute ldpd, it passes the -z /xxxx/ options to
frr_optand it will check the domain socket is exist.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