mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00
Code Releases Activity

Merge commit 'f8f2419d4c5b9028b9b3d2d893fe802f18eb239b' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2014-04-29 15:24:07 +02:00
commit 52ceae6144
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/birdc.c
View File

@ -148,8 +148,8 @@ input_init(void)
rl_callback_handler_install("bird> ", input_got_line);
// rl_get_screen_size();
term_lns = LINES ? LINES : 25;
term_cls = COLS ? COLS : 80;
term_lns = LINES;
term_cls = COLS;
prompt_active = 1;

5
client/birdcl.c
View File

@ -150,11 +150,6 @@ input_init(void)
term_lns = tws.ws_row;
term_cls = tws.ws_col;
}
else
{
term_lns = 25;
term_cls = 80;
}
}
void

4
client/client.c
View File

@ -178,6 +178,10 @@ init_commands(void)
}
input_init();
term_lns = (term_lns > 0) ? term_lns : 25;
term_cls = (term_cls > 0) ? term_cls : 80;
init = 0;
}

10
filter/test.conf
View File

@ -265,6 +265,7 @@ ec cc;
int set is;
pair set ps;
ec set ecs;
ip set ips;
prefix set pxs;
string s;
{
@ -360,6 +361,12 @@ string s;
if ( b = true ) then print "Testing bool comparison b = true: ", b;
else { print "*** FAIL: TRUE test failed" ; quitbird; }
ips = [ 1.1.1.0 .. 1.1.1.255, 1.2.2.2];
print "Testing IP sets: ";
print ips;
print " must be true: ", 1.1.1.0 ~ ips, ",", 1.1.1.100 ~ ips, ",", 1.2.2.2 ~ ips;
print " must be false: ", 1.1.0.255 ~ ips, ",", 1.1.2.0 ~ ips, ",", 1.2.2.3 ~ ips, ",", 192.168.1.1 ~ ips;
pxs = [ 1.2.0.0/16, 1.4.0.0/16+];
print "Testing prefix sets: ";
print pxs;
@ -386,6 +393,9 @@ string s;
print "1.2.3.4 = ", onetwo;
i = 4200000000;
print "4200000000 = ", i, " false: ", i = 4200000000, " ", i > 4100000000, " false: ", i > 4250000000;
test_undef(2);
test_undef(3);
test_undef(2);