From d272fe22dddcb5c293d6aac18d36e3e3e66406a5 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 17 Jan 2000 11:52:50 +0000 Subject: 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. --- sysdep/unix/krt.Y | 4 ++-- sysdep/unix/krt.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdep') diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y index 50f31bb..01264d5 100644 --- a/sysdep/unix/krt.Y +++ b/sysdep/unix/krt.Y @@ -1,7 +1,7 @@ /* * BIRD -- UNIX Kernel Syncer Configuration * - * (c) 1998--1999 Martin Mares + * (c) 1998--2000 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -70,7 +70,7 @@ kif_proto_start: proto_start DEVICE { } ; -CF_ADDTO(kif_proto, kif_proto_start '{') +CF_ADDTO(kif_proto, kif_proto_start proto_name '{') CF_ADDTO(kif_proto, kif_proto proto_item ';') CF_ADDTO(kif_proto, kif_proto kif_item ';') diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index bbca8cf..b321729 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -160,6 +160,7 @@ kif_reconfigure(struct proto *p, struct proto_config *new) struct protocol proto_unix_iface = { name: "Device", + template: "device%d", priority: 100, preconfig: kif_preconfig, init: kif_init, @@ -786,6 +787,7 @@ krt_init(struct proto_config *c) struct protocol proto_unix_kernel = { name: "Kernel", + template: "kernel%d", priority: 80, preconfig: krt_preconfig, postconfig: krt_postconfig, -- cgit v1.2.3