proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: check ORIGINATOR_ID attribute flags

Browse Source 
* bgp_attr.c
  * bgp_attr_originator_id(): accept extra argument, add checks for
    "optional", "transitive" and "partial" bits, log each error
    condition independently
  * bgp_attr_parse(): provide extra arguments
This commit is contained in:
Denis Ovsienko 2011-09-30 15:08:54 +04:00
parent 566b36ebf9
commit d595b566bc
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bgpd/bgp_attr.c
View File

@ -1353,8 +1353,24 @@ bgp_attr_community (struct peer *peer, bgp_size_t length,
/* Originator ID attribute. */ /* Originator ID attribute. */
static bgp_attr_parse_ret_t static bgp_attr_parse_ret_t
bgp_attr_originator_id (struct peer *peer, bgp_size_t length, bgp_attr_originator_id (struct peer *peer, bgp_size_t length,
struct attr *attr, u_char flag) struct attr *attr, u_char flag, u_char *startp)
{ {
bgp_size_t total;
total = length + (CHECK_FLAG (flag, BGP_ATTR_FLAG_EXTLEN) ? 4 : 3);
/* Flag checks. */
if (flag != BGP_ATTR_FLAG_OPTIONAL)
{
if (! CHECK_FLAG (flag, BGP_ATTR_FLAG_OPTIONAL))
zlog (peer->log, LOG_ERR, "ORIGINATOR_ID attribute must be flagged as \"optional\" (%u)", flag);
if (CHECK_FLAG (flag, BGP_ATTR_FLAG_TRANS))
zlog (peer->log, LOG_ERR, "ORIGINATOR_ID attribute must not be flagged as \"transitive\" (%u)", flag);
if (CHECK_FLAG (flag, BGP_ATTR_FLAG_PARTIAL))
zlog (peer->log, LOG_ERR, "ORIGINATOR_ID attribute must not be flagged as \"partial\" (%u)", flag);
bgp_notify_send_with_data (peer, BGP_NOTIFY_UPDATE_ERR, BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR, startp, total);
return -1;
}
/* Length check. */
if (length != 4) if (length != 4)
{ {
zlog (peer->log, LOG_ERR, "Bad originator ID length %d", length); zlog (peer->log, LOG_ERR, "Bad originator ID length %d", length);
@ -1807,7 +1823,7 @@ bgp_attr_parse (struct peer *peer, struct attr *attr, bgp_size_t size,
ret = bgp_attr_community (peer, length, attr, flag, startp); ret = bgp_attr_community (peer, length, attr, flag, startp);
break; break;
case BGP_ATTR_ORIGINATOR_ID: case BGP_ATTR_ORIGINATOR_ID:
ret = bgp_attr_originator_id (peer, length, attr, flag); ret = bgp_attr_originator_id (peer, length, attr, flag, startp);
break; break;
case BGP_ATTR_CLUSTER_LIST: case BGP_ATTR_CLUSTER_LIST:
ret = bgp_attr_cluster_list (peer, length, attr, flag); ret = bgp_attr_cluster_list (peer, length, attr, flag);