mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-17 08:38:42 +00:00
Code Releases Activity

Fix some minor issues

Browse Source
This commit is contained in:
Ondrej Zajicek (work) 2017-12-12 15:56:31 +01:00
parent cb5df823ac
commit ac48e72bf6
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/flowspec_test.c
View File

@ -70,8 +70,8 @@ t_first_part(void)
net_addr_flow4 *f; net_addr_flow4 *f;
NET_ADDR_FLOW4_(f, ip4_build(10,0,0,1), 24, ((byte[]) { 0x00, 0x00, 0xab })); NET_ADDR_FLOW4_(f, ip4_build(10,0,0,1), 24, ((byte[]) { 0x00, 0x00, 0xab }));
const byte const *under240 = &f->data[1]; const byte *under240 = &f->data[1];
const byte const *above240 = &f->data[2]; const byte *above240 = &f->data[2];
/* Case 0x00 0x00 */ /* Case 0x00 0x00 */
bt_assert(flow4_first_part(f) == NULL); bt_assert(flow4_first_part(f) == NULL);

4
lib/net.h
View File

@ -358,10 +358,10 @@ static inline int net_zero_roa6(const net_addr_roa6 *a)
{ return !a->pxlen && ip6_zero(a->prefix) && !a->max_pxlen && !a->asn; } { return !a->pxlen && ip6_zero(a->prefix) && !a->max_pxlen && !a->asn; }
static inline int net_zero_flow4(const net_addr_flow4 *a) static inline int net_zero_flow4(const net_addr_flow4 *a)
{ return !a->pxlen && ip4_zero(a->prefix) && !a->data; } { return !a->pxlen && ip4_zero(a->prefix) && (a->length == sizeof(net_addr_flow4)); }
static inline int net_zero_flow6(const net_addr_flow6 *a) static inline int net_zero_flow6(const net_addr_flow6 *a)
{ return !a->pxlen && ip6_zero(a->prefix) && !a->data; } { return !a->pxlen && ip6_zero(a->prefix) && (a->length == sizeof(net_addr_flow6)); }
static inline int net_zero_mpls(const net_addr_mpls *a) static inline int net_zero_mpls(const net_addr_mpls *a)
{ return !a->label; } { return !a->label; }

4
sysdep/bsd/krt-sock.Y
View File

@ -20,8 +20,8 @@ kern_sys_item:
KERNEL TABLE expr { KERNEL TABLE expr {
if ($3 && (krt_max_tables == 1)) if ($3 && (krt_max_tables == 1))
cf_error("Multiple kernel routing tables not supported"); cf_error("Multiple kernel routing tables not supported");
if ($3 < 0 || $3 >= krt_max_tables) if ($3 >= krt_max_tables)
cf_error("Kernel table id must be in range 0-%d", krt_max_tables - 1); cf_error("Kernel table id must be in range 0-%u", krt_max_tables - 1);
THIS_KRT->sys.table_id = $3; THIS_KRT->sys.table_id = $3;
} }

10
sysdep/bsd/krt-sock.c
View File

@ -74,11 +74,11 @@ const int rt_default_ecmp = 0;
/* Dynamic max number of tables */ /* Dynamic max number of tables */
int krt_max_tables; uint krt_max_tables;
#ifdef KRT_USE_SYSCTL_NET_FIBS #ifdef KRT_USE_SYSCTL_NET_FIBS
static int static uint
krt_get_max_tables(void) krt_get_max_tables(void)
{ {
int fibs; int fibs;
@ -90,7 +90,11 @@ krt_get_max_tables(void)
return 1; return 1;
} }
return MIN(fibs, KRT_MAX_TABLES); /* Should not happen */
if (fibs < 1)
return 1;
return (uint) MIN(fibs, KRT_MAX_TABLES);
} }
#else #else

2
sysdep/bsd/krt-sys.h
View File

@ -31,7 +31,7 @@ static inline void kif_sys_copy_config(struct kif_config *d UNUSED, struct kif_c
/* Kernel routes */ /* Kernel routes */
extern int krt_max_tables; extern uint krt_max_tables;
struct krt_params { struct krt_params {
int table_id; /* Kernel table ID we sync with */ int table_id; /* Kernel table ID we sync with */