#include "zebra/debug.h"
#include "zebra/rib.h"
#include "zebra/zserv.h"
+#include "zebra/zapi_msg.h"
#include "zebra/zebra_rnh.h"
#include "zebra/zebra_vrf.h"
#include "zebra/zebra_pw.h"
DEFINE_HOOK(pw_install, (struct zebra_pw * pw), (pw))
DEFINE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw))
+#define MPLS_NO_LABEL MPLS_INVALID_LABEL
+
extern struct zebra_t zebrad;
static int zebra_pw_enabled(struct zebra_pw *);
pw->protocol = protocol;
pw->vrf_id = zvrf_id(zvrf);
pw->client = client;
- pw->status = PW_STATUS_UP;
+ pw->status = PW_STATUS_DOWN;
pw->local_label = MPLS_NO_LABEL;
pw->remote_label = MPLS_NO_LABEL;
pw->flags = F_PSEUDOWIRE_CWORD;
/* schedule to retry later */
THREAD_TIMER_OFF(pw->install_retry_timer);
- pw->install_retry_timer =
- thread_add_timer(zebrad.master, zebra_pw_install_retry, pw,
- PW_INSTALL_RETRY_INTERVAL);
+ thread_add_timer(zebrad.master, zebra_pw_install_retry, pw,
+ PW_INSTALL_RETRY_INTERVAL, &pw->install_retry_timer);
zebra_pw_update_status(pw, PW_STATUS_DOWN);
}
static int zebra_pw_check_reachability(struct zebra_pw *pw)
{
- struct rib *rib;
- struct nexthop *nexthop, *tnexthop;
- int recursing;
+ struct route_entry *re;
+ struct nexthop *nexthop;
/* TODO: consider GRE/L2TPv3 tunnels in addition to MPLS LSPs */
/* find route to the remote end of the pseudowire */
- rib = rib_match(family2afi(pw->af), SAFI_UNICAST, pw->vrf_id,
- &pw->nexthop, NULL);
- if (!rib) {
+ re = rib_match(family2afi(pw->af), SAFI_UNICAST, pw->vrf_id,
+ &pw->nexthop, NULL);
+ if (!re) {
if (IS_ZEBRA_DEBUG_PW)
- zlog_warn("%s: no route found for %s", __func__,
- pw->ifname);
+ zlog_debug("%s: no route found for %s", __func__,
+ pw->ifname);
return -1;
}
* Need to ensure that there's a label binding for all nexthops.
* Otherwise, ECMP for this route could render the pseudowire unusable.
*/
- for (ALL_NEXTHOPS_RO(rib->nexthop, nexthop, tnexthop, recursing)) {
+ for (ALL_NEXTHOPS(re->ng, nexthop)) {
if (!nexthop->nh_label) {
if (IS_ZEBRA_DEBUG_PW)
- zlog_warn("%s: unlabeled route for %s",
- __func__, pw->ifname);
+ zlog_debug("%s: unlabeled route for %s",
+ __func__, pw->ifname);
return -1;
}
}
return 0;
}
-void zebra_pw_client_close(struct zserv *client)
+static int zebra_pw_client_close(struct zserv *client)
{
struct vrf *vrf;
struct zebra_vrf *zvrf;
struct zebra_pw *pw, *tmp;
- RB_FOREACH(vrf, vrf_id_head, &vrfs_by_id)
- {
+ RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) {
zvrf = vrf->info;
- RB_FOREACH_SAFE(pw, zebra_pw_head, &zvrf->pseudowires, tmp)
- {
+ RB_FOREACH_SAFE (pw, zebra_pw_head, &zvrf->pseudowires, tmp) {
if (pw->client != client)
continue;
zebra_pw_del(zvrf, pw);
}
}
+
+ return 0;
}
void zebra_pw_init(struct zebra_vrf *zvrf)
{
- RB_INIT(&zvrf->pseudowires);
- RB_INIT(&zvrf->static_pseudowires);
+ RB_INIT(zebra_pw_head, &zvrf->pseudowires);
+ RB_INIT(zebra_static_pw_head, &zvrf->static_pseudowires);
+
+ hook_register(zserv_client_close, zebra_pw_client_close);
}
void zebra_pw_exit(struct zebra_vrf *zvrf)
{
struct zebra_pw *pw;
- while ((pw = RB_ROOT(&zvrf->pseudowires)) != NULL)
+ while (!RB_EMPTY(zebra_pw_head, &zvrf->pseudowires)) {
+ pw = RB_ROOT(zebra_pw_head, &zvrf->pseudowires);
+
zebra_pw_del(zvrf, pw);
+ }
}
DEFUN_NOSH (pseudowire_if,
pseudowire_if_cmd,
- "[no] pseudowire IFNAME",
- NO_STR
+ "pseudowire IFNAME",
"Static pseudowire configuration\n"
"Pseudowire name\n")
{
struct zebra_vrf *zvrf;
struct zebra_pw *pw;
- int idx = 0;
const char *ifname;
+ int idx = 0;
zvrf = vrf_info_lookup(VRF_DEFAULT);
if (!zvrf)
argv_find(argv, argc, "IFNAME", &idx);
ifname = argv[idx]->arg;
+
pw = zebra_pw_find(zvrf, ifname);
if (pw && pw->protocol != ZEBRA_ROUTE_STATIC) {
- vty_out(vty, "%% Pseudowire is not static%s", VTY_NEWLINE);
+ vty_out(vty, "%% Pseudowire is not static\n");
return CMD_WARNING;
}
- if (argv_find(argv, argc, "no", &idx)) {
- if (!pw)
- return CMD_SUCCESS;
- zebra_pw_del(zvrf, pw);
- }
-
if (!pw)
pw = zebra_pw_add(zvrf, ifname, ZEBRA_ROUTE_STATIC, NULL);
VTY_PUSH_CONTEXT(PW_NODE, pw);
return CMD_SUCCESS;
}
+DEFUN (no_pseudowire_if,
+ no_pseudowire_if_cmd,
+ "no pseudowire IFNAME",
+ NO_STR
+ "Static pseudowire configuration\n"
+ "Pseudowire name\n")
+{
+ struct zebra_vrf *zvrf;
+ struct zebra_pw *pw;
+ const char *ifname;
+ int idx = 0;
+
+ zvrf = vrf_info_lookup(VRF_DEFAULT);
+ if (!zvrf)
+ return CMD_WARNING;
+
+ argv_find(argv, argc, "IFNAME", &idx);
+ ifname = argv[idx]->arg;
+
+ pw = zebra_pw_find(zvrf, ifname);
+ if (pw) {
+ if (pw->protocol != ZEBRA_ROUTE_STATIC) {
+ vty_out(vty, "%% Pseudowire is not static\n");
+ return CMD_WARNING;
+ }
+ zebra_pw_del(zvrf, pw);
+ }
+
+ return CMD_SUCCESS;
+}
+
DEFUN (pseudowire_labels,
pseudowire_labels_cmd,
"[no] mpls label local (16-1048575) remote (16-1048575)",
else if (inet_pton(AF_INET6, address, &nexthop.ipv6) == 1)
af = AF_INET6;
else {
- vty_out(vty, "%% Malformed address%s", VTY_NEWLINE);
+ vty_out(vty, "%% Malformed address\n");
return CMD_WARNING;
}
}
DEFUN (show_pseudowires,
show_pseudowires_cmd,
- "show pseudowires",
+ "show mpls pseudowires",
SHOW_STR
- "Pseudowires")
+ MPLS_STR
+ "Pseudowires\n")
{
struct zebra_vrf *zvrf;
struct zebra_pw *pw;
if (!zvrf)
return 0;
- vty_out(vty, "%-16s %-24s %-12s %-8s %-10s%s", "Interface", "Neighbor",
- "Labels", "Protocol", "Status", VTY_NEWLINE);
+ vty_out(vty, "%-16s %-24s %-12s %-8s %-10s\n", "Interface", "Neighbor",
+ "Labels", "Protocol", "Status");
- RB_FOREACH(pw, zebra_pw_head, &zvrf->pseudowires)
- {
+ RB_FOREACH (pw, zebra_pw_head, &zvrf->pseudowires) {
char buf_nbr[INET6_ADDRSTRLEN];
char buf_labels[64];
else
snprintf(buf_labels, sizeof(buf_labels), "-");
- vty_out(vty, "%-16s %-24s %-12s %-8s %-10s%s", pw->ifname,
+ vty_out(vty, "%-16s %-24s %-12s %-8s %-10s\n", pw->ifname,
(pw->af != AF_UNSPEC) ? buf_nbr : "-", buf_labels,
zebra_route_string(pw->protocol),
(zebra_pw_enabled(pw) && pw->status == PW_STATUS_UP)
? "UP"
- : "DOWN",
- VTY_NEWLINE);
+ : "DOWN");
}
return CMD_SUCCESS;
if (!zvrf)
return 0;
- RB_FOREACH(pw, zebra_static_pw_head, &zvrf->static_pseudowires)
- {
- vty_out(vty, "pseudowire %s%s", pw->ifname, VTY_NEWLINE);
+ RB_FOREACH (pw, zebra_static_pw_head, &zvrf->static_pseudowires) {
+ vty_out(vty, "pseudowire %s\n", pw->ifname);
if (pw->local_label != MPLS_NO_LABEL
&& pw->remote_label != MPLS_NO_LABEL)
- vty_out(vty, " mpls label local %u remote %u%s",
- pw->local_label, pw->remote_label, VTY_NEWLINE);
+ vty_out(vty, " mpls label local %u remote %u\n",
+ pw->local_label, pw->remote_label);
else
vty_out(vty,
" ! Incomplete config, specify the static "
- "MPLS labels%s",
- VTY_NEWLINE);
+ "MPLS labels\n");
if (pw->af != AF_UNSPEC) {
char buf[INET6_ADDRSTRLEN];
inet_ntop(pw->af, &pw->nexthop, buf, sizeof(buf));
- vty_out(vty, " neighbor %s%s", buf, VTY_NEWLINE);
+ vty_out(vty, " neighbor %s\n", buf);
} else
vty_out(vty,
" ! Incomplete config, specify a neighbor "
- "address%s",
- VTY_NEWLINE);
+ "address\n");
if (!(pw->flags & F_PSEUDOWIRE_CWORD))
- vty_out(vty, " control-word exclude%s", VTY_NEWLINE);
+ vty_out(vty, " control-word exclude\n");
- vty_out(vty, "!%s", VTY_NEWLINE);
+ vty_out(vty, "!\n");
write = 1;
}
install_default(PW_NODE);
install_element(CONFIG_NODE, &pseudowire_if_cmd);
+ install_element(CONFIG_NODE, &no_pseudowire_if_cmd);
install_element(PW_NODE, &pseudowire_labels_cmd);
install_element(PW_NODE, &pseudowire_neighbor_cmd);
install_element(PW_NODE, &pseudowire_control_word_cmd);
projects / mirror_frr.git / blobdiff