summaryrefslogtreecommitdiff
path: root/bgpd
diff options
context:
space:
mode:
authorLeonid Rosenboim <lrosenbo@wrs.com>2012-12-07 21:31:07 +0000
committerDavid Lamparter <equinox@opensourcerouting.org>2013-01-15 17:22:01 +0100
commit1e0ce7caa622f07c20bb74414a4a5b4cbd732c75 (patch)
tree35a221f0912891b2b04f9337288fbfd479761169 /bgpd
parenta689e6a9f470d2a72493b907c94ef23516bbbda6 (diff)
bgpd: improve logging of invalid BGP Notifications
Invalid BGP Notification messages should be logged locally, cf. RFC4271, Sect. 6.4, p 34, NOTIFICATION Message Error Handling Current notification for invalid Notification code: 2012/10/10 02:17:54 BGP: message index 10 not found in bgp_notify_msg (max is 8) 2012/10/10 02:17:54 BGP: 192.168.1.1 received NOTIFICATION 10/0 ((no item found)) 0 bytes the logging should be a bit more clear. The above logging really doesn't explain much and looks more like a programming error. [rewrote most of it to get in something I can call a shape -David] Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_debug.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index e3e3ec86..726dd862 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -243,31 +243,37 @@ bgp_notify_print(struct peer *peer, struct bgp_notify *bgp_notify,
const char *direct)
{
const char *subcode_str;
+ const char *code_str;
subcode_str = "";
+ code_str = LOOKUP_DEF (bgp_notify_msg, bgp_notify->code,
+ "Unrecognized Error Code");
- switch (bgp_notify->code)
+ switch (bgp_notify->code)
{
case BGP_NOTIFY_HEADER_ERR:
- subcode_str = LOOKUP (bgp_notify_head_msg, bgp_notify->subcode);
+ subcode_str = LOOKUP_DEF (bgp_notify_head_msg, bgp_notify->subcode,
+ "Unrecognized Error Subcode");
break;
case BGP_NOTIFY_OPEN_ERR:
- subcode_str = LOOKUP (bgp_notify_open_msg, bgp_notify->subcode);
+ subcode_str = LOOKUP_DEF (bgp_notify_open_msg, bgp_notify->subcode,
+ "Unrecognized Error Subcode");
break;
case BGP_NOTIFY_UPDATE_ERR:
- subcode_str = LOOKUP (bgp_notify_update_msg, bgp_notify->subcode);
+ subcode_str = LOOKUP_DEF (bgp_notify_update_msg, bgp_notify->subcode,
+ "Unrecognized Error Subcode");
break;
case BGP_NOTIFY_HOLD_ERR:
- subcode_str = "";
break;
case BGP_NOTIFY_FSM_ERR:
- subcode_str = "";
break;
case BGP_NOTIFY_CEASE:
- subcode_str = LOOKUP (bgp_notify_cease_msg, bgp_notify->subcode);
+ subcode_str = LOOKUP_DEF (bgp_notify_cease_msg, bgp_notify->subcode,
+ "Unrecognized Error Subcode");
break;
case BGP_NOTIFY_CAPABILITY_ERR:
- subcode_str = LOOKUP (bgp_notify_capability_msg, bgp_notify->subcode);
+ subcode_str = LOOKUP_DEF (bgp_notify_capability_msg, bgp_notify->subcode,
+ "Unrecognized Error Subcode");
break;
}
@@ -275,15 +281,13 @@ bgp_notify_print(struct peer *peer, struct bgp_notify *bgp_notify,
zlog_info ("%%NOTIFICATION: %s neighbor %s %d/%d (%s%s) %d bytes %s",
strcmp (direct, "received") == 0 ? "received from" : "sent to",
peer->host, bgp_notify->code, bgp_notify->subcode,
- LOOKUP (bgp_notify_msg, bgp_notify->code),
- subcode_str, bgp_notify->length,
+ code_str, subcode_str, bgp_notify->length,
bgp_notify->data ? bgp_notify->data : "");
else if (BGP_DEBUG (normal, NORMAL))
plog_debug (peer->log, "%s %s NOTIFICATION %d/%d (%s%s) %d bytes %s",
peer ? peer->host : "",
direct, bgp_notify->code, bgp_notify->subcode,
- LOOKUP (bgp_notify_msg, bgp_notify->code),
- subcode_str, bgp_notify->length,
+ code_str, subcode_str, bgp_notify->length,
bgp_notify->data ? bgp_notify->data : "");
}