Merge pull request #6352 from volta-networks/fix_ldp_dscp

ldpd: LDP does not always send traffic with correct DSCP value.
This commit is contained in:
Renato Westphal 2020-05-06 12:23:01 -03:00 committed by GitHub
commit ee02198a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -619,6 +619,16 @@ nbr_establish_connection(struct nbr *nbr)
#endif #endif
} }
if (nbr->af == AF_INET) {
if (sock_set_ipv4_tos(nbr->fd, IPTOS_PREC_INTERNETCONTROL) == -1)
log_warn("%s: lsr-id %s, sock_set_ipv4_tos error",
__func__, inet_ntoa(nbr->id));
} else if (nbr->af == AF_INET6) {
if (sock_set_ipv6_dscp(nbr->fd, IPTOS_PREC_INTERNETCONTROL) == -1)
log_warn("%s: lsr-id %s, sock_set_ipv6_dscp error",
__func__, inet_ntoa(nbr->id));
}
addr2sa(nbr->af, &nbr->laddr, 0, &local_su); addr2sa(nbr->af, &nbr->laddr, 0, &local_su);
addr2sa(nbr->af, &nbr->raddr, LDP_PORT, &remote_su); addr2sa(nbr->af, &nbr->raddr, LDP_PORT, &remote_su);
if (nbr->af == AF_INET6 && nbr->raddr_scope) if (nbr->af == AF_INET6 && nbr->raddr_scope)