summaryrefslogtreecommitdiff
path: root/bgpd
diff options
context:
space:
mode:
authorPaul Jakma <paul@quagga.net>2009-06-02 19:43:51 +0100
committerPaul Jakma <paul@quagga.net>2009-06-02 19:43:51 +0100
commit6e0989e113d9e2268e58cfe29922e971793c1d06 (patch)
tree624de12c4ba2a53c92a38ac6ee0170d108137c37 /bgpd
parent0be8dfb2a95f41f100982085595b7c7505127018 (diff)
parente6b6a56419ed5a2e8cf2cb11eab340d7b0d28055 (diff)
Merge remote branch 'origin/master'
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_community.c2
-rw-r--r--bgpd/bgp_ecommunity.c2
-rw-r--r--bgpd/bgp_routemap.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index a05ea6c6..64c6810f 100644
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -78,7 +78,7 @@ community_del_val (struct community *com, u_int32_t *val)
c = com->size -i -1;
if (c > 0)
- memcpy (com->val + i, com->val + (i + 1), c * sizeof (val));
+ memcpy (com->val + i, com->val + (i + 1), c * sizeof (*val));
com->size--;
diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 27c3cd69..6b221e24 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -97,7 +97,7 @@ ecommunity_add_val (struct ecommunity *ecom, struct ecommunity_val *eval)
/* This function takes pointer to Extended Communites strucutre then
create a new Extended Communities structure by uniq and sort each
- Exteneded Communities value. */
+ Extended Communities value. */
static struct ecommunity *
ecommunity_uniq_sort (struct ecommunity *ecom)
{
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 2d4a8630..bb9014fe 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3321,7 +3321,7 @@ DEFUN (set_ecommunity_rt,
"set extcommunity rt .ASN:nn_or_IP-address:nn",
SET_STR
"BGP extended community attribute\n"
- "Route Target extened communityt\n"
+ "Route Target extended community\n"
"VPN extended community\n")
{
int ret;
@@ -3340,7 +3340,7 @@ DEFUN (no_set_ecommunity_rt,
NO_STR
SET_STR
"BGP extended community attribute\n"
- "Route Target extened communityt\n")
+ "Route Target extended community\n")
{
return bgp_route_set_delete (vty, vty->index, "extcommunity rt", NULL);
}
@@ -3351,7 +3351,7 @@ ALIAS (no_set_ecommunity_rt,
NO_STR
SET_STR
"BGP extended community attribute\n"
- "Route Target extened communityt\n"
+ "Route Target extended community\n"
"VPN extended community\n")
DEFUN (set_ecommunity_soo,