Unless a filter specifies otherwise, all external routes have type 2

metric 10000.

3 files changed, 5 insertions, 7 deletions

diff --git a/TODO b/TODO
index 2226d0b..61f161a 100644
--- a/TODO
+++ b/TODO
@@ -87,8 +87,6 @@ Last minute stuff:
 ~~~~~~~~~~~~~~~~~~
 Martin:	DOC: korektury
 	DOC: typograficky doladit, vyrobit titulni stranku (ta, co ji vygeneruji SGMLtools, vypada priserne)
-	progdoc: dopsat kapitoly o resourcech a sysdepu
-	OSPF: zkontrolovat defaultni hodnoty metrik
 	Zinscenovat jeste jeden poradny test OSPF
 	Zjistit, kde se bude tisknout a vazat dokumentace
 	DOC: Linux 2.2 je ten, kdo podporuje vice routing tables
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 30be459..9bb0388 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -193,7 +193,7 @@ ospf_import_control(struct proto *p, rte **new, ea_list **attrs, struct linpool
   struct proto_ospf *po=(struct proto_ospf *)p;
 
   if(p==e->attrs->proto) return -1;	/* Reject our own routes */
-  *attrs = ospf_build_attrs(*attrs, pool, 0, 0, 0); /* FIXME: Use better defaults? */
+  *attrs = ospf_build_attrs(*attrs, pool, LSINFINITY, 10000, 0);
   return 0;				/* Leave decision to the filters */
 }
 
@@ -206,8 +206,8 @@ ospf_make_tmp_attrs(struct rte *rt, struct linpool *pool)
 void
 ospf_store_tmp_attrs(struct rte *rt, struct ea_list *attrs)
 {
-  rt->u.ospf.metric1 = ea_get_int(attrs, EA_OSPF_METRIC1, 0);
-  rt->u.ospf.metric2 = ea_get_int(attrs, EA_OSPF_METRIC2, 0);
+  rt->u.ospf.metric1 = ea_get_int(attrs, EA_OSPF_METRIC1, LSINFINITY);
+  rt->u.ospf.metric2 = ea_get_int(attrs, EA_OSPF_METRIC2, 10000);
   rt->u.ospf.tag     = ea_get_int(attrs, EA_OSPF_TAG,     0);
 }
 
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index d2a244c..6be0ca6 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -313,8 +313,8 @@ originate_ext_lsa_body(net *n, rte *e, struct proto_ospf *po, struct ea_list *at
   struct ospf_lsa_ext *ext;
   struct ospf_lsa_ext_tos *et;
   neighbor *nn;
-  u32 m1 = ea_get_int(attrs, EA_OSPF_METRIC1, 0);
-  u32 m2 = ea_get_int(attrs, EA_OSPF_METRIC2, 0);
+  u32 m1 = ea_get_int(attrs, EA_OSPF_METRIC1, LSINFINITY);
+  u32 m2 = ea_get_int(attrs, EA_OSPF_METRIC2, 10000);
   u32 tag = ea_get_int(attrs, EA_OSPF_TAG, 0);
   int inas=0;