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

Merge pull request #12534 from donaldsharp/notice_missed

Browse Source 
zebra: Notice Optional Router Advertisement types that are not handled
This commit is contained in:
Mark Stapp 2022-12-19 09:31:12 -05:00 committed by GitHub
commit 912c008412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
zebra/rtadv.c
View File

@ -585,6 +585,28 @@ static void rtadv_process_solicit(struct interface *ifp)
zif->rtadv.AdvIntervalTimer = MIN_DELAY_BETWEEN_RAS; zif->rtadv.AdvIntervalTimer = MIN_DELAY_BETWEEN_RAS;
} }
static const char *rtadv_optionalhdr2str(uint8_t opt_type)
{
switch (opt_type) {
case ND_OPT_SOURCE_LINKADDR:
return "Optional Source Link Address";
case ND_OPT_TARGET_LINKADDR:
return "Optional Target Link Address";
case ND_OPT_PREFIX_INFORMATION:
return "Optional Prefix Information";
case ND_OPT_REDIRECTED_HEADER:
return "Optional Redirected Header";
case ND_OPT_MTU:
return "Optional MTU";
case ND_OPT_RTR_ADV_INTERVAL:
return "Optional Advertisement Interval";
case ND_OPT_HOME_AGENT_INFO:
return "Optional Home Agent Information";
}
return "Unknown Optional Type";
}
/* /*
* This function processes optional attributes off of * This function processes optional attributes off of
* end of a RA packet received. At this point in * end of a RA packet received. At this point in
@ -609,6 +631,13 @@ static void rtadv_process_optional(uint8_t *optional, unsigned int len,
&addr->sin6_addr, 1); &addr->sin6_addr, 1);
break; break;
default: default:
if (IS_ZEBRA_DEBUG_PACKET)
zlog_debug(
"%s:Received Packet with optional Header type %s(%u) that is being ignored",
__func__,
rtadv_optionalhdr2str(
opt_hdr->nd_opt_type),
opt_hdr->nd_opt_type);
break; break;
} }

7
zebra/rtadv.h
View File

@ -308,6 +308,7 @@ struct rtadv_prefix {
#define ND_OPT_HA_INFORMATION 8 /* HA Information Option */ #define ND_OPT_HA_INFORMATION 8 /* HA Information Option */
#endif #endif
#ifndef HAVE_STRUCT_ND_OPT_ADV_INTERVAL #ifndef HAVE_STRUCT_ND_OPT_ADV_INTERVAL
struct nd_opt_adv_interval { /* Advertisement interval option */ struct nd_opt_adv_interval { /* Advertisement interval option */
uint8_t nd_opt_ai_type; uint8_t nd_opt_ai_type;
@ -324,6 +325,12 @@ struct nd_opt_adv_interval { /* Advertisement interval option */
#define nd_opt_ai_interval nd_opt_adv_interval_ival #define nd_opt_ai_interval nd_opt_adv_interval_ival
#endif #endif
#endif #endif
#ifndef ND_OPT_RTR_ADV_INTERVAL
#define ND_OPT_RTR_ADV_INTERVAL 7
#endif
#ifndef ND_OPT_HOME_AGENT_INFO
#define ND_OPT_HOME_AGENT_INFO 8
#endif
#ifndef HAVE_STRUCT_ND_OPT_HOMEAGENT_INFO #ifndef HAVE_STRUCT_ND_OPT_HOMEAGENT_INFO
struct nd_opt_homeagent_info { /* Home Agent info */ struct nd_opt_homeagent_info { /* Home Agent info */