diff options
author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-23 11:50:34 +0100 |
---|---|---|
committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-23 11:50:34 +0100 |
commit | 736e143fa50607fcd88132291e96089b899af979 (patch) | |
tree | c0fcd5fb3174bae8a39b3a32dfe582b2ccb6df17 /nest/rt-attr.c | |
parent | 094d2bdb79e1ffa0a02761fd651aa0f0b6b0c585 (diff) | |
parent | 2b3d52aa421ae1c31e30107beefd82fddbb42854 (diff) |
Merge branch 'master' into add-path
Conflicts:
filter/filter.c
nest/proto.c
nest/rt-table.c
proto/bgp/bgp.h
proto/bgp/config.Y
Diffstat (limited to 'nest/rt-attr.c')
-rw-r--r-- | nest/rt-attr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nest/rt-attr.c b/nest/rt-attr.c index b2bb152f..0fb7c820 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -108,7 +108,7 @@ rte_src_alloc_id(void) if (src_id_used > (src_id_size * 28)) { src_id_size *= 2; - src_ids = mb_realloc(rta_pool, src_ids, src_id_size * sizeof(u32)); + src_ids = mb_realloc(src_ids, src_id_size * sizeof(u32)); bzero(src_ids + i, (src_id_size - i) * sizeof(u32)); goto found; } @@ -551,8 +551,7 @@ ea_same(ea_list *x, ea_list *y) if (a->id != b->id || a->flags != b->flags || a->type != b->type || - ((a->type & EAF_EMBEDDED) ? a->u.data != b->u.data : - (a->u.ptr->length != b->u.ptr->length || memcmp(a->u.ptr->data, b->u.ptr->data, a->u.ptr->length)))) + ((a->type & EAF_EMBEDDED) ? a->u.data != b->u.data : !adata_same(a->u.ptr, b->u.ptr))) return 0; } return 1; |