diff options
Diffstat (limited to 'ospfd/ospf_dump.c')
| -rw-r--r-- | ospfd/ospf_dump.c | 2497 |
1 files changed, 1213 insertions, 1284 deletions
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index f233f79c00..c0670012b8 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -63,574 +63,539 @@ unsigned long term_debug_ospf_nssa = 0; unsigned long term_debug_ospf_te = 0; -const char * -ospf_redist_string(u_int route_type) +const char *ospf_redist_string(u_int route_type) { - return (route_type == ZEBRA_ROUTE_MAX) ? - "Default" : zebra_route_string(route_type); + return (route_type == ZEBRA_ROUTE_MAX) ? "Default" + : zebra_route_string(route_type); } #define OSPF_AREA_STRING_MAXLEN 16 -const char * -ospf_area_name_string (struct ospf_area *area) +const char *ospf_area_name_string(struct ospf_area *area) { - static char buf[OSPF_AREA_STRING_MAXLEN] = ""; - u_int32_t area_id; + static char buf[OSPF_AREA_STRING_MAXLEN] = ""; + u_int32_t area_id; - if (!area) - return "-"; + if (!area) + return "-"; - area_id = ntohl (area->area_id.s_addr); - snprintf (buf, OSPF_AREA_STRING_MAXLEN, "%d.%d.%d.%d", - (area_id >> 24) & 0xff, (area_id >> 16) & 0xff, - (area_id >> 8) & 0xff, area_id & 0xff); - return buf; + area_id = ntohl(area->area_id.s_addr); + snprintf(buf, OSPF_AREA_STRING_MAXLEN, "%d.%d.%d.%d", + (area_id >> 24) & 0xff, (area_id >> 16) & 0xff, + (area_id >> 8) & 0xff, area_id & 0xff); + return buf; } #define OSPF_AREA_DESC_STRING_MAXLEN 23 -const char * -ospf_area_desc_string (struct ospf_area *area) +const char *ospf_area_desc_string(struct ospf_area *area) { - static char buf[OSPF_AREA_DESC_STRING_MAXLEN] = ""; - u_char type; - - if (!area) - return "(incomplete)"; - - type = area->external_routing; - switch (type) - { - case OSPF_AREA_NSSA: - snprintf (buf, OSPF_AREA_DESC_STRING_MAXLEN, "%s [NSSA]", - ospf_area_name_string (area)); - break; - case OSPF_AREA_STUB: - snprintf (buf, OSPF_AREA_DESC_STRING_MAXLEN, "%s [Stub]", - ospf_area_name_string (area)); - break; - default: - return ospf_area_name_string (area); - } - - return buf; + static char buf[OSPF_AREA_DESC_STRING_MAXLEN] = ""; + u_char type; + + if (!area) + return "(incomplete)"; + + type = area->external_routing; + switch (type) { + case OSPF_AREA_NSSA: + snprintf(buf, OSPF_AREA_DESC_STRING_MAXLEN, "%s [NSSA]", + ospf_area_name_string(area)); + break; + case OSPF_AREA_STUB: + snprintf(buf, OSPF_AREA_DESC_STRING_MAXLEN, "%s [Stub]", + ospf_area_name_string(area)); + break; + default: + return ospf_area_name_string(area); + } + + return buf; } #define OSPF_IF_STRING_MAXLEN 40 -const char * -ospf_if_name_string (struct ospf_interface *oi) +const char *ospf_if_name_string(struct ospf_interface *oi) { - static char buf[OSPF_IF_STRING_MAXLEN] = ""; - u_int32_t ifaddr; + static char buf[OSPF_IF_STRING_MAXLEN] = ""; + u_int32_t ifaddr; - if (!oi || !oi->address) - return "inactive"; + if (!oi || !oi->address) + return "inactive"; - if (oi->type == OSPF_IFTYPE_VIRTUALLINK) - return oi->ifp->name; + if (oi->type == OSPF_IFTYPE_VIRTUALLINK) + return oi->ifp->name; - ifaddr = ntohl (oi->address->u.prefix4.s_addr); - snprintf (buf, OSPF_IF_STRING_MAXLEN, - "%s:%d.%d.%d.%d", oi->ifp->name, - (ifaddr >> 24) & 0xff, (ifaddr >> 16) & 0xff, - (ifaddr >> 8) & 0xff, ifaddr & 0xff); - return buf; + ifaddr = ntohl(oi->address->u.prefix4.s_addr); + snprintf(buf, OSPF_IF_STRING_MAXLEN, "%s:%d.%d.%d.%d", oi->ifp->name, + (ifaddr >> 24) & 0xff, (ifaddr >> 16) & 0xff, + (ifaddr >> 8) & 0xff, ifaddr & 0xff); + return buf; } -void -ospf_nbr_state_message (struct ospf_neighbor *nbr, char *buf, size_t size) +void ospf_nbr_state_message(struct ospf_neighbor *nbr, char *buf, size_t size) { - int state; - struct ospf_interface *oi = nbr->oi; + int state; + struct ospf_interface *oi = nbr->oi; - if (IPV4_ADDR_SAME (&DR (oi), &nbr->address.u.prefix4)) - state = ISM_DR; - else if (IPV4_ADDR_SAME (&BDR (oi), &nbr->address.u.prefix4)) - state = ISM_Backup; - else - state = ISM_DROther; + if (IPV4_ADDR_SAME(&DR(oi), &nbr->address.u.prefix4)) + state = ISM_DR; + else if (IPV4_ADDR_SAME(&BDR(oi), &nbr->address.u.prefix4)) + state = ISM_Backup; + else + state = ISM_DROther; - memset (buf, 0, size); + memset(buf, 0, size); - snprintf (buf, size, "%s/%s", - lookup_msg(ospf_nsm_state_msg, nbr->state, NULL), - lookup_msg(ospf_ism_state_msg, state, NULL)); + snprintf(buf, size, "%s/%s", + lookup_msg(ospf_nsm_state_msg, nbr->state, NULL), + lookup_msg(ospf_ism_state_msg, state, NULL)); } -const char * -ospf_timeval_dump (struct timeval *t, char *buf, size_t size) +const char *ospf_timeval_dump(struct timeval *t, char *buf, size_t size) { - /* Making formatted timer strings. */ +/* Making formatted timer strings. */ #define MINUTE_IN_SECONDS 60 #define HOUR_IN_SECONDS (60*MINUTE_IN_SECONDS) #define DAY_IN_SECONDS (24*HOUR_IN_SECONDS) #define WEEK_IN_SECONDS (7*DAY_IN_SECONDS) - unsigned long w, d, h, m, s, ms, us; - - if (!t) - return "inactive"; - - w = d = h = m = s = ms = us = 0; - memset (buf, 0, size); - - us = t->tv_usec; - if (us >= 1000) - { - ms = us / 1000; - us %= 1000; - } - - if (ms >= 1000) - { - t->tv_sec += ms / 1000; - ms %= 1000; - } - - if (t->tv_sec > WEEK_IN_SECONDS) - { - w = t->tv_sec / WEEK_IN_SECONDS; - t->tv_sec -= w * WEEK_IN_SECONDS; - } - - if (t->tv_sec > DAY_IN_SECONDS) - { - d = t->tv_sec / DAY_IN_SECONDS; - t->tv_sec -= d * DAY_IN_SECONDS; - } - - if (t->tv_sec >= HOUR_IN_SECONDS) - { - h = t->tv_sec / HOUR_IN_SECONDS; - t->tv_sec -= h * HOUR_IN_SECONDS; - } - - if (t->tv_sec >= MINUTE_IN_SECONDS) - { - m = t->tv_sec / MINUTE_IN_SECONDS; - t->tv_sec -= m * MINUTE_IN_SECONDS; - } - - if (w > 99) - snprintf (buf, size, "%ldw%1ldd", w, d); - else if (w) - snprintf (buf, size, "%ldw%1ldd%02ldh", w, d, h); - else if (d) - snprintf (buf, size, "%1ldd%02ldh%02ldm", d, h, m); - else if (h) - snprintf (buf, size, "%ldh%02ldm%02lds", h, m, (long)t->tv_sec); - else if (m) - snprintf (buf, size, "%ldm%02lds", m, (long)t->tv_sec); - else if (ms) - snprintf (buf, size, "%ld.%03lds", (long)t->tv_sec, ms); - else - snprintf (buf, size, "%ld usecs", (long)t->tv_usec); - - return buf; + unsigned long w, d, h, m, s, ms, us; + + if (!t) + return "inactive"; + + w = d = h = m = s = ms = us = 0; + memset(buf, 0, size); + + us = t->tv_usec; + if (us >= 1000) { + ms = us / 1000; + us %= 1000; + } + + if (ms >= 1000) { + t->tv_sec += ms / 1000; + ms %= 1000; + } + + if (t->tv_sec > WEEK_IN_SECONDS) { + w = t->tv_sec / WEEK_IN_SECONDS; + t->tv_sec -= w * WEEK_IN_SECONDS; + } + + if (t->tv_sec > DAY_IN_SECONDS) { + d = t->tv_sec / DAY_IN_SECONDS; + t->tv_sec -= d * DAY_IN_SECONDS; + } + + if (t->tv_sec >= HOUR_IN_SECONDS) { + h = t->tv_sec / HOUR_IN_SECONDS; + t->tv_sec -= h * HOUR_IN_SECONDS; + } + + if (t->tv_sec >= MINUTE_IN_SECONDS) { + m = t->tv_sec / MINUTE_IN_SECONDS; + t->tv_sec -= m * MINUTE_IN_SECONDS; + } + + if (w > 99) + snprintf(buf, size, "%ldw%1ldd", w, d); + else if (w) + snprintf(buf, size, "%ldw%1ldd%02ldh", w, d, h); + else if (d) + snprintf(buf, size, "%1ldd%02ldh%02ldm", d, h, m); + else if (h) + snprintf(buf, size, "%ldh%02ldm%02lds", h, m, (long)t->tv_sec); + else if (m) + snprintf(buf, size, "%ldm%02lds", m, (long)t->tv_sec); + else if (ms) + snprintf(buf, size, "%ld.%03lds", (long)t->tv_sec, ms); + else + snprintf(buf, size, "%ld usecs", (long)t->tv_usec); + + return buf; } -const char * -ospf_timer_dump (struct thread *t, char *buf, size_t size) +const char *ospf_timer_dump(struct thread *t, char *buf, size_t size) { - struct timeval result; - if (!t) - return "inactive"; + struct timeval result; + if (!t) + return "inactive"; - monotime_until (&t->u.sands, &result); - return ospf_timeval_dump (&result, buf, size); + monotime_until(&t->u.sands, &result); + return ospf_timeval_dump(&result, buf, size); } -static void -ospf_packet_hello_dump (struct stream *s, u_int16_t length) +static void ospf_packet_hello_dump(struct stream *s, u_int16_t length) { - struct ospf_hello *hello; - int i; - - hello = (struct ospf_hello *) STREAM_PNT (s); - - zlog_debug ("Hello"); - zlog_debug (" NetworkMask %s", inet_ntoa (hello->network_mask)); - zlog_debug (" HelloInterval %d", ntohs (hello->hello_interval)); - zlog_debug (" Options %d (%s)", hello->options, - ospf_options_dump (hello->options)); - zlog_debug (" RtrPriority %d", hello->priority); - zlog_debug (" RtrDeadInterval %ld", (u_long)ntohl (hello->dead_interval)); - zlog_debug (" DRouter %s", inet_ntoa (hello->d_router)); - zlog_debug (" BDRouter %s", inet_ntoa (hello->bd_router)); - - length -= OSPF_HEADER_SIZE + OSPF_HELLO_MIN_SIZE; - zlog_debug (" # Neighbors %d", length / 4); - for (i = 0; length > 0; i++, length -= sizeof (struct in_addr)) - zlog_debug (" Neighbor %s", inet_ntoa (hello->neighbors[i])); + struct ospf_hello *hello; + int i; + + hello = (struct ospf_hello *)STREAM_PNT(s); + + zlog_debug("Hello"); + zlog_debug(" NetworkMask %s", inet_ntoa(hello->network_mask)); + zlog_debug(" HelloInterval %d", ntohs(hello->hello_interval)); + zlog_debug(" Options %d (%s)", hello->options, + ospf_options_dump(hello->options)); + zlog_debug(" RtrPriority %d", hello->priority); + zlog_debug(" RtrDeadInterval %ld", + (u_long)ntohl(hello->dead_interval)); + zlog_debug(" DRouter %s", inet_ntoa(hello->d_router)); + zlog_debug(" BDRouter %s", inet_ntoa(hello->bd_router)); + + length -= OSPF_HEADER_SIZE + OSPF_HELLO_MIN_SIZE; + zlog_debug(" # Neighbors %d", length / 4); + for (i = 0; length > 0; i++, length -= sizeof(struct in_addr)) + zlog_debug(" Neighbor %s", inet_ntoa(hello->neighbors[i])); } -static char * -ospf_dd_flags_dump (u_char flags, char *buf, size_t size) +static char *ospf_dd_flags_dump(u_char flags, char *buf, size_t size) { - memset (buf, 0, size); + memset(buf, 0, size); - snprintf (buf, size, "%s|%s|%s", - (flags & OSPF_DD_FLAG_I) ? "I" : "-", - (flags & OSPF_DD_FLAG_M) ? "M" : "-", - (flags & OSPF_DD_FLAG_MS) ? "MS" : "-"); + snprintf(buf, size, "%s|%s|%s", (flags & OSPF_DD_FLAG_I) ? "I" : "-", + (flags & OSPF_DD_FLAG_M) ? "M" : "-", + (flags & OSPF_DD_FLAG_MS) ? "MS" : "-"); - return buf; + return buf; } -static char * -ospf_router_lsa_flags_dump (u_char flags, char *buf, size_t size) +static char *ospf_router_lsa_flags_dump(u_char flags, char *buf, size_t size) { - memset (buf, 0, size); + memset(buf, 0, size); - snprintf (buf, size, "%s|%s|%s", - (flags & ROUTER_LSA_VIRTUAL) ? "V" : "-", - (flags & ROUTER_LSA_EXTERNAL) ? "E" : "-", - (flags & ROUTER_LSA_BORDER) ? "B" : "-"); + snprintf(buf, size, "%s|%s|%s", + (flags & ROUTER_LSA_VIRTUAL) ? "V" : "-", + (flags & ROUTER_LSA_EXTERNAL) ? "E" : "-", + (flags & ROUTER_LSA_BORDER) ? "B" : "-"); - return buf; + return buf; } -static void -ospf_router_lsa_dump (struct stream *s, u_int16_t length) +static void ospf_router_lsa_dump(struct stream *s, u_int16_t length) { - char buf[BUFSIZ]; - struct router_lsa *rl; - int i, len; - - rl = (struct router_lsa *) STREAM_PNT (s); - - zlog_debug (" Router-LSA"); - zlog_debug (" flags %s", - ospf_router_lsa_flags_dump (rl->flags, buf, BUFSIZ)); - zlog_debug (" # links %d", ntohs (rl->links)); - - len = ntohs (rl->header.length) - OSPF_LSA_HEADER_SIZE - 4; - for (i = 0; len > 0; i++) - { - zlog_debug (" Link ID %s", inet_ntoa (rl->link[i].link_id)); - zlog_debug (" Link Data %s", inet_ntoa (rl->link[i].link_data)); - zlog_debug (" Type %d", (u_char) rl->link[i].type); - zlog_debug (" TOS %d", (u_char) rl->link[i].tos); - zlog_debug (" metric %d", ntohs (rl->link[i].metric)); - - len -= 12; - } + char buf[BUFSIZ]; + struct router_lsa *rl; + int i, len; + + rl = (struct router_lsa *)STREAM_PNT(s); + + zlog_debug(" Router-LSA"); + zlog_debug(" flags %s", + ospf_router_lsa_flags_dump(rl->flags, buf, BUFSIZ)); + zlog_debug(" # links %d", ntohs(rl->links)); + + len = ntohs(rl->header.length) - OSPF_LSA_HEADER_SIZE - 4; + for (i = 0; len > 0; i++) { + zlog_debug(" Link ID %s", inet_ntoa(rl->link[i].link_id)); + zlog_debug(" Link Data %s", + inet_ntoa(rl->link[i].link_data)); + zlog_debug(" Type %d", (u_char)rl->link[i].type); + zlog_debug(" TOS %d", (u_char)rl->link[i].tos); + zlog_debug(" metric %d", ntohs(rl->link[i].metric)); + + len -= 12; + } } -static void -ospf_network_lsa_dump (struct stream *s, u_int16_t length) +static void ospf_network_lsa_dump(struct stream *s, u_int16_t length) { - struct network_lsa *nl; - int i, cnt; - - nl = (struct network_lsa *) STREAM_PNT (s); - cnt = (ntohs (nl->header.length) - (OSPF_LSA_HEADER_SIZE + 4)) / 4; - - zlog_debug (" Network-LSA"); - /* - zlog_debug ("LSA total size %d", ntohs (nl->header.length)); - zlog_debug ("Network-LSA size %d", - ntohs (nl->header.length) - OSPF_LSA_HEADER_SIZE); - */ - zlog_debug (" Network Mask %s", inet_ntoa (nl->mask)); - zlog_debug (" # Attached Routers %d", cnt); - for (i = 0; i < cnt; i++) - zlog_debug (" Attached Router %s", inet_ntoa (nl->routers[i])); + struct network_lsa *nl; + int i, cnt; + + nl = (struct network_lsa *)STREAM_PNT(s); + cnt = (ntohs(nl->header.length) - (OSPF_LSA_HEADER_SIZE + 4)) / 4; + + zlog_debug(" Network-LSA"); + /* + zlog_debug ("LSA total size %d", ntohs (nl->header.length)); + zlog_debug ("Network-LSA size %d", + ntohs (nl->header.length) - OSPF_LSA_HEADER_SIZE); + */ + zlog_debug(" Network Mask %s", inet_ntoa(nl->mask)); + zlog_debug(" # Attached Routers %d", cnt); + for (i = 0; i < cnt; i++) + zlog_debug(" Attached Router %s", + inet_ntoa(nl->routers[i])); } -static void -ospf_summary_lsa_dump (struct stream *s, u_int16_t length) +static void ospf_summary_lsa_dump(struct stream *s, u_int16_t length) { - struct summary_lsa *sl; - int size; - int i; + struct summary_lsa *sl; + int size; + int i; - sl = (struct summary_lsa *) STREAM_PNT (s); + sl = (struct summary_lsa *)STREAM_PNT(s); - zlog_debug (" Summary-LSA"); - zlog_debug (" Network Mask %s", inet_ntoa (sl->mask)); + zlog_debug(" Summary-LSA"); + zlog_debug(" Network Mask %s", inet_ntoa(sl->mask)); - size = ntohs (sl->header.length) - OSPF_LSA_HEADER_SIZE - 4; - for (i = 0; size > 0; size -= 4, i++) - zlog_debug (" TOS=%d metric %d", sl->tos, - GET_METRIC (sl->metric)); + size = ntohs(sl->header.length) - OSPF_LSA_HEADER_SIZE - 4; + for (i = 0; size > 0; size -= 4, i++) + zlog_debug(" TOS=%d metric %d", sl->tos, + GET_METRIC(sl->metric)); } -static void -ospf_as_external_lsa_dump (struct stream *s, u_int16_t length) +static void ospf_as_external_lsa_dump(struct stream *s, u_int16_t length) { - struct as_external_lsa *al; - int size; - int i; - - al = (struct as_external_lsa *) STREAM_PNT (s); - zlog_debug (" %s", ospf_lsa_type_msg[al->header.type].str); - zlog_debug (" Network Mask %s", inet_ntoa (al->mask)); - - size = ntohs (al->header.length) - OSPF_LSA_HEADER_SIZE -4; - for (i = 0; size > 0; size -= 12, i++) - { - zlog_debug (" bit %s TOS=%d metric %d", - IS_EXTERNAL_METRIC (al->e[i].tos) ? "E" : "-", - al->e[i].tos & 0x7f, GET_METRIC (al->e[i].metric)); - zlog_debug (" Forwarding address %s", inet_ntoa (al->e[i].fwd_addr)); - zlog_debug (" External Route Tag %"ROUTE_TAG_PRI, al->e[i].route_tag); - } + struct as_external_lsa *al; + int size; + int i; + + al = (struct as_external_lsa *)STREAM_PNT(s); + zlog_debug(" %s", ospf_lsa_type_msg[al->header.type].str); + zlog_debug(" Network Mask %s", inet_ntoa(al->mask)); + + size = ntohs(al->header.length) - OSPF_LSA_HEADER_SIZE - 4; + for (i = 0; size > 0; size -= 12, i++) { + zlog_debug(" bit %s TOS=%d metric %d", + IS_EXTERNAL_METRIC(al->e[i].tos) ? "E" : "-", + al->e[i].tos & 0x7f, GET_METRIC(al->e[i].metric)); + zlog_debug(" Forwarding address %s", + inet_ntoa(al->e[i].fwd_addr)); + zlog_debug(" External Route Tag %" ROUTE_TAG_PRI, + al->e[i].route_tag); + } } -static void -ospf_lsa_header_list_dump (struct stream *s, u_int16_t length) +static void ospf_lsa_header_list_dump(struct stream *s, u_int16_t length) { - struct lsa_header *lsa; + struct lsa_header *lsa; - zlog_debug (" # LSA Headers %d", length / OSPF_LSA_HEADER_SIZE); + zlog_debug(" # LSA Headers %d", length / OSPF_LSA_HEADER_SIZE); - /* LSA Headers. */ - while (length > 0) - { - lsa = (struct lsa_header *) STREAM_PNT (s); - ospf_lsa_header_dump (lsa); + /* LSA Headers. */ + while (length > 0) { + lsa = (struct lsa_header *)STREAM_PNT(s); + ospf_lsa_header_dump(lsa); - stream_forward_getp (s, OSPF_LSA_HEADER_SIZE); - length -= OSPF_LSA_HEADER_SIZE; - } + stream_forward_getp(s, OSPF_LSA_HEADER_SIZE); + length -= OSPF_LSA_HEADER_SIZE; + } } -static void -ospf_packet_db_desc_dump (struct stream *s, u_int16_t length) +static void ospf_packet_db_desc_dump(struct stream *s, u_int16_t length) { - struct ospf_db_desc *dd; - char dd_flags[8]; + struct ospf_db_desc *dd; + char dd_flags[8]; - u_int32_t gp; + u_int32_t gp; - gp = stream_get_getp (s); - dd = (struct ospf_db_desc *) STREAM_PNT (s); + gp = stream_get_getp(s); + dd = (struct ospf_db_desc *)STREAM_PNT(s); - zlog_debug ("Database Description"); - zlog_debug (" Interface MTU %d", ntohs (dd->mtu)); - zlog_debug (" Options %d (%s)", dd->options, - ospf_options_dump (dd->options)); - zlog_debug (" Flags %d (%s)", dd->flags, - ospf_dd_flags_dump (dd->flags, dd_flags, sizeof dd_flags)); - zlog_debug (" Sequence Number 0x%08lx", (u_long)ntohl (dd->dd_seqnum)); + zlog_debug("Database Description"); + zlog_debug(" Interface MTU %d", ntohs(dd->mtu)); + zlog_debug(" Options %d (%s)", dd->options, + ospf_options_dump(dd->options)); + zlog_debug(" Flags %d (%s)", dd->flags, + ospf_dd_flags_dump(dd->flags, dd_flags, sizeof dd_flags)); + zlog_debug(" Sequence Number 0x%08lx", (u_long)ntohl(dd->dd_seqnum)); - length -= OSPF_HEADER_SIZE + OSPF_DB_DESC_MIN_SIZE; + length -= OSPF_HEADER_SIZE + OSPF_DB_DESC_MIN_SIZE; - stream_forward_getp (s, OSPF_DB_DESC_MIN_SIZE); + stream_forward_getp(s, OSPF_DB_DESC_MIN_SIZE); - ospf_lsa_header_list_dump (s, length); + ospf_lsa_header_list_dump(s, length); - stream_set_getp (s, gp); + stream_set_getp(s, gp); } -static void -ospf_packet_ls_req_dump (struct stream *s, u_int16_t length) +static void ospf_packet_ls_req_dump(struct stream *s, u_int16_t length) { - u_int32_t sp; - u_int32_t ls_type; - struct in_addr ls_id; - struct in_addr adv_router; + u_int32_t sp; + u_int32_t ls_type; + struct in_addr ls_id; + struct in_addr adv_router; - sp = stream_get_getp (s); + sp = stream_get_getp(s); - length -= OSPF_HEADER_SIZE; + length -= OSPF_HEADER_SIZE; - zlog_debug ("Link State Request"); - zlog_debug (" # Requests %d", length / 12); + zlog_debug("Link State Request"); + zlog_debug(" # Requests %d", length / 12); - for (; length > 0; length -= 12) - { - ls_type = stream_getl (s); - ls_id.s_addr = stream_get_ipv4 (s); - adv_router.s_addr = stream_get_ipv4 (s); + for (; length > 0; length -= 12) { + ls_type = stream_getl(s); + ls_id.s_addr = stream_get_ipv4(s); + adv_router.s_addr = stream_get_ipv4(s); - zlog_debug (" LS type %d", ls_type); - zlog_debug (" Link State ID %s", inet_ntoa (ls_id)); - zlog_debug (" Advertising Router %s", - inet_ntoa (adv_router)); - } + zlog_debug(" LS type %d", ls_type); + zlog_debug(" Link State ID %s", inet_ntoa(ls_id)); + zlog_debug(" Advertising Router %s", inet_ntoa(adv_router)); + } - stream_set_getp (s, sp); + stream_set_getp(s, sp); } -static void -ospf_packet_ls_upd_dump (struct stream *s, u_int16_t length) +static void ospf_packet_ls_upd_dump(struct stream *s, u_int16_t length) { - u_int32_t sp; - struct lsa_header *lsa; - int lsa_len; - u_int32_t count; - - length -= OSPF_HEADER_SIZE; - - sp = stream_get_getp (s); - - count = stream_getl (s); - length -= 4; - - zlog_debug ("Link State Update"); - zlog_debug (" # LSAs %d", count); - - while (length > 0 && count > 0) - { - if (length < OSPF_HEADER_SIZE || length % 4 != 0) - { - zlog_debug (" Remaining %d bytes; Incorrect length.", length); - break; + u_int32_t sp; + struct lsa_header *lsa; + int lsa_len; + u_int32_t count; + + length -= OSPF_HEADER_SIZE; + + sp = stream_get_getp(s); + + count = stream_getl(s); + length -= 4; + + zlog_debug("Link State Update"); + zlog_debug(" # LSAs %d", count); + + while (length > 0 && count > 0) { + if (length < OSPF_HEADER_SIZE || length % 4 != 0) { + zlog_debug(" Remaining %d bytes; Incorrect length.", + length); + break; + } + + lsa = (struct lsa_header *)STREAM_PNT(s); + lsa_len = ntohs(lsa->length); + ospf_lsa_header_dump(lsa); + + switch (lsa->type) { + case OSPF_ROUTER_LSA: + ospf_router_lsa_dump(s, length); + break; + case OSPF_NETWORK_LSA: + ospf_network_lsa_dump(s, length); + break; + case OSPF_SUMMARY_LSA: + case OSPF_ASBR_SUMMARY_LSA: + ospf_summary_lsa_dump(s, length); + break; + case OSPF_AS_EXTERNAL_LSA: + ospf_as_external_lsa_dump(s, length); + break; + case OSPF_AS_NSSA_LSA: + ospf_as_external_lsa_dump(s, length); + break; + case OSPF_OPAQUE_LINK_LSA: + case OSPF_OPAQUE_AREA_LSA: + case OSPF_OPAQUE_AS_LSA: + ospf_opaque_lsa_dump(s, length); + break; + default: + break; + } + + stream_forward_getp(s, lsa_len); + length -= lsa_len; + count--; } - lsa = (struct lsa_header *) STREAM_PNT (s); - lsa_len = ntohs (lsa->length); - ospf_lsa_header_dump (lsa); - - switch (lsa->type) - { - case OSPF_ROUTER_LSA: - ospf_router_lsa_dump (s, length); - break; - case OSPF_NETWORK_LSA: - ospf_network_lsa_dump (s, length); - break; - case OSPF_SUMMARY_LSA: - case OSPF_ASBR_SUMMARY_LSA: - ospf_summary_lsa_dump (s, length); - break; - case OSPF_AS_EXTERNAL_LSA: - ospf_as_external_lsa_dump (s, length); - break; - case OSPF_AS_NSSA_LSA: - ospf_as_external_lsa_dump (s, length); - break; - case OSPF_OPAQUE_LINK_LSA: - case OSPF_OPAQUE_AREA_LSA: - case OSPF_OPAQUE_AS_LSA: - ospf_opaque_lsa_dump (s, length); - break; - default: - break; - } - - stream_forward_getp (s, lsa_len); - length -= lsa_len; - count--; - } - - stream_set_getp (s, sp); + stream_set_getp(s, sp); } -static void -ospf_packet_ls_ack_dump (struct stream *s, u_int16_t length) +static void ospf_packet_ls_ack_dump(struct stream *s, u_int16_t length) { - u_int32_t sp; + u_int32_t sp; - length -= OSPF_HEADER_SIZE; - sp = stream_get_getp (s); + length -= OSPF_HEADER_SIZE; + sp = stream_get_getp(s); - zlog_debug ("Link State Acknowledgment"); - ospf_lsa_header_list_dump (s, length); + zlog_debug("Link State Acknowledgment"); + ospf_lsa_header_list_dump(s, length); - stream_set_getp (s, sp); + stream_set_getp(s, sp); } /* Expects header to be in host order */ -void -ospf_ip_header_dump (struct ip *iph) +void ospf_ip_header_dump(struct ip *iph) { - /* IP Header dump. */ - zlog_debug ("ip_v %d", iph->ip_v); - zlog_debug ("ip_hl %d", iph->ip_hl); - zlog_debug ("ip_tos %d", iph->ip_tos); - zlog_debug ("ip_len %d", iph->ip_len); - zlog_debug ("ip_id %u", (u_int32_t) iph->ip_id); - zlog_debug ("ip_off %u", (u_int32_t) iph->ip_off); - zlog_debug ("ip_ttl %d", iph->ip_ttl); - zlog_debug ("ip_p %d", iph->ip_p); - zlog_debug ("ip_sum 0x%x", (u_int32_t) iph->ip_sum); - zlog_debug ("ip_src %s", inet_ntoa (iph->ip_src)); - zlog_debug ("ip_dst %s", inet_ntoa (iph->ip_dst)); + /* IP Header dump. */ + zlog_debug("ip_v %d", iph->ip_v); + zlog_debug("ip_hl %d", iph->ip_hl); + zlog_debug("ip_tos %d", iph->ip_tos); + zlog_debug("ip_len %d", iph->ip_len); + zlog_debug("ip_id %u", (u_int32_t)iph->ip_id); + zlog_debug("ip_off %u", (u_int32_t)iph->ip_off); + zlog_debug("ip_ttl %d", iph->ip_ttl); + zlog_debug("ip_p %d", iph->ip_p); + zlog_debug("ip_sum 0x%x", (u_int32_t)iph->ip_sum); + zlog_debug("ip_src %s", inet_ntoa(iph->ip_src)); + zlog_debug("ip_dst %s", inet_ntoa(iph->ip_dst)); } -static void -ospf_header_dump (struct ospf_header *ospfh) +static void ospf_header_dump(struct ospf_header *ospfh) { - char buf[9]; - u_int16_t auth_type = ntohs (ospfh->auth_type); - - zlog_debug ("Header"); - zlog_debug (" Version %d", ospfh->version); - zlog_debug (" Type %d (%s)", ospfh->type, - lookup_msg(ospf_packet_type_str, ospfh->type, NULL)); - zlog_debug (" Packet Len %d", ntohs (ospfh->length)); - zlog_debug (" Router ID %s", inet_ntoa (ospfh->router_id)); - zlog_debug (" Area ID %s", inet_ntoa (ospfh->area_id)); - zlog_debug (" Checksum 0x%x", ntohs (ospfh->checksum)); - zlog_debug (" AuType %s", lookup_msg(ospf_auth_type_str, auth_type, NULL)); - - switch (auth_type) - { - case OSPF_AUTH_NULL: - break; - case OSPF_AUTH_SIMPLE: - memset (buf, 0, 9); - strncpy (buf, (char *) ospfh->u.auth_data, 8); - zlog_debug (" Simple Password %s", buf); - break; - case OSPF_AUTH_CRYPTOGRAPHIC: - zlog_debug (" Cryptographic Authentication"); - zlog_debug (" Key ID %d", ospfh->u.crypt.key_id); - zlog_debug (" Auth Data Len %d", ospfh->u.crypt.auth_data_len); - zlog_debug (" Sequence number %ld", - (u_long)ntohl (ospfh->u.crypt.crypt_seqnum)); - break; - default: - zlog_debug ("* This is not supported authentication type"); - break; - } - + char buf[9]; + u_int16_t auth_type = ntohs(ospfh->auth_type); + + zlog_debug("Header"); + zlog_debug(" Version %d", ospfh->version); + zlog_debug(" Type %d (%s)", ospfh->type, + lookup_msg(ospf_packet_type_str, ospfh->type, NULL)); + zlog_debug(" Packet Len %d", ntohs(ospfh->length)); + zlog_debug(" Router ID %s", inet_ntoa(ospfh->router_id)); + zlog_debug(" Area ID %s", inet_ntoa(ospfh->area_id)); + zlog_debug(" Checksum 0x%x", ntohs(ospfh->checksum)); + zlog_debug(" AuType %s", + lookup_msg(ospf_auth_type_str, auth_type, NULL)); + + switch (auth_type) { + case OSPF_AUTH_NULL: + break; + case OSPF_AUTH_SIMPLE: + memset(buf, 0, 9); + strncpy(buf, (char *)ospfh->u.auth_data, 8); + zlog_debug(" Simple Password %s", buf); + break; + case OSPF_AUTH_CRYPTOGRAPHIC: + zlog_debug(" Cryptographic Authentication"); + zlog_debug(" Key ID %d", ospfh->u.crypt.key_id); + zlog_debug(" Auth Data Len %d", ospfh->u.crypt.auth_data_len); + zlog_debug(" Sequence number %ld", + (u_long)ntohl(ospfh->u.crypt.crypt_seqnum)); + break; + default: + zlog_debug("* This is not supported authentication type"); + break; + } } -void -ospf_packet_dump (struct stream *s) +void ospf_packet_dump(struct stream *s) { - struct ospf_header *ospfh; - unsigned long gp; - - /* Preserve pointer. */ - gp = stream_get_getp (s); - - /* OSPF Header dump. */ - ospfh = (struct ospf_header *) STREAM_PNT (s); - - /* Until detail flag is set, return. */ - if (!(term_debug_ospf_packet[ospfh->type - 1] & OSPF_DEBUG_DETAIL)) - return; - - /* Show OSPF header detail. */ - ospf_header_dump (ospfh); - stream_forward_getp (s, OSPF_HEADER_SIZE); - - switch (ospfh->type) - { - case OSPF_MSG_HELLO: - ospf_packet_hello_dump (s, ntohs (ospfh->length)); - break; - case OSPF_MSG_DB_DESC: - ospf_packet_db_desc_dump (s, ntohs (ospfh->length)); - break; - case OSPF_MSG_LS_REQ: - ospf_packet_ls_req_dump (s, ntohs (ospfh->length)); - break; - case OSPF_MSG_LS_UPD: - ospf_packet_ls_upd_dump (s, ntohs (ospfh->length)); - break; - case OSPF_MSG_LS_ACK: - ospf_packet_ls_ack_dump (s, ntohs (ospfh->length)); - break; - default: - break; - } - - stream_set_getp (s, gp); + struct ospf_header *ospfh; + unsigned long gp; + + /* Preserve pointer. */ + gp = stream_get_getp(s); + + /* OSPF Header dump. */ + ospfh = (struct ospf_header *)STREAM_PNT(s); + + /* Until detail flag is set, return. */ + if (!(term_debug_ospf_packet[ospfh->type - 1] & OSPF_DEBUG_DETAIL)) + return; + + /* Show OSPF header detail. */ + ospf_header_dump(ospfh); + stream_forward_getp(s, OSPF_HEADER_SIZE); + + switch (ospfh->type) { + case OSPF_MSG_HELLO: + ospf_packet_hello_dump(s, ntohs(ospfh->length)); + break; + case OSPF_MSG_DB_DESC: + ospf_packet_db_desc_dump(s, ntohs(ospfh->length)); + break; + case OSPF_MSG_LS_REQ: + ospf_packet_ls_req_dump(s, ntohs(ospfh->length)); + break; + case OSPF_MSG_LS_UPD: + ospf_packet_ls_upd_dump(s, ntohs(ospfh->length)); + break; + case OSPF_MSG_LS_ACK: + ospf_packet_ls_ack_dump(s, ntohs(ospfh->length)); + break; + default: + break; + } + + stream_set_getp(s, gp); } DEFUN (debug_ospf_packet, @@ -652,61 +617,60 @@ DEFUN (debug_ospf_packet, "Detail Information\n" "Detail Information\n") { - int inst = (argv[2]->type == RANGE_TKN) ? 1 : 0; - int detail = strmatch (argv[argc - 1]->text, "detail"); - int send = strmatch (argv[argc - (1+detail)]->text, "send"); - int recv = strmatch (argv[argc - (1+detail)]->text, "recv"); - char *packet = argv[3 + inst]->text; - - if (inst) // user passed instance ID - { - if (!ospf_lookup_instance (strtoul (argv[2]->arg, NULL, 10))) - return CMD_SUCCESS; - } - - int type = 0; - int flag = 0; - int i; - - /* Check packet type. */ - if (strmatch (packet, "hello")) - type = OSPF_DEBUG_HELLO; - else if (strmatch (packet, "dd")) - type = OSPF_DEBUG_DB_DESC; - else if (strmatch (packet, "ls-request")) - type = OSPF_DEBUG_LS_REQ; - else if (strmatch (packet, "ls-update")) - type = OSPF_DEBUG_LS_UPD; - else if (strmatch (packet, "ls-ack")) - type = OSPF_DEBUG_LS_ACK; - else if (strmatch (packet, "all")) - type = OSPF_DEBUG_ALL; - - /* Cases: - * (none) = send + recv - * detail = send + recv + detail - * recv = recv - * send = send - * recv detail = recv + detail - * send detail = send + detail - */ - if (!send && !recv) - send = recv = 1; - - flag |= (send) ? OSPF_DEBUG_SEND : 0; - flag |= (recv) ? OSPF_DEBUG_RECV : 0; - flag |= (detail) ? OSPF_DEBUG_DETAIL : 0; - - for (i = 0; i < 5; i++) - if (type & (0x01 << i)) - { - if (vty->node == CONFIG_NODE) - DEBUG_PACKET_ON (i, flag); - else - TERM_DEBUG_PACKET_ON (i, flag); - } + int inst = (argv[2]->type == RANGE_TKN) ? 1 : 0; + int detail = strmatch(argv[argc - 1]->text, "detail"); + int send = strmatch(argv[argc - (1 + detail)]->text, "send"); + int recv = strmatch(argv[argc - (1 + detail)]->text, "recv"); + char *packet = argv[3 + inst]->text; - return CMD_SUCCESS; + if (inst) // user passed instance ID + { + if (!ospf_lookup_instance(strtoul(argv[2]->arg, NULL, 10))) + return CMD_SUCCESS; + } + + int type = 0; + int flag = 0; + int i; + + /* Check packet type. */ + if (strmatch(packet, "hello")) + type = OSPF_DEBUG_HELLO; + else if (strmatch(packet, "dd")) + type = OSPF_DEBUG_DB_DESC; + else if (strmatch(packet, "ls-request")) + type = OSPF_DEBUG_LS_REQ; + else if (strmatch(packet, "ls-update")) + type = OSPF_DEBUG_LS_UPD; + else if (strmatch(packet, "ls-ack")) + type = OSPF_DEBUG_LS_ACK; + else if (strmatch(packet, "all")) + type = OSPF_DEBUG_ALL; + + /* Cases: + * (none) = send + recv + * detail = send + recv + detail + * recv = recv + * send = send + * recv detail = recv + detail + * send detail = send + detail + */ + if (!send && !recv) + send = recv = 1; + + flag |= (send) ? OSPF_DEBUG_SEND : 0; + flag |= (recv) ? OSPF_DEBUG_RECV : 0; + flag |= (detail) ? OSPF_DEBUG_DETAIL : 0; + + for (i = 0; i < 5; i++) + if (type & (0x01 << i)) { + if (vty->node == CONFIG_NODE) + DEBUG_PACKET_ON(i, flag); + else + TERM_DEBUG_PACKET_ON(i, flag); + } + + return CMD_SUCCESS; } DEFUN (no_debug_ospf_packet, @@ -729,68 +693,67 @@ DEFUN (no_debug_ospf_packet, "Detail Information\n" "Detail Information\n") { - int inst = (argv[3]->type == RANGE_TKN) ? 1 : 0; - int detail = strmatch (argv[argc - 1]->text, "detail"); - int send = strmatch (argv[argc - (1+detail)]->text, "send"); - int recv = strmatch (argv[argc - (1+detail)]->text, "recv"); - char *packet = argv[4 + inst]->text; - - if (inst) // user passed instance ID - { - if (!ospf_lookup_instance (strtoul (argv[3]->arg, NULL, 10))) - return CMD_SUCCESS; - } - - int type = 0; - int flag = 0; - int i; - - /* Check packet type. */ - if (strmatch (packet, "hello")) - type = OSPF_DEBUG_HELLO; - else if (strmatch (packet, "dd")) - type = OSPF_DEBUG_DB_DESC; - else if (strmatch (packet, "ls-request")) - type = OSPF_DEBUG_LS_REQ; - else if (strmatch (packet, "ls-update")) - type = OSPF_DEBUG_LS_UPD; - else if (strmatch (packet, "ls-ack")) - type = OSPF_DEBUG_LS_ACK; - else if (strmatch (packet, "all")) - type = OSPF_DEBUG_ALL; - - /* Cases: - * (none) = send + recv - * detail = send + recv + detail - * recv = recv - * send = send - * recv detail = recv + detail - * send detail = send + detail - */ - if (!send && !recv) - send = recv = 1; - - flag |= (send) ? OSPF_DEBUG_SEND : 0; - flag |= (recv) ? OSPF_DEBUG_RECV : 0; - flag |= (detail) ? OSPF_DEBUG_DETAIL : 0; - - for (i = 0; i < 5; i++) - if (type & (0x01 << i)) - { - if (vty->node == CONFIG_NODE) - DEBUG_PACKET_OFF (i, flag); - else - TERM_DEBUG_PACKET_OFF (i, flag); - } + int inst = (argv[3]->type == RANGE_TKN) ? 1 : 0; + int detail = strmatch(argv[argc - 1]->text, "detail"); + int send = strmatch(argv[argc - (1 + detail)]->text, "send"); + int recv = strmatch(argv[argc - (1 + detail)]->text, "recv"); + char *packet = argv[4 + inst]->text; + + if (inst) // user passed instance ID + { + if (!ospf_lookup_instance(strtoul(argv[3]->arg, NULL, 10))) + return CMD_SUCCESS; + } + + int type = 0; + int flag = 0; + int i; + + /* Check packet type. */ + if (strmatch(packet, "hello")) + type = OSPF_DEBUG_HELLO; + else if (strmatch(packet, "dd")) + type = OSPF_DEBUG_DB_DESC; + else if (strmatch(packet, "ls-request")) + type = OSPF_DEBUG_LS_REQ; + else if (strmatch(packet, "ls-update")) + type = OSPF_DEBUG_LS_UPD; + else if (strmatch(packet, "ls-ack")) + type = OSPF_DEBUG_LS_ACK; + else if (strmatch(packet, "all")) + type = OSPF_DEBUG_ALL; + + /* Cases: + * (none) = send + recv + * detail = send + recv + detail + * recv = recv + * send = send + * recv detail = recv + detail + * send detail = send + detail + */ + if (!send && !recv) + send = recv = 1; + + flag |= (send) ? OSPF_DEBUG_SEND : 0; + flag |= (recv) ? OSPF_DEBUG_RECV : 0; + flag |= (detail) ? OSPF_DEBUG_DETAIL : 0; + + for (i = 0; i < 5; i++) + if (type & (0x01 << i)) { + if (vty->node == CONFIG_NODE) + DEBUG_PACKET_OFF(i, flag); + else + TERM_DEBUG_PACKET_OFF(i, flag); + } #ifdef DEBUG - /* - for (i = 0; i < 5; i++) - zlog_debug ("flag[%d] = %d", i, ospf_debug_packet[i]); - */ +/* +for (i = 0; i < 5; i++) + zlog_debug ("flag[%d] = %d", i, ospf_debug_packet[i]); +*/ #endif /* DEBUG */ - return CMD_SUCCESS; + return CMD_SUCCESS; } DEFUN (debug_ospf_ism, @@ -804,46 +767,43 @@ DEFUN (debug_ospf_ism, "ISM Event Information\n" "ISM TImer Information\n") { - int inst = (argv[2]->type == RANGE_TKN); - char *dbgparam = (argc == 4 + inst) ? argv[argc - 1]->text : NULL; - - if (inst) // user passed instance ID - { - if (!ospf_lookup_instance (strtoul (argv[2]->arg, NULL, 10))) - return CMD_SUCCESS; - } - - if (vty->node == CONFIG_NODE) - { - if (!dbgparam) - DEBUG_ON (ism, ISM); - else + int inst = (argv[2]->type == RANGE_TKN); + char *dbgparam = (argc == 4 + inst) ? argv[argc - 1]->text : NULL; + + if (inst) // user passed instance ID { - if (strmatch (dbgparam, "status")) - DEBUG_ON (ism, ISM_STATUS); - else if (strmatch (dbgparam, "events")) - DEBUG_ON (ism, ISM_EVENTS); - else if (strmatch (dbgparam, "timers")) - DEBUG_ON (ism, ISM_TIMERS); + if (!ospf_lookup_instance(strtoul(argv[2]->arg, NULL, 10))) + return CMD_SUCCESS; } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (!dbgparam) - TERM_DEBUG_ON (ism, ISM); - else - { - if (strmatch (dbgparam, "status")) - TERM_DEBUG_ON (ism, ISM_STATUS); - else if (strmatch (dbgparam, "events")) - TERM_DEBUG_ON (ism, ISM_EVENTS); - else if (strmatch (dbgparam, "timers")) - TERM_DEBUG_ON (ism, ISM_TIMERS); - } - - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) { + if (!dbgparam) + DEBUG_ON(ism, ISM); + else { + if (strmatch(dbgparam, "status")) + DEBUG_ON(ism, ISM_STATUS); + else if (strmatch(dbgparam, "events")) + DEBUG_ON(ism, ISM_EVENTS); + else if (strmatch(dbgparam, "timers")) + DEBUG_ON(ism, ISM_TIMERS); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (!dbgparam) + TERM_DEBUG_ON(ism, ISM); + else { + if (strmatch(dbgparam, "status")) + TERM_DEBUG_ON(ism, ISM_STATUS); + else if (strmatch(dbgparam, "events")) + TERM_DEBUG_ON(ism, ISM_EVENTS); + else if (strmatch(dbgparam, "timers")) + TERM_DEBUG_ON(ism, ISM_TIMERS); + } + + return CMD_SUCCESS; } DEFUN (no_debug_ospf_ism, @@ -858,82 +818,76 @@ DEFUN (no_debug_ospf_ism, "ISM Event Information\n" "ISM TImer Information\n") { - int inst = (argv[3]->type == RANGE_TKN); - char *dbgparam = (argc == 5 + inst) ? argv[argc - 1]->text : NULL; - - if (inst) // user passed instance ID - { - if (!ospf_lookup_instance (strtoul (argv[3]->arg, NULL, 10))) - return CMD_SUCCESS; - } - - if (vty->node == CONFIG_NODE) - { - if (!dbgparam) - DEBUG_OFF (ism, ISM); - else + int inst = (argv[3]->type == RANGE_TKN); + char *dbgparam = (argc == 5 + inst) ? argv[argc - 1]->text : NULL; + + if (inst) // user passed instance ID { - if (strmatch (dbgparam, "status")) - DEBUG_OFF (ism, ISM_STATUS); - else if (strmatch (dbgparam, "events")) - DEBUG_OFF (ism, ISM_EVENTS); - else if (strmatch (dbgparam, "timers")) - DEBUG_OFF (ism, ISM_TIMERS); + if (!ospf_lookup_instance(strtoul(argv[3]->arg, NULL, 10))) + return CMD_SUCCESS; + } + + if (vty->node == CONFIG_NODE) { + if (!dbgparam) + DEBUG_OFF(ism, ISM); + else { + if (strmatch(dbgparam, "status")) + DEBUG_OFF(ism, ISM_STATUS); + else if (strmatch(dbgparam, "events")) + DEBUG_OFF(ism, ISM_EVENTS); + else if (strmatch(dbgparam, "timers")) + DEBUG_OFF(ism, ISM_TIMERS); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (!dbgparam) + TERM_DEBUG_OFF(ism, ISM); + else { + if (strmatch(dbgparam, "status")) + TERM_DEBUG_OFF(ism, ISM_STATUS); + else if (strmatch(dbgparam, "events")) + TERM_DEBUG_OFF(ism, ISM_EVENTS); + else if (strmatch(dbgparam, "timers")) + TERM_DEBUG_OFF(ism, ISM_TIMERS); } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (!dbgparam) - TERM_DEBUG_OFF (ism, ISM); - else - { - if (strmatch (dbgparam, "status")) - TERM_DEBUG_OFF (ism, ISM_STATUS); - else if (strmatch (dbgparam, "events")) - TERM_DEBUG_OFF (ism, ISM_EVENTS); - else if (strmatch (dbgparam, "timers")) - TERM_DEBUG_OFF (ism, ISM_TIMERS); - } - - return CMD_SUCCESS; + return CMD_SUCCESS; } -static int -debug_ospf_nsm_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv) +static int debug_ospf_nsm_common(struct vty *vty, int arg_base, int argc, + struct cmd_token **argv) { - if (vty->node == CONFIG_NODE) - { - if (argc == arg_base + 0) - DEBUG_ON (nsm, NSM); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "status")) - DEBUG_ON (nsm, NSM_STATUS); - else if (strmatch(argv[arg_base]->text, "events")) - DEBUG_ON (nsm, NSM_EVENTS); - else if (strmatch(argv[arg_base]->text, "timers")) - DEBUG_ON (nsm, NSM_TIMERS); + if (vty->node == CONFIG_NODE) { + if (argc == arg_base + 0) + DEBUG_ON(nsm, NSM); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "status")) + DEBUG_ON(nsm, NSM_STATUS); + else if (strmatch(argv[arg_base]->text, "events")) + DEBUG_ON(nsm, NSM_EVENTS); + else if (strmatch(argv[arg_base]->text, "timers")) + DEBUG_ON(nsm, NSM_TIMERS); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (argc == arg_base + 0) + TERM_DEBUG_ON(nsm, NSM); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "status")) + TERM_DEBUG_ON(nsm, NSM_STATUS); + else if (strmatch(argv[arg_base]->text, "events")) + TERM_DEBUG_ON(nsm, NSM_EVENTS); + else if (strmatch(argv[arg_base]->text, "timers")) + TERM_DEBUG_ON(nsm, NSM_TIMERS); } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (argc == arg_base + 0) - TERM_DEBUG_ON (nsm, NSM); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "status")) - TERM_DEBUG_ON (nsm, NSM_STATUS); - else if (strmatch(argv[arg_base]->text, "events")) - TERM_DEBUG_ON (nsm, NSM_EVENTS); - else if (strmatch(argv[arg_base]->text, "timers")) - TERM_DEBUG_ON (nsm, NSM_TIMERS); - } - - return CMD_SUCCESS; + return CMD_SUCCESS; } DEFUN (debug_ospf_nsm, @@ -946,7 +900,7 @@ DEFUN (debug_ospf_nsm, "NSM Event Information\n" "NSM Timer Information\n") { - return debug_ospf_nsm_common (vty, 3, argc, argv); + return debug_ospf_nsm_common(vty, 3, argc, argv); } DEFUN (debug_ospf_instance_nsm, @@ -960,52 +914,49 @@ DEFUN (debug_ospf_instance_nsm, "NSM Event Information\n" "NSM Timer Information\n") { - int idx_number = 2; - u_short instance = 0; + int idx_number = 2; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - return debug_ospf_nsm_common (vty, 4, argc, argv); + return debug_ospf_nsm_common(vty, 4, argc, argv); } -static int -no_debug_ospf_nsm_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv) +static int no_debug_ospf_nsm_common(struct vty *vty, int arg_base, int argc, + struct cmd_token **argv) { - /* XXX qlyoung */ - if (vty->node == CONFIG_NODE) - { - if (argc == arg_base + 0) - DEBUG_OFF (nsm, NSM); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "status")) - DEBUG_OFF (nsm, NSM_STATUS); - else if (strmatch(argv[arg_base]->text, "events")) - DEBUG_OFF (nsm, NSM_EVENTS); - else if (strmatch(argv[arg_base]->text, "timers")) - DEBUG_OFF (nsm, NSM_TIMERS); + /* XXX qlyoung */ + if (vty->node == CONFIG_NODE) { + if (argc == arg_base + 0) + DEBUG_OFF(nsm, NSM); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "status")) + DEBUG_OFF(nsm, NSM_STATUS); + else if (strmatch(argv[arg_base]->text, "events")) + DEBUG_OFF(nsm, NSM_EVENTS); + else if (strmatch(argv[arg_base]->text, "timers")) + DEBUG_OFF(nsm, NSM_TIMERS); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (argc == arg_base + 0) + TERM_DEBUG_OFF(nsm, NSM); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "status")) + TERM_DEBUG_OFF(nsm, NSM_STATUS); + else if (strmatch(argv[arg_base]->text, "events")) + TERM_DEBUG_OFF(nsm, NSM_EVENTS); + else if (strmatch(argv[arg_base]->text, "timers")) + TERM_DEBUG_OFF(nsm, NSM_TIMERS); } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (argc == arg_base + 0) - TERM_DEBUG_OFF (nsm, NSM); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "status")) - TERM_DEBUG_OFF (nsm, NSM_STATUS); - else if (strmatch(argv[arg_base]->text, "events")) - TERM_DEBUG_OFF (nsm, NSM_EVENTS); - else if (strmatch(argv[arg_base]->text, "timers")) - TERM_DEBUG_OFF (nsm, NSM_TIMERS); - } - - return CMD_SUCCESS; + return CMD_SUCCESS; } DEFUN (no_debug_ospf_nsm, @@ -1019,7 +970,7 @@ DEFUN (no_debug_ospf_nsm, "NSM Event Information\n" "NSM Timer Information\n") { - return no_debug_ospf_nsm_common(vty, 4, argc, argv); + return no_debug_ospf_nsm_common(vty, 4, argc, argv); } @@ -1035,55 +986,52 @@ DEFUN (no_debug_ospf_instance_nsm, "NSM Event Information\n" "NSM Timer Information\n") { - int idx_number = 3; - u_short instance = 0; + int idx_number = 3; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - return no_debug_ospf_nsm_common(vty, 5, argc, argv); + return no_debug_ospf_nsm_common(vty, 5, argc, argv); } -static int -debug_ospf_lsa_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv) +static int debug_ospf_lsa_common(struct vty *vty, int arg_base, int argc, + struct cmd_token **argv) { - if (vty->node == CONFIG_NODE) - { - if (argc == arg_base + 0) - DEBUG_ON (lsa, LSA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "generate")) - DEBUG_ON (lsa, LSA_GENERATE); - else if (strmatch(argv[arg_base]->text, "flooding")) - DEBUG_ON (lsa, LSA_FLOODING); - else if (strmatch(argv[arg_base]->text, "install")) - DEBUG_ON (lsa, LSA_INSTALL); - else if (strmatch(argv[arg_base]->text, "refresh")) - DEBUG_ON (lsa, LSA_REFRESH); + if (vty->node == CONFIG_NODE) { + if (argc == arg_base + 0) + DEBUG_ON(lsa, LSA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "generate")) + DEBUG_ON(lsa, LSA_GENERATE); + else if (strmatch(argv[arg_base]->text, "flooding")) + DEBUG_ON(lsa, LSA_FLOODING); + else if (strmatch(argv[arg_base]->text, "install")) + DEBUG_ON(lsa, LSA_INSTALL); + else if (strmatch(argv[arg_base]->text, "refresh")) + DEBUG_ON(lsa, LSA_REFRESH); + } + + return CMD_SUCCESS; } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (argc == arg_base + 0) - TERM_DEBUG_ON (lsa, LSA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "generate")) - TERM_DEBUG_ON (lsa, LSA_GENERATE); - else if (strmatch(argv[arg_base]->text, "flooding")) - TERM_DEBUG_ON (lsa, LSA_FLOODING); - else if (strmatch(argv[arg_base]->text, "install")) - TERM_DEBUG_ON (lsa, LSA_INSTALL); - else if (strmatch(argv[arg_base]->text, "refresh")) - TERM_DEBUG_ON (lsa, LSA_REFRESH); - } - - return CMD_SUCCESS; + /* ENABLE_NODE. */ + if (argc == arg_base + 0) + TERM_DEBUG_ON(lsa, LSA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "generate")) + TERM_DEBUG_ON(lsa, LSA_GENERATE); + else if (strmatch(argv[arg_base]->text, "flooding")) + TERM_DEBUG_ON(lsa, LSA_FLOODING); + else if (strmatch(argv[arg_base]->text, "install")) + TERM_DEBUG_ON(lsa, LSA_INSTALL); + else if (strmatch(argv[arg_base]->text, "refresh")) + TERM_DEBUG_ON(lsa, LSA_REFRESH); + } + + return CMD_SUCCESS; } DEFUN (debug_ospf_lsa, @@ -1097,7 +1045,7 @@ DEFUN (debug_ospf_lsa, "LSA Install/Delete\n" "LSA Refresh\n") { - return debug_ospf_lsa_common(vty, 3, argc, argv); + return debug_ospf_lsa_common(vty, 3, argc, argv); } DEFUN (debug_ospf_instance_lsa, @@ -1112,55 +1060,52 @@ DEFUN (debug_ospf_instance_lsa, "LSA Install/Delete\n" "LSA Refresh\n") { - int idx_number = 2; - u_short instance = 0; + int idx_number = 2; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - return debug_ospf_lsa_common(vty, 4, argc, argv); + return debug_ospf_lsa_common(vty, 4, argc, argv); } -static int -no_debug_ospf_lsa_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv) +static int no_debug_ospf_lsa_common(struct vty *vty, int arg_base, int argc, + struct cmd_token **argv) { - if (vty->node == CONFIG_NODE) - { - if (argc == arg_base + 0) - DEBUG_OFF (lsa, LSA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "generate")) - DEBUG_OFF (lsa, LSA_GENERATE); - else if (strmatch(argv[arg_base]->text, "flooding")) - DEBUG_OFF (lsa, LSA_FLOODING); - else if (strmatch(argv[arg_base]->text, "install")) - DEBUG_OFF (lsa, LSA_INSTALL); - else if (strmatch(argv[arg_base]->text, "refresh")) - DEBUG_OFF (lsa, LSA_REFRESH); + if (vty->node == CONFIG_NODE) { + if (argc == arg_base + 0) + DEBUG_OFF(lsa, LSA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "generate")) + DEBUG_OFF(lsa, LSA_GENERATE); + else if (strmatch(argv[arg_base]->text, "flooding")) + DEBUG_OFF(lsa, LSA_FLOODING); + else if (strmatch(argv[arg_base]->text, "install")) + DEBUG_OFF(lsa, LSA_INSTALL); + else if (strmatch(argv[arg_base]->text, "refresh")) + DEBUG_OFF(lsa, LSA_REFRESH); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (argc == arg_base + 0) + TERM_DEBUG_OFF(lsa, LSA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "generate")) + TERM_DEBUG_OFF(lsa, LSA_GENERATE); + else if (strmatch(argv[arg_base]->text, "flooding")) + TERM_DEBUG_OFF(lsa, LSA_FLOODING); + else if (strmatch(argv[arg_base]->text, "install")) + TERM_DEBUG_OFF(lsa, LSA_INSTALL); + else if (strmatch(argv[arg_base]->text, "refresh")) + TERM_DEBUG_OFF(lsa, LSA_REFRESH); } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (argc == arg_base + 0) - TERM_DEBUG_OFF (lsa, LSA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "generate")) - TERM_DEBUG_OFF (lsa, LSA_GENERATE); - else if (strmatch(argv[arg_base]->text, "flooding")) - TERM_DEBUG_OFF (lsa, LSA_FLOODING); - else if (strmatch(argv[arg_base]->text, "install")) - TERM_DEBUG_OFF (lsa, LSA_INSTALL); - else if (strmatch(argv[arg_base]->text, "refresh")) - TERM_DEBUG_OFF (lsa, LSA_REFRESH); - } - - return CMD_SUCCESS; + return CMD_SUCCESS; } DEFUN (no_debug_ospf_lsa, @@ -1175,7 +1120,7 @@ DEFUN (no_debug_ospf_lsa, "LSA Install/Delete\n" "LSA Refres\n") { - return no_debug_ospf_lsa_common (vty, 4, argc, argv); + return no_debug_ospf_lsa_common(vty, 4, argc, argv); } DEFUN (no_debug_ospf_instance_lsa, @@ -1191,47 +1136,44 @@ DEFUN (no_debug_ospf_instance_lsa, "LSA Install/Delete\n" "LSA Refres\n") { - int idx_number = 3; - u_short instance = 0; + int idx_number = 3; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - return no_debug_ospf_lsa_common (vty, 5, argc, argv); + return no_debug_ospf_lsa_common(vty, 5, argc, argv); } -static int -debug_ospf_zebra_common (struct vty *vty, int arg_base, int argc, struct cmd_token **argv) +static int debug_ospf_zebra_common(struct vty *vty, int arg_base, int argc, + struct cmd_token **argv) { - if (vty->node == CONFIG_NODE) - { - if (argc == arg_base + 0) - DEBUG_ON (zebra, ZEBRA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "interface")) - DEBUG_ON (zebra, ZEBRA_INTERFACE); - else if (strmatch(argv[arg_base]->text, "redistribute")) - DEBUG_ON (zebra, ZEBRA_REDISTRIBUTE); + if (vty->node == CONFIG_NODE) { + if (argc == arg_base + 0) + DEBUG_ON(zebra, ZEBRA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "interface")) + DEBUG_ON(zebra, ZEBRA_INTERFACE); + else if (strmatch(argv[arg_base]->text, "redistribute")) + DEBUG_ON(zebra, ZEBRA_REDISTRIBUTE); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (argc == arg_base + 0) + TERM_DEBUG_ON(zebra, ZEBRA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "interface")) + TERM_DEBUG_ON(zebra, ZEBRA_INTERFACE); + else if (strmatch(argv[arg_base]->text, "redistribute")) + TERM_DEBUG_ON(zebra, ZEBRA_REDISTRIBUTE); } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (argc == arg_base + 0) - TERM_DEBUG_ON (zebra, ZEBRA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "interface")) - TERM_DEBUG_ON (zebra, ZEBRA_INTERFACE); - else if (strmatch(argv[arg_base]->text, "redistribute")) - TERM_DEBUG_ON (zebra, ZEBRA_REDISTRIBUTE); - } - - return CMD_SUCCESS; + return CMD_SUCCESS; } DEFUN (debug_ospf_zebra, @@ -1243,7 +1185,7 @@ DEFUN (debug_ospf_zebra, "Zebra interface\n" "Zebra redistribute\n") { - return debug_ospf_zebra_common(vty, 3, argc, argv); + return debug_ospf_zebra_common(vty, 3, argc, argv); } DEFUN (debug_ospf_instance_zebra, @@ -1256,48 +1198,44 @@ DEFUN (debug_ospf_instance_zebra, "Zebra interface\n" "Zebra redistribute\n") { - int idx_number = 2; - u_short instance = 0; + int idx_number = 2; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - return debug_ospf_zebra_common(vty, 4, argc, argv); + return debug_ospf_zebra_common(vty, 4, argc, argv); } -static int -no_debug_ospf_zebra_common(struct vty *vty, int arg_base, int argc, - struct cmd_token **argv) +static int no_debug_ospf_zebra_common(struct vty *vty, int arg_base, int argc, + struct cmd_token **argv) { - if (vty->node == CONFIG_NODE) - { - if (argc == arg_base + 0) - DEBUG_OFF (zebra, ZEBRA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "interface")) - DEBUG_OFF (zebra, ZEBRA_INTERFACE); - else if (strmatch(argv[arg_base]->text, "redistribute")) - DEBUG_OFF (zebra, ZEBRA_REDISTRIBUTE); + if (vty->node == CONFIG_NODE) { + if (argc == arg_base + 0) + DEBUG_OFF(zebra, ZEBRA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "interface")) + DEBUG_OFF(zebra, ZEBRA_INTERFACE); + else if (strmatch(argv[arg_base]->text, "redistribute")) + DEBUG_OFF(zebra, ZEBRA_REDISTRIBUTE); + } + + return CMD_SUCCESS; + } + + /* ENABLE_NODE. */ + if (argc == arg_base + 0) + TERM_DEBUG_OFF(zebra, ZEBRA); + else if (argc == arg_base + 1) { + if (strmatch(argv[arg_base]->text, "interface")) + TERM_DEBUG_OFF(zebra, ZEBRA_INTERFACE); + else if (strmatch(argv[arg_base]->text, "redistribute")) + TERM_DEBUG_OFF(zebra, ZEBRA_REDISTRIBUTE); } - return CMD_SUCCESS; - } - - /* ENABLE_NODE. */ - if (argc == arg_base + 0) - TERM_DEBUG_OFF (zebra, ZEBRA); - else if (argc == arg_base + 1) - { - if (strmatch(argv[arg_base]->text, "interface")) - TERM_DEBUG_OFF (zebra, ZEBRA_INTERFACE); - else if (strmatch(argv[arg_base]->text, "redistribute")) - TERM_DEBUG_OFF (zebra, ZEBRA_REDISTRIBUTE); - } - - return CMD_SUCCESS; + return CMD_SUCCESS; } DEFUN (no_debug_ospf_zebra, @@ -1310,7 +1248,7 @@ DEFUN (no_debug_ospf_zebra, "Zebra interface\n" "Zebra redistribute\n") { - return no_debug_ospf_zebra_common(vty, 4, argc, argv); + return no_debug_ospf_zebra_common(vty, 4, argc, argv); } DEFUN (no_debug_ospf_instance_zebra, @@ -1324,18 +1262,17 @@ DEFUN (no_debug_ospf_instance_zebra, "Zebra interface\n" "Zebra redistribute\n") { - int idx_number = 3; - u_short instance = 0; + int idx_number = 3; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - return no_debug_ospf_zebra_common(vty, 5, argc, argv); + return no_debug_ospf_zebra_common(vty, 5, argc, argv); } - DEFUN (debug_ospf_event, debug_ospf_event_cmd, "debug ospf event", @@ -1343,10 +1280,10 @@ DEFUN (debug_ospf_event, OSPF_STR "OSPF event information\n") { - if (vty->node == CONFIG_NODE) - CONF_DEBUG_ON (event, EVENT); - TERM_DEBUG_ON (event, EVENT); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_ON(event, EVENT); + TERM_DEBUG_ON(event, EVENT); + return CMD_SUCCESS; } DEFUN (no_debug_ospf_event, @@ -1357,10 +1294,10 @@ DEFUN (no_debug_ospf_event, OSPF_STR "OSPF event information\n") { - if (vty->node == CONFIG_NODE) - CONF_DEBUG_OFF (event, EVENT); - TERM_DEBUG_OFF (event, EVENT); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_OFF(event, EVENT); + TERM_DEBUG_OFF(event, EVENT); + return CMD_SUCCESS; } DEFUN (debug_ospf_instance_event, @@ -1371,17 +1308,17 @@ DEFUN (debug_ospf_instance_event, "Instance ID\n" "OSPF event information\n") { - int idx_number = 2; - u_short instance = 0; + int idx_number = 2; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - if (vty->node == CONFIG_NODE) - CONF_DEBUG_ON (event, EVENT); - TERM_DEBUG_ON (event, EVENT); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_ON(event, EVENT); + TERM_DEBUG_ON(event, EVENT); + return CMD_SUCCESS; } DEFUN (no_debug_ospf_instance_event, @@ -1393,17 +1330,17 @@ DEFUN (no_debug_ospf_instance_event, "Instance ID\n" "OSPF event information\n") { - int idx_number = 3; - u_short instance = 0; + int idx_number = 3; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - if (vty->node == CONFIG_NODE) - CONF_DEBUG_OFF (event, EVENT); - TERM_DEBUG_OFF (event, EVENT); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_OFF(event, EVENT); + TERM_DEBUG_OFF(event, EVENT); + return CMD_SUCCESS; } DEFUN (debug_ospf_nssa, @@ -1413,10 +1350,10 @@ DEFUN (debug_ospf_nssa, OSPF_STR "OSPF nssa information\n") { - if (vty->node == CONFIG_NODE) - CONF_DEBUG_ON (nssa, NSSA); - TERM_DEBUG_ON (nssa, NSSA); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_ON(nssa, NSSA); + TERM_DEBUG_ON(nssa, NSSA); + return CMD_SUCCESS; } DEFUN (no_debug_ospf_nssa, @@ -1427,10 +1364,10 @@ DEFUN (no_debug_ospf_nssa, OSPF_STR "OSPF nssa information\n") { - if (vty->node == CONFIG_NODE) - CONF_DEBUG_OFF (nssa, NSSA); - TERM_DEBUG_OFF (nssa, NSSA); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_OFF(nssa, NSSA); + TERM_DEBUG_OFF(nssa, NSSA); + return CMD_SUCCESS; } DEFUN (debug_ospf_instance_nssa, @@ -1441,17 +1378,17 @@ DEFUN (debug_ospf_instance_nssa, "Instance ID\n" "OSPF nssa information\n") { - int idx_number = 2; - u_short instance = 0; + int idx_number = 2; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - if (vty->node == CONFIG_NODE) - CONF_DEBUG_ON (nssa, NSSA); - TERM_DEBUG_ON (nssa, NSSA); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_ON(nssa, NSSA); + TERM_DEBUG_ON(nssa, NSSA); + return CMD_SUCCESS; } DEFUN (no_debug_ospf_instance_nssa, @@ -1463,17 +1400,17 @@ DEFUN (no_debug_ospf_instance_nssa, "Instance ID\n" "OSPF nssa information\n") { - int idx_number = 3; - u_short instance = 0; + int idx_number = 3; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if (!ospf_lookup_instance (instance)) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if (!ospf_lookup_instance(instance)) + return CMD_SUCCESS; - if (vty->node == CONFIG_NODE) - CONF_DEBUG_OFF (nssa, NSSA); - TERM_DEBUG_OFF (nssa, NSSA); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_OFF(nssa, NSSA); + TERM_DEBUG_OFF(nssa, NSSA); + return CMD_SUCCESS; } DEFUN (debug_ospf_te, @@ -1483,10 +1420,10 @@ DEFUN (debug_ospf_te, OSPF_STR "OSPF-TE information\n") { - if (vty->node == CONFIG_NODE) - CONF_DEBUG_ON (te, TE); - TERM_DEBUG_ON (te, TE); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_ON(te, TE); + TERM_DEBUG_ON(te, TE); + return CMD_SUCCESS; } DEFUN (no_debug_ospf_te, @@ -1497,10 +1434,10 @@ DEFUN (no_debug_ospf_te, OSPF_STR "OSPF-TE information\n") { - if (vty->node == CONFIG_NODE) - CONF_DEBUG_OFF (te, TE); - TERM_DEBUG_OFF (te, TE); - return CMD_SUCCESS; + if (vty->node == CONFIG_NODE) + CONF_DEBUG_OFF(te, TE); + TERM_DEBUG_OFF(te, TE); + return CMD_SUCCESS; } DEFUN (no_debug_ospf, @@ -1510,151 +1447,154 @@ DEFUN (no_debug_ospf, DEBUG_STR OSPF_STR) { - int flag = OSPF_DEBUG_SEND | OSPF_DEBUG_RECV | OSPF_DEBUG_DETAIL; - int i; - - if (vty->node == CONFIG_NODE) - { - CONF_DEBUG_OFF (event, EVENT); - CONF_DEBUG_OFF (nssa, NSSA); - DEBUG_OFF (ism, ISM_EVENTS); - DEBUG_OFF (ism, ISM_STATUS); - DEBUG_OFF (ism, ISM_TIMERS); - DEBUG_OFF (lsa, LSA); - DEBUG_OFF (lsa, LSA_FLOODING); - DEBUG_OFF (lsa, LSA_GENERATE); - DEBUG_OFF (lsa, LSA_INSTALL); - DEBUG_OFF (lsa, LSA_REFRESH); - DEBUG_OFF (nsm, NSM); - DEBUG_OFF (nsm, NSM_EVENTS); - DEBUG_OFF (nsm, NSM_STATUS); - DEBUG_OFF (nsm, NSM_TIMERS); - DEBUG_OFF (zebra, ZEBRA); - DEBUG_OFF (zebra, ZEBRA_INTERFACE); - DEBUG_OFF (zebra, ZEBRA_REDISTRIBUTE); - - for (i = 0; i < 5; i++) - DEBUG_PACKET_OFF (i, flag); - } - - for (i = 0; i < 5; i++) - TERM_DEBUG_PACKET_OFF (i, flag); - - TERM_DEBUG_OFF (event, EVENT); - TERM_DEBUG_OFF (ism, ISM); - TERM_DEBUG_OFF (ism, ISM_EVENTS); - TERM_DEBUG_OFF (ism, ISM_STATUS); - TERM_DEBUG_OFF (ism, ISM_TIMERS); - TERM_DEBUG_OFF (lsa, LSA); - TERM_DEBUG_OFF (lsa, LSA_FLOODING); - TERM_DEBUG_OFF (lsa, LSA_GENERATE); - TERM_DEBUG_OFF (lsa, LSA_INSTALL); - TERM_DEBUG_OFF (lsa, LSA_REFRESH); - TERM_DEBUG_OFF (nsm, NSM); - TERM_DEBUG_OFF (nsm, NSM_EVENTS); - TERM_DEBUG_OFF (nsm, NSM_STATUS); - TERM_DEBUG_OFF (nsm, NSM_TIMERS); - TERM_DEBUG_OFF (nssa, NSSA); - TERM_DEBUG_OFF (zebra, ZEBRA); - TERM_DEBUG_OFF (zebra, ZEBRA_INTERFACE); - TERM_DEBUG_OFF (zebra, ZEBRA_REDISTRIBUTE); - - return CMD_SUCCESS; + int flag = OSPF_DEBUG_SEND | OSPF_DEBUG_RECV | OSPF_DEBUG_DETAIL; + int i; + + if (vty->node == CONFIG_NODE) { + CONF_DEBUG_OFF(event, EVENT); + CONF_DEBUG_OFF(nssa, NSSA); + DEBUG_OFF(ism, ISM_EVENTS); + DEBUG_OFF(ism, ISM_STATUS); + DEBUG_OFF(ism, ISM_TIMERS); + DEBUG_OFF(lsa, LSA); + DEBUG_OFF(lsa, LSA_FLOODING); + DEBUG_OFF(lsa, LSA_GENERATE); + DEBUG_OFF(lsa, LSA_INSTALL); + DEBUG_OFF(lsa, LSA_REFRESH); + DEBUG_OFF(nsm, NSM); + DEBUG_OFF(nsm, NSM_EVENTS); + DEBUG_OFF(nsm, NSM_STATUS); + DEBUG_OFF(nsm, NSM_TIMERS); + DEBUG_OFF(zebra, ZEBRA); + DEBUG_OFF(zebra, ZEBRA_INTERFACE); + DEBUG_OFF(zebra, ZEBRA_REDISTRIBUTE); + + for (i = 0; i < 5; i++) + DEBUG_PACKET_OFF(i, flag); + } + + for (i = 0; i < 5; i++) + TERM_DEBUG_PACKET_OFF(i, flag); + + TERM_DEBUG_OFF(event, EVENT); + TERM_DEBUG_OFF(ism, ISM); + TERM_DEBUG_OFF(ism, ISM_EVENTS); + TERM_DEBUG_OFF(ism, ISM_STATUS); + TERM_DEBUG_OFF(ism, ISM_TIMERS); + TERM_DEBUG_OFF(lsa, LSA); + TERM_DEBUG_OFF(lsa, LSA_FLOODING); + TERM_DEBUG_OFF(lsa, LSA_GENERATE); + TERM_DEBUG_OFF(lsa, LSA_INSTALL); + TERM_DEBUG_OFF(lsa, LSA_REFRESH); + TERM_DEBUG_OFF(nsm, NSM); + TERM_DEBUG_OFF(nsm, NSM_EVENTS); + TERM_DEBUG_OFF(nsm, NSM_STATUS); + TERM_DEBUG_OFF(nsm, NSM_TIMERS); + TERM_DEBUG_OFF(nssa, NSSA); + TERM_DEBUG_OFF(zebra, ZEBRA); + TERM_DEBUG_OFF(zebra, ZEBRA_INTERFACE); + TERM_DEBUG_OFF(zebra, ZEBRA_REDISTRIBUTE); + + return CMD_SUCCESS; } -static int -show_debugging_ospf_common (struct vty *vty, struct ospf *ospf) +static int show_debugging_ospf_common(struct vty *vty, struct ospf *ospf) { - int i; - - if (ospf->instance) - vty_out (vty, "\nOSPF Instance: %d\n\n", ospf->instance); - - vty_out (vty, "OSPF debugging status:\n"); - - /* Show debug status for events. */ - if (IS_DEBUG_OSPF(event,EVENT)) - vty_out (vty, " OSPF event debugging is on\n"); - - /* Show debug status for ISM. */ - if (IS_DEBUG_OSPF (ism, ISM) == OSPF_DEBUG_ISM) - vty_out (vty, " OSPF ISM debugging is on\n"); - else - { - if (IS_DEBUG_OSPF (ism, ISM_STATUS)) - vty_out (vty, " OSPF ISM status debugging is on\n"); - if (IS_DEBUG_OSPF (ism, ISM_EVENTS)) - vty_out (vty, " OSPF ISM event debugging is on\n"); - if (IS_DEBUG_OSPF (ism, ISM_TIMERS)) - vty_out (vty, " OSPF ISM timer debugging is on\n"); - } - - /* Show debug status for NSM. */ - if (IS_DEBUG_OSPF (nsm, NSM) == OSPF_DEBUG_NSM) - vty_out (vty, " OSPF NSM debugging is on\n"); - else - { - if (IS_DEBUG_OSPF (nsm, NSM_STATUS)) - vty_out (vty, " OSPF NSM status debugging is on\n"); - if (IS_DEBUG_OSPF (nsm, NSM_EVENTS)) - vty_out (vty, " OSPF NSM event debugging is on\n"); - if (IS_DEBUG_OSPF (nsm, NSM_TIMERS)) - vty_out (vty, " OSPF NSM timer debugging is on\n"); - } - - /* Show debug status for OSPF Packets. */ - for (i = 0; i < 5; i++) - if (IS_DEBUG_OSPF_PACKET (i, SEND) && IS_DEBUG_OSPF_PACKET (i, RECV)) - { - vty_out (vty, " OSPF packet %s%s debugging is on\n", - lookup_msg(ospf_packet_type_str, i + 1, NULL), - IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : ""); - } - else - { - if (IS_DEBUG_OSPF_PACKET (i, SEND)) - vty_out (vty, " OSPF packet %s send%s debugging is on\n", - lookup_msg(ospf_packet_type_str, i + 1, NULL), - IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : ""); - if (IS_DEBUG_OSPF_PACKET (i, RECV)) - vty_out (vty, " OSPF packet %s receive%s debugging is on\n", - lookup_msg(ospf_packet_type_str, i + 1, NULL), - IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : ""); - } - - /* Show debug status for OSPF LSAs. */ - if (IS_DEBUG_OSPF (lsa, LSA) == OSPF_DEBUG_LSA) - vty_out (vty, " OSPF LSA debugging is on\n"); - else - { - if (IS_DEBUG_OSPF (lsa, LSA_GENERATE)) - vty_out (vty, " OSPF LSA generation debugging is on\n"); - if (IS_DEBUG_OSPF (lsa, LSA_FLOODING)) - vty_out (vty, " OSPF LSA flooding debugging is on\n"); - if (IS_DEBUG_OSPF (lsa, LSA_INSTALL)) - vty_out (vty, " OSPF LSA install debugging is on\n"); - if (IS_DEBUG_OSPF (lsa, LSA_REFRESH)) - vty_out (vty, " OSPF LSA refresh debugging is on\n"); - } - - /* Show debug status for Zebra. */ - if (IS_DEBUG_OSPF (zebra, ZEBRA) == OSPF_DEBUG_ZEBRA) - vty_out (vty, " OSPF Zebra debugging is on\n"); - else - { - if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE)) - vty_out (vty, " OSPF Zebra interface debugging is on\n"); - if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE)) - vty_out (vty, " OSPF Zebra redistribute debugging is on\n"); - } - - /* Show debug status for NSSA. */ - if (IS_DEBUG_OSPF (nssa, NSSA) == OSPF_DEBUG_NSSA) - vty_out (vty, " OSPF NSSA debugging is on\n"); - - vty_out (vty, "\n"); - - return CMD_SUCCESS; + int i; + + if (ospf->instance) + vty_out(vty, "\nOSPF Instance: %d\n\n", ospf->instance); + + vty_out(vty, "OSPF debugging status:\n"); + + /* Show debug status for events. */ + if (IS_DEBUG_OSPF(event, EVENT)) + vty_out(vty, " OSPF event debugging is on\n"); + + /* Show debug status for ISM. */ + if (IS_DEBUG_OSPF(ism, ISM) == OSPF_DEBUG_ISM) + vty_out(vty, " OSPF ISM debugging is on\n"); + else { + if (IS_DEBUG_OSPF(ism, ISM_STATUS)) + vty_out(vty, " OSPF ISM status debugging is on\n"); + if (IS_DEBUG_OSPF(ism, ISM_EVENTS)) + vty_out(vty, " OSPF ISM event debugging is on\n"); + if (IS_DEBUG_OSPF(ism, ISM_TIMERS)) + vty_out(vty, " OSPF ISM timer debugging is on\n"); + } + + /* Show debug status for NSM. */ + if (IS_DEBUG_OSPF(nsm, NSM) == OSPF_DEBUG_NSM) + vty_out(vty, " OSPF NSM debugging is on\n"); + else { + if (IS_DEBUG_OSPF(nsm, NSM_STATUS)) + vty_out(vty, " OSPF NSM status debugging is on\n"); + if (IS_DEBUG_OSPF(nsm, NSM_EVENTS)) + vty_out(vty, " OSPF NSM event debugging is on\n"); + if (IS_DEBUG_OSPF(nsm, NSM_TIMERS)) + vty_out(vty, " OSPF NSM timer debugging is on\n"); + } + + /* Show debug status for OSPF Packets. */ + for (i = 0; i < 5; i++) + if (IS_DEBUG_OSPF_PACKET(i, SEND) + && IS_DEBUG_OSPF_PACKET(i, RECV)) { + vty_out(vty, " OSPF packet %s%s debugging is on\n", + lookup_msg(ospf_packet_type_str, i + 1, NULL), + IS_DEBUG_OSPF_PACKET(i, DETAIL) ? " detail" + : ""); + } else { + if (IS_DEBUG_OSPF_PACKET(i, SEND)) + vty_out(vty, + " OSPF packet %s send%s debugging is on\n", + lookup_msg(ospf_packet_type_str, i + 1, + NULL), + IS_DEBUG_OSPF_PACKET(i, DETAIL) + ? " detail" + : ""); + if (IS_DEBUG_OSPF_PACKET(i, RECV)) + vty_out(vty, + " OSPF packet %s receive%s debugging is on\n", + lookup_msg(ospf_packet_type_str, i + 1, + NULL), + IS_DEBUG_OSPF_PACKET(i, DETAIL) + ? " detail" + : ""); + } + + /* Show debug status for OSPF LSAs. */ + if (IS_DEBUG_OSPF(lsa, LSA) == OSPF_DEBUG_LSA) + vty_out(vty, " OSPF LSA debugging is on\n"); + else { + if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) + vty_out(vty, " OSPF LSA generation debugging is on\n"); + if (IS_DEBUG_OSPF(lsa, LSA_FLOODING)) + vty_out(vty, " OSPF LSA flooding debugging is on\n"); + if (IS_DEBUG_OSPF(lsa, LSA_INSTALL)) + vty_out(vty, " OSPF LSA install debugging is on\n"); + if (IS_DEBUG_OSPF(lsa, LSA_REFRESH)) + vty_out(vty, " OSPF LSA refresh debugging is on\n"); + } + + /* Show debug status for Zebra. */ + if (IS_DEBUG_OSPF(zebra, ZEBRA) == OSPF_DEBUG_ZEBRA) + vty_out(vty, " OSPF Zebra debugging is on\n"); + else { + if (IS_DEBUG_OSPF(zebra, ZEBRA_INTERFACE)) + vty_out(vty, + " OSPF Zebra interface debugging is on\n"); + if (IS_DEBUG_OSPF(zebra, ZEBRA_REDISTRIBUTE)) + vty_out(vty, + " OSPF Zebra redistribute debugging is on\n"); + } + + /* Show debug status for NSSA. */ + if (IS_DEBUG_OSPF(nssa, NSSA) == OSPF_DEBUG_NSSA) + vty_out(vty, " OSPF NSSA debugging is on\n"); + + vty_out(vty, "\n"); + + return CMD_SUCCESS; } DEFUN (show_debugging_ospf, @@ -1664,12 +1604,12 @@ DEFUN (show_debugging_ospf, DEBUG_STR OSPF_STR) { - struct ospf *ospf; + struct ospf *ospf; - if ((ospf = ospf_lookup()) == NULL) - return CMD_SUCCESS; + if ((ospf = ospf_lookup()) == NULL) + return CMD_SUCCESS; - return show_debugging_ospf_common(vty, ospf); + return show_debugging_ospf_common(vty, ospf); } DEFUN (show_debugging_ospf_instance, @@ -1680,219 +1620,208 @@ DEFUN (show_debugging_ospf_instance, OSPF_STR "Instance ID\n") { - int idx_number = 3; - struct ospf *ospf; - u_short instance = 0; + int idx_number = 3; + struct ospf *ospf; + u_short instance = 0; - instance = strtoul(argv[idx_number]->arg, NULL, 10); - if ((ospf = ospf_lookup_instance (instance)) == NULL ) - return CMD_SUCCESS; + instance = strtoul(argv[idx_number]->arg, NULL, 10); + if ((ospf = ospf_lookup_instance(instance)) == NULL) + return CMD_SUCCESS; - return show_debugging_ospf_common(vty, ospf); + return show_debugging_ospf_common(vty, ospf); } /* Debug node. */ -static struct cmd_node debug_node = -{ - DEBUG_NODE, - "", - 1 /* VTYSH */ +static struct cmd_node debug_node = { + DEBUG_NODE, "", 1 /* VTYSH */ }; -static int -config_write_debug (struct vty *vty) +static int config_write_debug(struct vty *vty) { - int write = 0; - int i, r; - - const char *type_str[] = {"hello", "dd", "ls-request", "ls-update", "ls-ack"}; - const char *detail_str[] = {"", " send", " recv", "", " detail", - " send detail", " recv detail", " detail"}; - - struct ospf *ospf; - char str[16]; - memset (str, 0, 16); - - if ((ospf = ospf_lookup()) == NULL) - return CMD_SUCCESS; - - if (ospf->instance) - sprintf(str, " %d", ospf->instance); - - /* debug ospf ism (status|events|timers). */ - if (IS_CONF_DEBUG_OSPF (ism, ISM) == OSPF_DEBUG_ISM) - vty_out (vty, "debug ospf%s ism\n", str); - else - { - if (IS_CONF_DEBUG_OSPF (ism, ISM_STATUS)) - vty_out (vty, "debug ospf%s ism status\n", str); - if (IS_CONF_DEBUG_OSPF (ism, ISM_EVENTS)) - vty_out (vty, "debug ospf%s ism event\n", str); - if (IS_CONF_DEBUG_OSPF (ism, ISM_TIMERS)) - vty_out (vty, "debug ospf%s ism timer\n", str); - } - - /* debug ospf nsm (status|events|timers). */ - if (IS_CONF_DEBUG_OSPF (nsm, NSM) == OSPF_DEBUG_NSM) - vty_out (vty, "debug ospf%s nsm\n", str); - else - { - if (IS_CONF_DEBUG_OSPF (nsm, NSM_STATUS)) - vty_out (vty, "debug ospf%s nsm status\n", str); - if (IS_CONF_DEBUG_OSPF (nsm, NSM_EVENTS)) - vty_out (vty, "debug ospf%s nsm event\n", str); - if (IS_CONF_DEBUG_OSPF (nsm, NSM_TIMERS)) - vty_out (vty, "debug ospf%s nsm timer\n", str); - } - - /* debug ospf lsa (generate|flooding|install|refresh). */ - if (IS_CONF_DEBUG_OSPF (lsa, LSA) == OSPF_DEBUG_LSA) - vty_out (vty, "debug ospf%s lsa\n", str); - else - { - if (IS_CONF_DEBUG_OSPF (lsa, LSA_GENERATE)) - vty_out (vty, "debug ospf%s lsa generate\n", str); - if (IS_CONF_DEBUG_OSPF (lsa, LSA_FLOODING)) - vty_out (vty, "debug ospf%s lsa flooding\n", str); - if (IS_CONF_DEBUG_OSPF (lsa, LSA_INSTALL)) - vty_out (vty, "debug ospf%s lsa install\n", str); - if (IS_CONF_DEBUG_OSPF (lsa, LSA_REFRESH)) - vty_out (vty, "debug ospf%s lsa refresh\n", str); - - write = 1; - } - - /* debug ospf zebra (interface|redistribute). */ - if (IS_CONF_DEBUG_OSPF (zebra, ZEBRA) == OSPF_DEBUG_ZEBRA) - vty_out (vty, "debug ospf%s zebra\n", str); - else - { - if (IS_CONF_DEBUG_OSPF (zebra, ZEBRA_INTERFACE)) - vty_out (vty, "debug ospf%s zebra interface\n", str); - if (IS_CONF_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE)) - vty_out (vty, "debug ospf%s zebra redistribute\n", str); - - write = 1; - } - - /* debug ospf event. */ - if (IS_CONF_DEBUG_OSPF (event, EVENT) == OSPF_DEBUG_EVENT) - { - vty_out (vty, "debug ospf%s event\n", str); - write = 1; - } - - /* debug ospf nssa. */ - if (IS_CONF_DEBUG_OSPF (nssa, NSSA) == OSPF_DEBUG_NSSA) - { - vty_out (vty, "debug ospf%s nssa\n", str); - write = 1; - } - - /* debug ospf packet all detail. */ - r = OSPF_DEBUG_SEND_RECV|OSPF_DEBUG_DETAIL; - for (i = 0; i < 5; i++) - r &= conf_debug_ospf_packet[i] & (OSPF_DEBUG_SEND_RECV|OSPF_DEBUG_DETAIL); - if (r == (OSPF_DEBUG_SEND_RECV|OSPF_DEBUG_DETAIL)) - { - vty_out (vty, "debug ospf%s packet all detail\n", str); - return 1; - } - - /* debug ospf packet all. */ - r = OSPF_DEBUG_SEND_RECV; - for (i = 0; i < 5; i++) - r &= conf_debug_ospf_packet[i] & OSPF_DEBUG_SEND_RECV; - if (r == OSPF_DEBUG_SEND_RECV) - { - vty_out (vty, "debug ospf%s packet all\n", str); - for (i = 0; i < 5; i++) - if (conf_debug_ospf_packet[i] & OSPF_DEBUG_DETAIL) - vty_out (vty, "debug ospf%s packet %s detail\n", str, - type_str[i]); - return 1; - } - - /* debug ospf packet (hello|dd|ls-request|ls-update|ls-ack) - (send|recv) (detail). */ - for (i = 0; i < 5; i++) - { - if (conf_debug_ospf_packet[i] == 0) - continue; - - vty_out (vty, "debug ospf%s packet %s%s\n", str, - type_str[i],detail_str[conf_debug_ospf_packet[i]]); - write = 1; - } - - return write; + int write = 0; + int i, r; + + const char *type_str[] = {"hello", "dd", "ls-request", "ls-update", + "ls-ack"}; + const char *detail_str[] = { + "", " send", " recv", "", + " detail", " send detail", " recv detail", " detail"}; + + struct ospf *ospf; + char str[16]; + memset(str, 0, 16); + + if ((ospf = ospf_lookup()) == NULL) + return CMD_SUCCESS; + + if (ospf->instance) + sprintf(str, " %d", ospf->instance); + + /* debug ospf ism (status|events|timers). */ + if (IS_CONF_DEBUG_OSPF(ism, ISM) == OSPF_DEBUG_ISM) + vty_out(vty, "debug ospf%s ism\n", str); + else { + if (IS_CONF_DEBUG_OSPF(ism, ISM_STATUS)) + vty_out(vty, "debug ospf%s ism status\n", str); + if (IS_CONF_DEBUG_OSPF(ism, ISM_EVENTS)) + vty_out(vty, "debug ospf%s ism event\n", str); + if (IS_CONF_DEBUG_OSPF(ism, ISM_TIMERS)) + vty_out(vty, "debug ospf%s ism timer\n", str); + } + + /* debug ospf nsm (status|events|timers). */ + if (IS_CONF_DEBUG_OSPF(nsm, NSM) == OSPF_DEBUG_NSM) + vty_out(vty, "debug ospf%s nsm\n", str); + else { + if (IS_CONF_DEBUG_OSPF(nsm, NSM_STATUS)) + vty_out(vty, "debug ospf%s nsm status\n", str); + if (IS_CONF_DEBUG_OSPF(nsm, NSM_EVENTS)) + vty_out(vty, "debug ospf%s nsm event\n", str); + if (IS_CONF_DEBUG_OSPF(nsm, NSM_TIMERS)) + vty_out(vty, "debug ospf%s nsm timer\n", str); + } + + /* debug ospf lsa (generate|flooding|install|refresh). */ + if (IS_CONF_DEBUG_OSPF(lsa, LSA) == OSPF_DEBUG_LSA) + vty_out(vty, "debug ospf%s lsa\n", str); + else { + if (IS_CONF_DEBUG_OSPF(lsa, LSA_GENERATE)) + vty_out(vty, "debug ospf%s lsa generate\n", str); + if (IS_CONF_DEBUG_OSPF(lsa, LSA_FLOODING)) + vty_out(vty, "debug ospf%s lsa flooding\n", str); + if (IS_CONF_DEBUG_OSPF(lsa, LSA_INSTALL)) + vty_out(vty, "debug ospf%s lsa install\n", str); + if (IS_CONF_DEBUG_OSPF(lsa, LSA_REFRESH)) + vty_out(vty, "debug ospf%s lsa refresh\n", str); + + write = 1; + } + + /* debug ospf zebra (interface|redistribute). */ + if (IS_CONF_DEBUG_OSPF(zebra, ZEBRA) == OSPF_DEBUG_ZEBRA) + vty_out(vty, "debug ospf%s zebra\n", str); + else { + if (IS_CONF_DEBUG_OSPF(zebra, ZEBRA_INTERFACE)) + vty_out(vty, "debug ospf%s zebra interface\n", str); + if (IS_CONF_DEBUG_OSPF(zebra, ZEBRA_REDISTRIBUTE)) + vty_out(vty, "debug ospf%s zebra redistribute\n", str); + + write = 1; + } + + /* debug ospf event. */ + if (IS_CONF_DEBUG_OSPF(event, EVENT) == OSPF_DEBUG_EVENT) { + vty_out(vty, "debug ospf%s event\n", str); + write = 1; + } + + /* debug ospf nssa. */ + if (IS_CONF_DEBUG_OSPF(nssa, NSSA) == OSPF_DEBUG_NSSA) { + vty_out(vty, "debug ospf%s nssa\n", str); + write = 1; + } + + /* debug ospf packet all detail. */ + r = OSPF_DEBUG_SEND_RECV | OSPF_DEBUG_DETAIL; + for (i = 0; i < 5; i++) + r &= conf_debug_ospf_packet[i] + & (OSPF_DEBUG_SEND_RECV | OSPF_DEBUG_DETAIL); + if (r == (OSPF_DEBUG_SEND_RECV | OSPF_DEBUG_DETAIL)) { + vty_out(vty, "debug ospf%s packet all detail\n", str); + return 1; + } + + /* debug ospf packet all. */ + r = OSPF_DEBUG_SEND_RECV; + for (i = 0; i < 5; i++) + r &= conf_debug_ospf_packet[i] & OSPF_DEBUG_SEND_RECV; + if (r == OSPF_DEBUG_SEND_RECV) { + vty_out(vty, "debug ospf%s packet all\n", str); + for (i = 0; i < 5; i++) + if (conf_debug_ospf_packet[i] & OSPF_DEBUG_DETAIL) + vty_out(vty, "debug ospf%s packet %s detail\n", + str, type_str[i]); + return 1; + } + + /* debug ospf packet (hello|dd|ls-request|ls-update|ls-ack) + (send|recv) (detail). */ + for (i = 0; i < 5; i++) { + if (conf_debug_ospf_packet[i] == 0) + continue; + + vty_out(vty, "debug ospf%s packet %s%s\n", str, type_str[i], + detail_str[conf_debug_ospf_packet[i]]); + write = 1; + } + + return write; } /* Initialize debug commands. */ -void -debug_init () +void debug_init() { - install_node (&debug_node, config_write_debug); - - install_element (ENABLE_NODE, &show_debugging_ospf_cmd); - install_element (ENABLE_NODE, &debug_ospf_ism_cmd); - install_element (ENABLE_NODE, &debug_ospf_nsm_cmd); - install_element (ENABLE_NODE, &debug_ospf_lsa_cmd); - install_element (ENABLE_NODE, &debug_ospf_zebra_cmd); - install_element (ENABLE_NODE, &debug_ospf_event_cmd); - install_element (ENABLE_NODE, &debug_ospf_nssa_cmd); - install_element (ENABLE_NODE, &debug_ospf_te_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_ism_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_nsm_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_lsa_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_zebra_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_event_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_nssa_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_te_cmd); - - install_element (ENABLE_NODE, &show_debugging_ospf_instance_cmd); - install_element (ENABLE_NODE, &debug_ospf_packet_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_packet_cmd); - - install_element (ENABLE_NODE, &debug_ospf_instance_nsm_cmd); - install_element (ENABLE_NODE, &debug_ospf_instance_lsa_cmd); - install_element (ENABLE_NODE, &debug_ospf_instance_zebra_cmd); - install_element (ENABLE_NODE, &debug_ospf_instance_event_cmd); - install_element (ENABLE_NODE, &debug_ospf_instance_nssa_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_instance_nsm_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_instance_lsa_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_instance_zebra_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_instance_event_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_instance_nssa_cmd); - install_element (ENABLE_NODE, &no_debug_ospf_cmd); - - install_element (CONFIG_NODE, &debug_ospf_packet_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_packet_cmd); - install_element (CONFIG_NODE, &debug_ospf_ism_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_ism_cmd); - - install_element (CONFIG_NODE, &debug_ospf_nsm_cmd); - install_element (CONFIG_NODE, &debug_ospf_lsa_cmd); - install_element (CONFIG_NODE, &debug_ospf_zebra_cmd); - install_element (CONFIG_NODE, &debug_ospf_event_cmd); - install_element (CONFIG_NODE, &debug_ospf_nssa_cmd); - install_element (CONFIG_NODE, &debug_ospf_te_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_nsm_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_lsa_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_zebra_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_event_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_nssa_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_te_cmd); - - install_element (CONFIG_NODE, &debug_ospf_instance_nsm_cmd); - install_element (CONFIG_NODE, &debug_ospf_instance_lsa_cmd); - install_element (CONFIG_NODE, &debug_ospf_instance_zebra_cmd); - install_element (CONFIG_NODE, &debug_ospf_instance_event_cmd); - install_element (CONFIG_NODE, &debug_ospf_instance_nssa_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_instance_nsm_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_instance_lsa_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_instance_zebra_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_instance_event_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_instance_nssa_cmd); - install_element (CONFIG_NODE, &no_debug_ospf_cmd); + install_node(&debug_node, config_write_debug); + + install_element(ENABLE_NODE, &show_debugging_ospf_cmd); + install_element(ENABLE_NODE, &debug_ospf_ism_cmd); + install_element(ENABLE_NODE, &debug_ospf_nsm_cmd); + install_element(ENABLE_NODE, &debug_ospf_lsa_cmd); + install_element(ENABLE_NODE, &debug_ospf_zebra_cmd); + install_element(ENABLE_NODE, &debug_ospf_event_cmd); + install_element(ENABLE_NODE, &debug_ospf_nssa_cmd); + install_element(ENABLE_NODE, &debug_ospf_te_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_ism_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_nsm_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_lsa_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_zebra_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_event_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_nssa_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_te_cmd); + + install_element(ENABLE_NODE, &show_debugging_ospf_instance_cmd); + install_element(ENABLE_NODE, &debug_ospf_packet_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_packet_cmd); + + install_element(ENABLE_NODE, &debug_ospf_instance_nsm_cmd); + install_element(ENABLE_NODE, &debug_ospf_instance_lsa_cmd); + install_element(ENABLE_NODE, &debug_ospf_instance_zebra_cmd); + install_element(ENABLE_NODE, &debug_ospf_instance_event_cmd); + install_element(ENABLE_NODE, &debug_ospf_instance_nssa_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_instance_nsm_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_instance_lsa_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_instance_zebra_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_instance_event_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_instance_nssa_cmd); + install_element(ENABLE_NODE, &no_debug_ospf_cmd); + + install_element(CONFIG_NODE, &debug_ospf_packet_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_packet_cmd); + install_element(CONFIG_NODE, &debug_ospf_ism_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_ism_cmd); + + install_element(CONFIG_NODE, &debug_ospf_nsm_cmd); + install_element(CONFIG_NODE, &debug_ospf_lsa_cmd); + install_element(CONFIG_NODE, &debug_ospf_zebra_cmd); + install_element(CONFIG_NODE, &debug_ospf_event_cmd); + install_element(CONFIG_NODE, &debug_ospf_nssa_cmd); + install_element(CONFIG_NODE, &debug_ospf_te_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_nsm_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_lsa_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_zebra_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_event_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_nssa_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_te_cmd); + + install_element(CONFIG_NODE, &debug_ospf_instance_nsm_cmd); + install_element(CONFIG_NODE, &debug_ospf_instance_lsa_cmd); + install_element(CONFIG_NODE, &debug_ospf_instance_zebra_cmd); + install_element(CONFIG_NODE, &debug_ospf_instance_event_cmd); + install_element(CONFIG_NODE, &debug_ospf_instance_nssa_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_instance_nsm_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_instance_lsa_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_instance_zebra_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_instance_event_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_instance_nssa_cmd); + install_element(CONFIG_NODE, &no_debug_ospf_cmd); } |