Better rt dumping.

2 files changed, 3 insertions, 4 deletions

diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index f55bec88..7fff7efb 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -208,11 +208,12 @@ ospf_get_route_info(rte *rte, byte *buf, ea_list *attrs)
     met='1';
     type='E';
   }
-  //if(rte->u.ospf.type=='E') met='1';
   if(rte->u.ospf.metric2!=0) met='2';
   if(rte->attrs->source==RTS_OSPF_IA) type='A';
   if(rte->attrs->source==RTS_OSPF) type='I';
-  buf += bsprintf(buf, " %c%c %d", rte->u.ospf.type, met, 
+  buf += bsprintf(buf, " %c", type);
+  if(met!=' ') buf += bsprintf(buf, "%c", met);
+  buf += bsprintf(buf, " (%d/%d)", rte->pref,
     (rte->u.ospf.metric2==0) ? rte->u.ospf.metric1 : rte->u.ospf.metric2);
 }
 
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 6b4c18f3..d50e438a 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -229,7 +229,6 @@ again:
         e->u.ospf.metric1=nf->metric;
         e->u.ospf.metric2=0;
         e->u.ospf.tag=0;			/* FIXME Some config? */
-	e->u.ospf.type='I';
         e->pflags = 0;
         e->net=ne;
 	e->pref = p->preference;
@@ -449,7 +448,6 @@ noch:
       e->u.ospf.metric1=nf->metric;
       e->u.ospf.metric2=nf->metric2;
       e->u.ospf.tag=0;			/* FIXME Some config? */
-      e->u.ospf.type='E';
       e->pflags = 0;
       e->net=ne;
       e->pref = p->preference;