From f203510a7a6ac7a2e6babc0b926ad98076ecdaa8 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Wed, 3 Jul 2019 00:27:14 +0000 Subject: [PATCH] zebra: remove bs irdp error code Signed-off-by: Quentin Young --- zebra/irdp_packet.c | 12 ++++++------ zebra/zebra_errors.c | 8 -------- zebra/zebra_errors.h | 1 - 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 2804787620..f6fe6bbf1e 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -136,10 +136,10 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp) return; if (icmp->code != 0) { - flog_warn(EC_ZEBRA_IRDP_BAD_TYPE_CODE, - "IRDP: RX packet type %d from %s. Bad ICMP type code," - " silently ignored", - icmp->type, inet_ntoa(src)); + flog_warn( + EC_ZEBRA_IRDP_BAD_TYPE_CODE, + "IRDP: RX packet type %d from %s. Bad ICMP type code, silently ignored", + icmp->type, inet_ntoa(src)); return; } @@ -174,8 +174,8 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp) default: flog_warn( - EC_ZEBRA_IRDP_BAD_TYPE, - "IRDP: RX type %d from %s. Bad ICMP type, silently ignored", + EC_ZEBRA_IRDP_BAD_TYPE_CODE, + "IRDP: RX packet type %d from %s. Bad ICMP type code, silently ignored", icmp->type, inet_ntoa(src)); } } diff --git a/zebra/zebra_errors.c b/zebra/zebra_errors.c index cb5f30df1f..5f0a9ec011 100644 --- a/zebra/zebra_errors.c +++ b/zebra/zebra_errors.c @@ -380,14 +380,6 @@ static struct log_ref ferr_zebra_err[] = { .suggestion = "If you wish to receive the messages, change your IRDP settings accordingly.", }, - { - .code = EC_ZEBRA_IRDP_BAD_TYPE, - .title = - "Zebra received IRDP packet with bad type", - .description = - "THIS IS BULLSHIT REMOVE ME", - .suggestion = "asdf", - }, { .code = EC_ZEBRA_RNH_NO_TABLE, .title = diff --git a/zebra/zebra_errors.h b/zebra/zebra_errors.h index 2b7831a408..222055dd81 100644 --- a/zebra/zebra_errors.h +++ b/zebra/zebra_errors.h @@ -85,7 +85,6 @@ enum zebra_log_refs { EC_ZEBRA_IRDP_BAD_CHECKSUM, EC_ZEBRA_IRDP_BAD_TYPE_CODE, EC_ZEBRA_IRDP_BAD_RX_FLAGS, - EC_ZEBRA_IRDP_BAD_TYPE, EC_ZEBRA_RNH_NO_TABLE, EC_ZEBRA_IFLIST_FAILED, EC_ZEBRA_FPM_FORMAT_UNKNOWN,