Commit 93fb60d5 authored by Martin Mareš's avatar Martin Mareš
Browse files

Fixed few misspellings and exported instance init as rip_init_instance().

parent 8450be97
...@@ -139,7 +139,7 @@ givemore: ...@@ -139,7 +139,7 @@ givemore:
c->rif->busy = NULL; c->rif->busy = NULL;
rem_node(NODE c); rem_node(NODE c);
mb_free(c); mb_free(c);
debug( "done\n" ); debug( " done\n" );
return; return;
} }
...@@ -428,7 +428,7 @@ rip_timer(timer *t) ...@@ -428,7 +428,7 @@ rip_timer(timer *t)
static void static void
rip_start(struct proto *p) rip_start(struct proto *p)
{ {
debug( "RIP: initializing instance...\n" ); debug( "RIP: starting instance...\n" );
P->magic = RIP_MAGIC; P->magic = RIP_MAGIC;
init_list( &P->rtable ); init_list( &P->rtable );
...@@ -516,7 +516,7 @@ new_iface(struct proto *p, struct iface *new) ...@@ -516,7 +516,7 @@ new_iface(struct proto *p, struct iface *new)
i->sock->daddr = new->opposite; i->sock->daddr = new->opposite;
if (!ipa_nonzero(i->sock->daddr)) if (!ipa_nonzero(i->sock->daddr))
log( L_WARN "RIP: interface %s is too strange for me\n", i->iface->name ); log( L_WARN "RIP: interface %s is too strange for me", i->iface->name );
if (sk_open(i->sock)<0) if (sk_open(i->sock)<0)
die( "RIP/%s: could not listen on %s\n", p->name, i->iface->name ); die( "RIP/%s: could not listen on %s\n", p->name, i->iface->name );
...@@ -610,12 +610,9 @@ rip_rte_remove(net *net, rte *rte) ...@@ -610,12 +610,9 @@ rip_rte_remove(net *net, rte *rte)
rem_node( &rte->u.rip.garbage ); rem_node( &rte->u.rip.garbage );
} }
static void void
rip_preconfig(struct protocol *x) rip_init_instance(struct proto *p)
{ {
struct proto *p = proto_new(&proto_rip, sizeof(struct rip_data));
debug( "RIP: preconfig\n" );
p->preference = DEF_PREF_RIP; p->preference = DEF_PREF_RIP;
p->start = rip_start; p->start = rip_start;
p->if_notify = rip_if_notify; p->if_notify = rip_if_notify;
...@@ -627,6 +624,12 @@ rip_preconfig(struct protocol *x) ...@@ -627,6 +624,12 @@ rip_preconfig(struct protocol *x)
p->dump = rip_dump; p->dump = rip_dump;
} }
static void
rip_preconfig(struct protocol *x)
{
debug( "RIP: preconfig\n" );
}
static void static void
rip_postconfig(struct protocol *p) rip_postconfig(struct protocol *p)
{ {
...@@ -640,4 +643,3 @@ struct protocol proto_rip = { ...@@ -640,4 +643,3 @@ struct protocol proto_rip = {
rip_preconfig, rip_preconfig,
rip_postconfig rip_postconfig
}; };
...@@ -81,3 +81,5 @@ struct rip_data { ...@@ -81,3 +81,5 @@ struct rip_data {
#define RIP_MAGIC 81861253 #define RIP_MAGIC 81861253
#define CHK_MAGIC do { if (P->magic != RIP_MAGIC) die( "Not enough magic\n" ); } while (0) #define CHK_MAGIC do { if (P->magic != RIP_MAGIC) die( "Not enough magic\n" ); } while (0)
void rip_init_instance(struct proto *p);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment