Revision 64011f89

View differences:

nest/iface.c
101 101
    debug("%s ", n->iface->name);
102 102
  else
103 103
    debug("[] ");
104
  debug("%s %p", n->proto->cf->name, n->data);
104
  debug("%s %p", n->proto->name, n->data);
105 105
  if (n->flags & NEF_STICKY)
106 106
    debug(" STICKY");
107 107
  debug("\n");
......
319 319

  
320 320
  if (!p->if_notify)
321 321
    return;
322
  debug("Announcing interfaces to new protocol %s\n", p->cf->name);
322
  debug("Announcing interfaces to new protocol %s\n", p->name);
323 323
  WALK_LIST(i, iface_list)
324 324
    p->if_notify(p, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), NULL, i);
325 325
}
nest/protocol.h
20 20
struct proto_config;
21 21
struct config;
22 22
struct proto;
23
struct event;
23 24

  
24 25
/*
25 26
 *	Routing Protocol
......
75 76
  struct protocol *proto;		/* Protocol */
76 77
  struct proto_config *cf;		/* Configuration data */
77 78
  pool *pool;				/* Pool containing local objects */
79
  struct event *attn;			/* "Pay attention" event */
78 80

  
81
  char *name;				/* Name of this instance (== cf->name) */
79 82
  unsigned debug;			/* Debugging flags */
80 83
  unsigned preference;			/* Default route preference */
81 84
  unsigned disabled;			/* Manually disabled */
82 85
  unsigned proto_state;			/* Protocol state machine (see below) */
83 86
  unsigned core_state;			/* Core state machine (see below) */
87
  unsigned core_goal;			/* State we want to reach (see below) */
84 88

  
85 89
  void (*if_notify)(struct proto *, unsigned flags, struct iface *new, struct iface *old);
86 90
  void (*rt_notify)(struct proto *, struct network *net, struct rte *new, struct rte *old);
......
101 105
void *proto_new(struct proto_config *, unsigned size);
102 106
void *proto_config_new(struct protocol *, unsigned size);
103 107

  
104
extern list proto_list, inactive_proto_list;
108
extern list proto_list;
105 109

  
106 110
/*
107 111
 *  Each protocol instance runs two different state machines:
nest/rt-attr.c
139 139
  static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" };
140 140

  
141 141
  debug("p=%s uc=%d %s %s%s%s TOS=%d",
142
	a->proto->cf->name, a->uc, rts[a->source], sco[a->scope], rtc[a->cast],
142
	a->proto->name, a->uc, rts[a->source], sco[a->scope], rtc[a->cast],
143 143
	rtd[a->dest], a->tos);
144 144
  if (a->flags & RTF_EXTERIOR)
145 145
    debug(" EXT");
nest/rt-table.c
121 121

  
122 122
  if (!p->rt_notify)
123 123
    return;
124
  debug("Announcing routes to new protocol %s\n", p->cf->name);
124
  debug("Announcing routes to new protocol %s\n", p->name);
125 125
  while (t)
126 126
    {
127 127
      FIB_WALK(&t->fib, fn)

Also available in: Unified diff