ospfd: fix whitespace error introduced in previous

An area is either a decimal number or an IPv4 address.

This lets us replace inet_aton with inet_pton since we do not need
inet_aton's flexibility.

phessler, sthen and Tom Smyth all confirm that the

An area is either a decimal number or an IPv4 address.

This lets us replace inet_aton with inet_pton since we do not need
inet_aton's flexibility.

phessler, sthen and Tom Smyth all confirm that they never came across
a different way of specifying an area.

OK claudio, deraadt

show more ...

Don't declare variables as "unsigned char *" that are passed to
functions that take "char *" arguments. Where such chars are
assigned to int or passed to ctype functions, explicitly cast them
to uns

Don't declare variables as "unsigned char *" that are passed to
functions that take "char *" arguments. Where such chars are
assigned to int or passed to ctype functions, explicitly cast them
to unsigned char.

For OpenBSD's clang, -Wpointer-sign has been disabled by default,
but when the parse.y code was built elsewhere, the compiler would
complain.

With help from millert@
ok benno@ deraadt@

show more ...

r1.102 forgot to tweak the "redistribute rtlabel" part of the grammar.

fixes "redistribute rtlabel foo" without "depend on".

Fix multiple shift/reduce conflicts in the parser because of the dependon
synatx element with its optional / empty element. While this is needed for
redistribute statements it causes the conflicts in

Fix multiple shift/reduce conflicts in the parser because of the dependon
synatx element with its optional / empty element. While this is needed for
redistribute statements it causes the conflicts in the interface sections
since there the statement can not be empty (this conflicts with empty new
lines handled in optnl). Add a dependonopt for redistribute statements
and make depend on no longer optional.
Also sync the curly bracket blocks (interface, area, ...) to be like
set blocks and the blocks in bgpd. This should result in more flexible
newline handling.
Tested by sthen@, benno@, Kapetanakis Giannis
OK benno@

show more ...

getifaddrs() can return entries where ifa_addr is NULL. Check for this
before accessing anything in ifa_addr.
ok claudio@

Allow the interface setting "type p2p" to be configured globallz or per
area. Most of the other interface settings allow this.

ok denis@

Add point-to-point support for broadcast interfaces.

tested by Kapetanakis Giannis
ok claudio@

Allow specifying area by number as well as id. No change to outputs.

ok remi@ (who did the same change to ospfctl, ospf6d, and ospf6ctl)
ok denis@
some grumbling from sthen@ and bluhm@ who didn't wa

Allow specifying area by number as well as id. No change to outputs.

ok remi@ (who did the same change to ospfctl, ospf6d, and ospf6ctl)
ok denis@
some grumbling from sthen@ and bluhm@ who didn't want output changed.

show more ...

Do not change router-id on reload if unspecified.

OK remi@

Check that depend on interfaces are in the same rdomain. If they are not
the daemon wouldn't notice state changes for those interfaces.

ok benno@

(unsigned) means (unsigned int) which on ptrdiff_t or size_t or other
larger types really is a range reduction...
Almost any cast to (unsigned) is a bug.
ok millert tb benno

Add config option fib-priority to set a custom prio for routes ospfd
inserts into the kernel routing table.

OK claudio@

- odd condition/test in PF lexer
(and other lexers too)

This commit rectifies earlier change:

in the lex... even inside quotes, a \ followed by space or tab should
expand to space or tab,

- odd condition/test in PF lexer
(and other lexers too)

This commit rectifies earlier change:

in the lex... even inside quotes, a \ followed by space or tab should
expand to space or tab, and a \ followed by newline should be ignored
(as a line continuation). compatible with the needs of hoststated
(which has the most strict quoted string requirements), and ifstated
(where one commonly does line continuations in strings).

OK deraadt@, OK millert@

show more ...

replace malloc()+strlcpy() with strndup() in cmdline_symset().

"looks good" gilles@ halex@

Do for most running out of memory err() what was done for most running
out of memory log_warn(). i.e. ("%s", __func__) instead of manual
function names and redundant verbiage about which wrapper dete

Do for most running out of memory err() what was done for most running
out of memory log_warn(). i.e. ("%s", __func__) instead of manual
function names and redundant verbiage about which wrapper detected the
out of memory condition.

ok henning@

show more ...

No need to mention which memory allocation entry point failed (malloc,
calloc or strdup), we just need to log that we ran out of memory in a
particular function.

Recommended by florian@ and deraadt@

No need to mention which memory allocation entry point failed (malloc,
calloc or strdup), we just need to log that we ran out of memory in a
particular function.

Recommended by florian@ and deraadt@

ok benno@ henning@ tb@

show more ...

Be consistent in warn() and log_warn() usage when
running out of memory.

Next step, be correct *and* consistent.

ok dennis@ tb@ benno@ schwarze@

Fix an off-by-one line count when using include statements.

Thanks to otto@ for the initial diff.

OK benno@

Plug leak in error case of the common 'varset' implementations.

ok benno@

Use the new route filter ROUTE_PRIOFILTER in ospfd. Usually we only
need to see routes with a higher priority (lower value) than ospfds
own routes.
ok claudio, ok henning previous version, feedback f

Use the new route filter ROUTE_PRIOFILTER in ospfd. Usually we only
need to see routes with a higher priority (lower value) than ospfds
own routes.
ok claudio, ok henning previous version, feedback from sthen

show more ...

Style tweaks

ok remi@ benno@

Introduce "depend on". This allows ospfd to set the metric dependent
on the status of another interface.

in collaboration with benno@ jca@
OK benno@ jca@

Replace hand-rolled for(;;) emptying of 'symhead' TAILQ with more
modern TAILQ_FOREACH_SAFE().

No intentional functional change.

ok millert@ bluhm@ gilles@

Replace symset()'s hand-rolled for(;;) traversal of 'symhead' TAILQ
with more modern TAILQ_FOREACH(). This what symget() was already
doing.

Add paranoia '{}' around body of symget()'s TAILQ_FOREACH(

Replace symset()'s hand-rolled for(;;) traversal of 'symhead' TAILQ
with more modern TAILQ_FOREACH(). This what symget() was already
doing.

Add paranoia '{}' around body of symget()'s TAILQ_FOREACH().

No intentional functional change.

ok bluhm@ otto@

show more ...