4 files changed, 16 insertions, 5 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index b0bb62ac..d76aaae7 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -11,6 +11,9 @@
 char *ospf_is[]={ "down", "loop", "waiting", "point-to-point", "drother",
   "backup", "dr" };
 
+char *ospf_ism[]={ "interface up", "wait timer fired", "backup seen",
+  "neighbor change", "loop indicated", "unloop indicated", "interface down"};   
+
 void
 iface_chstate(struct ospf_iface *ifa, u8 state)
 {
@@ -69,8 +72,8 @@ ospf_int_sm(struct ospf_iface *ifa, int event)
 
   p=(struct proto *)(ifa->proto);
 
-  DBG("%s: SM on iface %s. Event is %d.\n",
-    p->name, ifa->iface->name, event);
+  DBG("%s: SM on iface %s. Event is \"%s\".\n",
+    p->name, ifa->iface->name, ospf_ism[event]);
 
   switch(event)
   {
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 95761173..4565d4e7 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -11,6 +11,11 @@
 char *ospf_ns[]={"down", "attempt", "init", "2way", "exstart", "exchange",
   "loading", "full"};
 
+const char *ospf_inm[]={ "hello received", "neighbor start", "2-way received",
+  "negotiation done", "exstart done", "bad ls request", "load done",
+  "adjacency ok?", "sequence mismatch", "1-way received", "kill neighbor",
+  "inactivity timer", "line down" };
+
 void
 neigh_chstate(struct ospf_neighbor *n, u8 state)
 {
@@ -177,6 +182,9 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
 
   p=(struct proto *)(n->ifa->proto);
 
+  DBG("%s: Neighbor state machine for neighbor %I, event \"%s\".\n",
+    p->name, n->rid, ospf_inm[event]);
+
   switch(event)
   {
     case INM_START:
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index a806de69..9c432b4d 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -45,9 +45,9 @@ ospf_dump(struct proto *p)
 
   WALK_LIST(NODE oa,po->area_list)
   {
-    debug("\n%s: LSA graph dump for area \"%d\" start:\n", p->name,oa->areaid);
+    debug("\n%s: LSA graph dump for area \"%I\" start:\n", p->name,oa->areaid);
     ospf_top_dump(oa->gr);
-    debug("%s: LSA graph dump for area \"%d\" finished\n\n", p->name,
+    debug("%s: LSA graph dump for area \"%I\" finished\n\n", p->name,
       oa->areaid);
   }
 
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 4280e110..2200aa21 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -34,7 +34,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length, struct proto_ospf *p)
   struct top_hash_entry *old;
   struct proto_ospf *po=(struct proto_ospf *)p;
 
-  DBG("%s: Originating RT_lsa body for area \"%d\".\n", po->proto.name, oa->areaid);
+  DBG("%s: Originating RT_lsa body for area \"%I\".\n", po->proto.name, oa->areaid);
 
   WALK_LIST (ifa, p->iface_list) i++;
   {