diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-03-30 13:44:03 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-30 14:29:40 +0300 |
| commit | 8cb40c91cdfb00ddf04e88d3ecd40403890d90f7 (patch) | |
| tree | 6d6a3de27525820abb740f1fa8347b6f03986bad /bgpd/bgp_mplsvpn.c | |
| parent | 86c5d2ee68f7b9c00ae4aeb5c8b3c5d82c5ebffc (diff) | |
| download | quagga-cumulus-take-3.tar.bz2 quagga-cumulus-take-3.tar.xz | |
cumulus take-3cumulus-take-3
Diffstat (limited to 'bgpd/bgp_mplsvpn.c')
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 08a4272d..4a8f5eaa 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -26,6 +26,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "memory.h" #include "stream.h" #include "filter.h" +#include "linklist.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_table.h" @@ -133,16 +134,14 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr, /* sanity check against packet data */ if (prefixlen < VPN_PREFIXLEN_MIN_BYTES*8) { - plog_err (peer->log, - "%s [Error] Update packet error / VPNv4" - " (prefix length %d less than VPNv4 min length)", + zlog_err ("%s [Error] Update packet error / VPNv4" + " (prefix length %d less than VPNv4 min length)", peer->host, prefixlen); return -1; } if ((pnt + psize) > lim) { - plog_err (peer->log, - "%s [Error] Update packet error / VPNv4" + zlog_err ("%s [Error] Update packet error / VPNv4" " (psize %u exceeds packet size (%u)", peer->host, prefixlen, (uint)(lim-pnt)); @@ -152,8 +151,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr, /* sanity check against storage for the IP address portion */ if ((psize - VPN_PREFIXLEN_MIN_BYTES) > (ssize_t) sizeof(p.u)) { - plog_err (peer->log, - "%s [Error] Update packet error / VPNv4" + zlog_err ("%s [Error] Update packet error / VPNv4" " (psize %u exceeds storage size (%zu)", peer->host, prefixlen - VPN_PREFIXLEN_MIN_BYTES*8, sizeof(p.u)); @@ -163,8 +161,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr, /* Sanity check against max bitlen of the address family */ if ((psize - VPN_PREFIXLEN_MIN_BYTES) > prefix_blen (&p)) { - plog_err (peer->log, - "%s [Error] Update packet error / VPNv4" + zlog_err ("%s [Error] Update packet error / VPNv4" " (psize %u exceeds family (%u) max byte len %u)", peer->host, prefixlen - VPN_PREFIXLEN_MIN_BYTES*8, @@ -214,8 +211,7 @@ bgp_nlri_parse_vpn (struct peer *peer, struct attr *attr, /* Packet length consistency check. */ if (pnt != lim) { - plog_err (peer->log, - "%s [Error] Update packet error / VPNv4" + zlog_err ("%s [Error] Update packet error / VPNv4" " (%zu data remaining after parsing)", peer->host, lim - pnt); return -1; |