proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 22:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12920 from sri-mohan1/sri-mohan-ldp

Browse Source 
ldpd: changes for code maintainability
This commit is contained in:
mobash-rasool 2023-03-02 00:40:26 +05:30 committed by GitHub
commit 32701c48d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldpd/adjacency.c
View File

@ -170,7 +170,7 @@ static void adj_itimer(struct thread *thread)
log_debug("%s: lsr-id %pI4", __func__, &adj->lsr_id); log_debug("%s: lsr-id %pI4", __func__, &adj->lsr_id);
if (adj->source.type == HELLO_TARGETED) { if (adj->source.type == HELLO_TARGETED) {
if (!(adj->source.target->flags & F_TNBR_CONFIGURED) && if (!CHECK_FLAG(adj->source.target->flags, F_TNBR_CONFIGURED) &&
adj->source.target->pw_count == 0 && adj->source.target->pw_count == 0 &&
adj->source.target->rlfa_count == 0) { adj->source.target->rlfa_count == 0) {
/* remove dynamic targeted neighbor */ /* remove dynamic targeted neighbor */
@ -245,7 +245,7 @@ tnbr_find(struct ldpd_conf *xconf, int af, union ldpd_addr *addr)
struct tnbr * struct tnbr *
tnbr_check(struct ldpd_conf *xconf, struct tnbr *tnbr) tnbr_check(struct ldpd_conf *xconf, struct tnbr *tnbr)
{ {
if (!(tnbr->flags & (F_TNBR_CONFIGURED|F_TNBR_DYNAMIC)) && if (!CHECK_FLAG(tnbr->flags, (F_TNBR_CONFIGURED|F_TNBR_DYNAMIC)) &&
tnbr->pw_count == 0 && tnbr->rlfa_count == 0) { tnbr->pw_count == 0 && tnbr->rlfa_count == 0) {
tnbr_del(xconf, tnbr); tnbr_del(xconf, tnbr);
return (NULL); return (NULL);

20
ldpd/ldp_vty_exec.c
View File

@ -408,10 +408,10 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf); rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
vty_out (vty, "Local:\n"); vty_out (vty, "Local:\n");
vty_out (vty, " LSR Id: %pI4:0\n",&rtr_id); vty_out (vty, " LSR Id: %pI4:0\n",&rtr_id);
if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED) if (CHECK_FLAG(ldpd_conf->ipv4.flags, F_LDPD_AF_ENABLED))
vty_out (vty, " Transport Address (IPv4): %s\n", vty_out (vty, " Transport Address (IPv4): %s\n",
log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr)); log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr));
if (ldpd_conf->ipv6.flags & F_LDPD_AF_ENABLED) if (CHECK_FLAG(ldpd_conf->ipv6.flags, F_LDPD_AF_ENABLED))
vty_out (vty, " Transport Address (IPv6): %s\n", vty_out (vty, " Transport Address (IPv6): %s\n",
log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr)); log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr));
vty_out (vty, "Discovery Sources:\n"); vty_out (vty, "Discovery Sources:\n");
@ -524,10 +524,10 @@ show_discovery_detail_msg_json(struct imsg *imsg, struct show_params *params,
case IMSG_CTL_SHOW_DISCOVERY: case IMSG_CTL_SHOW_DISCOVERY:
rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf); rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
json_object_string_addf(json, "lsrId", "%pI4", &rtr_id); json_object_string_addf(json, "lsrId", "%pI4", &rtr_id);
if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED) if (CHECK_FLAG(ldpd_conf->ipv4.flags, F_LDPD_AF_ENABLED))
json_object_string_add(json, "transportAddressIPv4", json_object_string_add(json, "transportAddressIPv4",
log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr)); log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr));
if (ldpd_conf->ipv6.flags & F_LDPD_AF_ENABLED) if (CHECK_FLAG(ldpd_conf->ipv6.flags, F_LDPD_AF_ENABLED))
json_object_string_add(json, "transportAddressIPv6", json_object_string_add(json, "transportAddressIPv6",
log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr)); log_addr(AF_INET6, &ldpd_conf->ipv6.trans_addr));
json_interfaces = json_object_new_object(); json_interfaces = json_object_new_object();
@ -968,11 +968,11 @@ show_nbr_capabilities(struct vty *vty, struct ctl_nbr *nbr)
" - Typed Wildcard (0x050B)\n" " - Typed Wildcard (0x050B)\n"
" - Unrecognized Notification (0x0603)\n"); " - Unrecognized Notification (0x0603)\n");
vty_out (vty, " Capabilities Received:\n"); vty_out (vty, " Capabilities Received:\n");
if (nbr->flags & F_NBR_CAP_DYNAMIC) if (CHECK_FLAG(nbr->flags, F_NBR_CAP_DYNAMIC))
vty_out (vty," - Dynamic Announcement (0x0506)\n"); vty_out (vty," - Dynamic Announcement (0x0506)\n");
if (nbr->flags & F_NBR_CAP_TWCARD) if (CHECK_FLAG(nbr->flags, F_NBR_CAP_TWCARD))
vty_out (vty, " - Typed Wildcard (0x050B)\n"); vty_out (vty, " - Typed Wildcard (0x050B)\n");
if (nbr->flags & F_NBR_CAP_UNOTIF) if (CHECK_FLAG(nbr->flags, F_NBR_CAP_UNOTIF))
vty_out (vty," - Unrecognized Notification (0x0603)\n"); vty_out (vty," - Unrecognized Notification (0x0603)\n");
} }
@ -1037,7 +1037,7 @@ show_nbr_capabilities_json(struct ctl_nbr *nbr, json_object *json_nbr)
json_object_object_add(json_nbr, "receivedCapabilities", json_array); json_object_object_add(json_nbr, "receivedCapabilities", json_array);
/* Dynamic Announcement (0x0506) */ /* Dynamic Announcement (0x0506) */
if (nbr->flags & F_NBR_CAP_DYNAMIC) { if (CHECK_FLAG(nbr->flags, F_NBR_CAP_DYNAMIC)) {
json_cap = json_object_new_object(); json_cap = json_object_new_object();
json_object_string_add(json_cap, "description", json_object_string_add(json_cap, "description",
"Dynamic Announcement"); "Dynamic Announcement");
@ -1046,7 +1046,7 @@ show_nbr_capabilities_json(struct ctl_nbr *nbr, json_object *json_nbr)
} }
/* Typed Wildcard (0x050B) */ /* Typed Wildcard (0x050B) */
if (nbr->flags & F_NBR_CAP_TWCARD) { if (CHECK_FLAG(nbr->flags, F_NBR_CAP_TWCARD)) {
json_cap = json_object_new_object(); json_cap = json_object_new_object();
json_object_string_add(json_cap, "description", json_object_string_add(json_cap, "description",
"Typed Wildcard"); "Typed Wildcard");
@ -1055,7 +1055,7 @@ show_nbr_capabilities_json(struct ctl_nbr *nbr, json_object *json_nbr)
} }
/* Unrecognized Notification (0x0603) */ /* Unrecognized Notification (0x0603) */
if (nbr->flags & F_NBR_CAP_UNOTIF) { if (CHECK_FLAG(nbr->flags, F_NBR_CAP_UNOTIF)) {
json_cap = json_object_new_object(); json_cap = json_object_new_object();
json_object_string_add(json_cap, "description", json_object_string_add(json_cap, "description",
"Unrecognized Notification"); "Unrecognized Notification");