diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-06 07:35:50 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-08 11:14:05 +0200 |
| commit | 689f5a8c84b95dbd31ecab481f8f2977965fe741 (patch) | |
| tree | 7c2a2b69908b3c3ac60e0de41b5a3f85caec2ef5 /zebra/client_main.c | |
| parent | Merge pull request #924 from qlyoung/deprecate-ospf-lsa-min-arrival (diff) | |
| download | frr-689f5a8c84b95dbd31ecab481f8f2977965fe741.tar.xz frr-689f5a8c84b95dbd31ecab481f8f2977965fe741.zip | |
*: remove --enable-tcp-zebra, rework ZAPI path
This adds "@tcp" as new choice on the -z option present in zebra and the
protocol daemons. The --enable-tcp-zebra option on configure is no
longer needed, both UNIX and TCP socket support is always available.
Note that @tcp should not be used by default (e.g. in an init script),
and --enable-tcp-zebra should never have been in any distro package
builds, because
**** TCP-ZEBRA IS A SECURITY PROBLEM ****
It allows arbitrary local users to mess with the routing table and
inject bogus data -- and also ZAPI is not designed to be robust against
attacks.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/client_main.c')
| -rw-r--r-- | zebra/client_main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/zebra/client_main.c b/zebra/client_main.c index 17130c602..95b9d00dc 100644 --- a/zebra/client_main.c +++ b/zebra/client_main.c @@ -186,11 +186,7 @@ int main(int argc, char **argv) /* Establish connection to zebra. */ zclient = zclient_new(master); zclient->enable = 1; -#ifdef HAVE_TCP_ZEBRA - zclient->sock = zclient_socket(); -#else - zclient->sock = zclient_socket_un(ZEBRA_SERV_PATH); -#endif /* HAVE_TCP_ZEBRA */ + zclient_socket_connect(zclient); /* Open simulation file. */ fp = fopen(argv[1], "r"); |