* ospf_zebra.c: (ospf_interface_delete) Do not delete the interface
params, nor the interface structure, if an interface delete
message is received from zebra.
* ospf_interface.c: (ospf_if_delete_hook) Delete the interface
params and interface, ie that which was previously removed in
(ospf_interface_delete) above.
* tests/test-sig.c: New file, regression test for sigevents.
* lib/Makefile.am: add sigevent.{c,h}
* (isis|rip|ripng|ospf|ospf6|bgp)d/\1_main.c: modify for sigevents.
* zebra/main.c: ditto.
while trying not to change semantics. Add ifdefed-out code to
avoid matching ppp interfaces whose destination address does not
also match the prefix under consideration, to help out people with
problems due to as-yet-unfixed bugs with p2p interfaces coming and
going.
files, defaulting to sysconfdir (matching previous behavior).
This is needed to support (cleanly) NetBSD pkgsrc, which requires that
example config files go in $(prefix)/share/examples/pkgname, rather
than in $(prefix)/etc/pkgname.
* ospfd/ospf_interface.c: (ospf_if_table_lookup) grab reference to
rn->info /before/ calling route_unlock_node() as some systems
may deliberately poison freed memory, eg FreeBSD 5.1.
see [quagga-dev 417].
* ospfd/ospfd.c: Do not increment act_int for an area, as it is done
by ospf_ism.c::ism_change_state() - results in incorrect figure
for active interfaces in an area.
* configure.ac: Check for fcntl()
* {bgpd,ospf,ospf6d,ripd,ripngd}/Makefile.am: Install conf file via
regular automake means, not magic install incantations, see
bug #38.
* lib/Makefile.am: install the headers, needed to link libzebra.a
(and hence libospf.a, OSPF-API, etc.)
* ospfd/ospf_interface: (ospf_if_lookup_table) new function to
lookup oi for a given prefix in a given interfaces table of oi's.
(ospf_if_new) use ospf_if_lookup_table to deal with zebra
reporting new interface multiple times.
NB: This patch is a complete plaster-band of a hack. First, why is
zebra reporting interface events multiple times? Second, why does
ospfd maintain so many damn lists and tables relating to oi's -
these should be reconciled into one or two tables.
* ospf_lsa.h: Add OSPF_LSA_PREMATURE_AGE flag.
* ospf_lsa.c: added better debug comments. check sequence number in
ospf_lsa_install. ospf_maxage_lsa_remover() checks for
OSPF_LSA_PREMATURE_AGE and re-originates the lsa after ls_acks are
received.
* ospf_flood.c: improve debug statement- print ls_seqnum.
* zebra/connected.c: revert the 'generic PtP' patch as it causes
far too many problems. People who use FreeSWAN should investigate
native linux ipsec.
* zebra/rt_netlink.c: ditto
* lib/if.c: ditto
* ripd/ripd.h: ditto
* ripd/ripd.c: ditto
* ripd/rip_interface.c: ditto
* ospfd/ospfd.c: ditto
* ospfd/ospf_snmp.c: ditto
* bgpd/bgp_nexthop.c: ditto
* ospf_packet.c (ospf_associate_packet_vl): pass NULL struct
interface to ospf_if_lookup_by_local_addr() rather than the
receiving interface ifp, packets for VL's could come in any
interface. See quagga-dev 250.
* bgpd/bgp_routemap.c: attr->med is type u_in32_t, should be
compared with UINT32_MAX
* ospfd/ospfd.c: remove redundant assert
* zebra/rtadv.c: add missing include for zebra/rib.h
* lib/if.c: (if_cmp_func) new function, compare interface names in
alphabetical order.
(if_create) Take name as argument and add interface in sorted order.
(if_get_by_name),(interface_cmd) fixup calls to if_create - see
above.
(if_init) register list comparison function.
* lib/if.h: Add comparison function, modify if_create prototype.
* lib/zclient.c: Modify call to if_create.
* ospfd/ospf_interface.c: (ospf_vl_new) modify call to if_create.
change sprintf to snprintf.
* zebra/kernel_socket.c: (ifm_read) modify call to if_create.
* ospf_packet.c (ospf_ls_upd_send_queue_event): get next route
node in body of the loop to avoid chance that route node
is unlocked and deleted before the next iteration tries to
get next route node.
* lib/version.h: add ZEBRA_URL (unused for now)
* lib/vty.c: CMD_ERR_NOTHING_TODO when reading conf file should not
be fatal. slight reformating.
* ospfd/ospf_zebra.c: ignore reject/blackhole routes if zebra sends
these type of routes. probably should be a new type of route to
allow daemons to more easily choose whether to redistribute them
- rathen than just a flag (eg for reject/blackhole).
reorder the is_prefix_default test for ZEBRA_IPV4_ROUTE_DELETE to
avoid the inverted test - slightly more readable.
* redhat/zebra.spec.in: Add ospfapi port to services file, if
with_ospfapi.
* zebra/rib.h: Change nexthop types to an enum.
* zebra/rt_netlink.c: run it through indent -nut.
Add nexthop_types_desc[] descriptive array for nexthop types.
(netlink_route_multipath) debug statements indicate which branch
they are in and print out nexthop type.
* zebra/zebra_rib.c: slight reformatting.
* zebra/zebra_vty.c: Pass ZEBRA_FLAG_BLACKHOLE flag to
static_add_ipv4() if Null0 route is configured. print out Null0 if
STATIC_IPV4_BLACKHOLE route, and ignore flags (shouldnt be
possible to set flags from vty) for config and show route.
* ospf_lsa.c: fix up some places where an NSSA specific define,
(OSPF_LSA_LOCAL_XLT) was referenced in if statements without being
ifdef'ed by HAVE_NSSA.
* (global): Add/fixup NSSA ABR translation functionality
* ospfd.h: Adjust the NSSA ROLE defines. Rename STATE to TRANSLATE.
Rename the LSA_NSSA_GET define to LSA_OPTIONS_NSSA_GET.
* ospfd.c: Adjust to match changes to ospfd.h
* ospf_te.c: Adjust to match change to LSA_NSSA_GET.
* ospf_lsa.h: slights reformatting.
Add new NSSA functions, ospf_translated_nssa_compare() (not
currently used), ospf_translated_nssa_refresh() and
ospf_translated_nssa_originate().
* ospf_lsa.c: Implemented aforementioned new functions. Fix up
several NSSA hooks to /not/ be called for Type-5s which are
translated. Add additional hooks. Set the ROUTER_LSA_NT bit in
router-lsa flags if ABR does translation. New function,
ospf_lsa_translated_nssa_new() implemented. Dont register
translated LSAs for refreshing - instead we implicitly rely on
the ASBR refreshing the Type-7, and refresh the translated Type-5
at the same time. Some minor reformatting. Extra debug info added.
Also, existing debug statements modified to report LSA Id.
* ospf_flood.c: call ospf_translated_nssa_refresh() when refreshing
Type-7. minor reformatting.
* ospf_dump.c: Dump NSSA LSAs.
* ospf_asbr.h: slight reformatting. Export
ospf_external_route_lookup() (though, not used. probably will
undo this).
* ospf_abr.c: Slight reformatting in many places. Update to match
ospfd.h changes.
(ospf_abr_translate_nssa): make it work, using the new ospf_lsa
translation functions.
(Several places): change struct prefix * to struct prefix_ipv4 *.
(might as well do the casts at higher levels). Add more debug
info.
(ospf_abr_announce_stub_defaults): announce default to NSSA areas
too.
(ospf_abr_announce_nssa_defaults): do nothing. this function
probably should die. (see ospf_abr_announce_stub_defaults).
(ospf_abr_task_timer): run NSSA tasks.
* ospf_packet.c: (ospf_ls_upd_send_queue_event) undo fix suggested
Mikael Lonnroth. As per Kamatchi Soundaram /
[zebra 19590], original behaviour is correct.
* ospf_vty.c: (global) add, unused, description array for lsa flags.
(show_ip_ospf_database_header): pretty print options, printf hex
numbers as 0x, print lsa flags and note if it is a translated LSA.
(show_lsa_detail_proc): print out OSPF_LSA_LOCAL_XLT LSAs.
* ospf_packet.c: (ospf_write) print out destination IP in debug info
if write fails.
* ospf_vty.c (ospf_area_stub_no_summary): fix typo.
(ospf_area_nssa_cmd_handler): new function to handle the
area.*nssa commands.
(ospf_area_nssa_cmd): changed to call ospf_area_nssa_cmd_handler
(ospf_area_nssa_translate_cmd) ditto
(ospf_area_nssa_translate_cmd): changed from ALIAS to defun, call
ospf_area_nssa_cmd_handler
(ospf_area_nssa_translate_no_summary_cmd): ditto
(no_ospf_area_nssa_cmd): call ospf_schedule_abr_task()
(show_ip_ospf_area): Formatting cleanups. Properly print out NSSA
area configuration.
show_router_lsa_detail: Add missing newline
(show_network_lsa_detail): ditto
(show_summary_lsa_detail): ditto
(show_summary_asbr_lsa_detail): ditto
(show_ip_ospf_route_router): fix spacing
(config_write_ospf_area): actually write out proper state for NSSA
area.
* ospf_abr.c (ospf_abr_nssa_am_elected): new function.
Look through LSDB for an area and try determine whether other
routers are more 'electable' than this router. Presumes caller
has checked Role.
(ospf_abr_nssa_check_status): new function. check any NSSA related
status changes. At present determines NSSATranslatorState should
be enabled or disabled.
(ospf_abr_announce_network_to_area): remove the redundant
call to ospf_abr_announce_network_to_area() (as per Vadim,
[zebra 14710], problem 7).
(global): Update NSSATranslator to NSSATranslatorState as per
ospfd.h changes
(ospf_abr_announce_nssa_defaults): call
ospf_abr_announce_network_to_area() to inject default summaries.
(ospf_abr_nssa_task): undo commented out calls to
ospf_abr_prepare_aggregates() and ospf_abr_send_nssa_aggregates(),
if they're borked, lets fix them.
(ospf_abr_task): remove call to ospf_abr_nssa_task() - move this
to the timer scheduler.
(ospf_abr_task_timer): call ospf_abr_nssa_task() and
ospf_abr_nssa_check_status()
(misc): some minor reformatting.
* ospfd.c (ospf_area_nssa_set): Set defaults for NSSA Role, State
and Stability Interval and no_summary.
(ospf_area_nssa_translator_role_(un?)set): Update to
NSSATranslatorRole
* ospf_route.c: delete routes generated from AS-External routes if
there is a inter/intra route. Adds ospf_route_delete_same_ext()
which prunes external routes, which is called from
ospf_route_install() when new route table is installed.
* ospf_lsa.c (router_lsa_flags): Set the correct flags for
router-lsa's. Eg OSPF_FLAG_ASBR is /not/ an LSA flag, its an
internal ospfd flag (just happens to have same value as
ROUTER_LSA_EXTERNAL). Set ROUTER_LSA_EXTERNAL for ASBRs,
ROUTER_LSA_BORDER for ABRs and ROUTER_LSA_NT for NSSA ABRs which
are OSPF_NSSA_ROLE_ALWAYS translators.
