ldpd: convert cli and get rid of the xml interface

The xml2cli.pl script was useful years ago when the vty code was very
rudimentary. This is not the case anymore, so convert all ldpd CLI
commands to use DEFUNs directly and get rid of the XML interface.

The benefits are:
* Consistency with the other daemons;
* One less build dependency (the LibXML perl module);
* Easier to add new commands.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 41 insertions, 40 deletions

diff --git a/ldpd/ldp_vty.h b/ldpd/ldp_vty.h
index 21a486ff6..1375c3c79 100644
--- a/ldpd/ldp_vty.h
+++ b/ldpd/ldp_vty.h
@@ -37,46 +37,47 @@ int	 ldp_get_address(const char *, int *, union ldpd_addr *);
 int	 ldp_config_write(struct vty *);
 int	 ldp_l2vpn_config_write(struct vty *);
 int	 ldp_debug_config_write(struct vty *);
-int	 ldp_vty_mpls_ldp (struct vty *, struct vty_arg *[]);
-int	 ldp_vty_address_family (struct vty *, struct vty_arg *[]);
-int	 ldp_vty_disc_holdtime(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_disc_interval(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_targeted_hello_accept(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_session_holdtime(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_interface(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_trans_addr(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_neighbor_targeted(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_label_advertise(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_label_allocate(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_label_expnull(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_label_accept(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_ttl_security(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_router_id(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_ds_cisco_interop(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_trans_pref_ipv4(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_neighbor_password(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_neighbor_ttl_security(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_bridge(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_mtu(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pwtype(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_interface(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pseudowire(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pw_cword(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pw_nbr_addr(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pw_nbr_id(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pw_pwid(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_l2vpn_pw_pwstatus(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_binding(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_discovery(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_interface(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_capabilities(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_neighbor(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_atom_binding(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_atom_vc(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_clear_nbr(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_debug(struct vty *, struct vty_arg *[]);
-int	 ldp_vty_show_debugging(struct vty *, struct vty_arg *[]);
+int	 ldp_vty_mpls_ldp (struct vty *, int);
+int	 ldp_vty_address_family (struct vty *, int, const char *);
+int	 ldp_vty_disc_holdtime(struct vty *, int, const char *, const char *);
+int	 ldp_vty_disc_interval(struct vty *, int, const char *, const char *);
+int	 ldp_vty_targeted_hello_accept(struct vty *, int, const char *);
+int	 ldp_vty_nbr_session_holdtime(struct vty *, int, const char *, const char *);
+int	 ldp_vty_af_session_holdtime(struct vty *, int, const char *);
+int	 ldp_vty_interface(struct vty *, int, const char *);
+int	 ldp_vty_trans_addr(struct vty *, int, const char *);
+int	 ldp_vty_neighbor_targeted(struct vty *, int, const char *);
+int	 ldp_vty_label_advertise(struct vty *, int, const char *, const char *);
+int	 ldp_vty_label_allocate(struct vty *, int, int, const char *);
+int	 ldp_vty_label_expnull(struct vty *, int, const char *);
+int	 ldp_vty_label_accept(struct vty *, int, const char *, const char *);
+int	 ldp_vty_ttl_security(struct vty *, int);
+int	 ldp_vty_router_id(struct vty *, int, const char *);
+int	 ldp_vty_ds_cisco_interop(struct vty *, int);
+int	 ldp_vty_trans_pref_ipv4(struct vty *, int);
+int	 ldp_vty_neighbor_password(struct vty *, int, const char *, const char *);
+int	 ldp_vty_neighbor_ttl_security(struct vty *, int, const char *, const char *);
+int	 ldp_vty_l2vpn(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_bridge(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_mtu(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pwtype(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_interface(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pseudowire(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pw_cword(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pw_nbr_addr(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pw_nbr_id(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pw_pwid(struct vty *, int, const char *);
+int	 ldp_vty_l2vpn_pw_pwstatus(struct vty *, int);
+int	 ldp_vty_clear_nbr(struct vty *, const char *);
+int	 ldp_vty_debug(struct vty *, int, const char *, const char *, int);
+int	 ldp_vty_show_binding(struct vty *, const char *, int, int);
+int	 ldp_vty_show_discovery(struct vty *, const char *, int, int);
+int	 ldp_vty_show_interface(struct vty *, const char *, int);
+int	 ldp_vty_show_capabilities(struct vty *, int);
+int	 ldp_vty_show_neighbor(struct vty *, int, int, int);
+int	 ldp_vty_show_atom_binding(struct vty *, int);
+int	 ldp_vty_show_atom_vc(struct vty *, int);
+int	 ldp_vty_show_debugging(struct vty *);
 
 void	 ldp_vty_init(void);