diff options
| author | Martin Mares <mj@ucw.cz> | 2000-01-17 11:52:50 +0000 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2000-01-17 11:52:50 +0000 |
| commit | d272fe22dddcb5c293d6aac18d36e3e3e66406a5 (patch) | |
| tree | 20710583efb431b87ce836c068825dc12be7f0d2 /proto | |
| parent | f7fcb752520759ab3aed274ca608e8e6f96665c8 (diff) | |
Separated `official protocol names' used in status dumps from name templates
used for automatic generation of instance names.
protocol->name is the official name
protocol->template is the name template (usually "name%d"),
should be all lowercase.
Updated all protocols to define the templates, checked that their configuration
grammar includes proto_name which generates the name and interns it in the
symbol table.
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/ospf/ospf.c | 1 | ||||
| -rw-r--r-- | proto/pipe/pipe.c | 1 | ||||
| -rw-r--r-- | proto/rip/rip.c | 1 | ||||
| -rw-r--r-- | proto/static/static.c | 10 | ||||
| -rw-r--r-- | proto/static/static.h | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index db773369..e8704a7f 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -90,6 +90,7 @@ ospf_postconfig(struct proto_config *c) struct protocol proto_ospf = { name: "OSPF", + template: "ospf%d", init: ospf_init, dump: ospf_dump, start: ospf_start, diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c index f439a154..f1a190f9 100644 --- a/proto/pipe/pipe.c +++ b/proto/pipe/pipe.c @@ -163,6 +163,7 @@ pipe_reconfigure(struct proto *p, struct proto_config *new) struct protocol proto_pipe = { name: "Pipe", + template: "pipe%d", postconfig: pipe_postconfig, init: pipe_init, start: pipe_start, diff --git a/proto/rip/rip.c b/proto/rip/rip.c index d863fa38..b8338a5e 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -789,6 +789,7 @@ rip_postconfig(struct proto_config *c) struct protocol proto_rip = { name: "RIP", + template: "rip%d", preconfig: rip_preconfig, postconfig: rip_postconfig, get_route_info: rip_get_route_info, diff --git a/proto/static/static.c b/proto/static/static.c index 4217ad03..c006daf0 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -1,7 +1,7 @@ /* * BIRD -- Static Route Generator * - * (c) 1998--1999 Martin Mares <mj@ucw.cz> + * (c) 1998--2000 Martin Mares <mj@ucw.cz> * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -175,11 +175,19 @@ static_init(struct proto_config *c) return p; } +static int +static_reconfigure(struct proto *p, struct proto_config *new) +{ + return 0; +} + struct protocol proto_static = { name: "Static", + template: "static%d", init: static_init, dump: static_dump, start: static_start, + reconfigure: static_reconfigure, }; static void diff --git a/proto/static/static.h b/proto/static/static.h index 66451183..5d2bd218 100644 --- a/proto/static/static.h +++ b/proto/static/static.h @@ -1,7 +1,7 @@ /* * BIRD -- Static Route Generator * - * (c) 1998 Martin Mares <mj@ucw.cz> + * (c) 1998--2000 Martin Mares <mj@ucw.cz> * * Can be freely distributed and used under the terms of the GNU GPL. */ |