diff options
| author | Martin Mares <mj@ucw.cz> | 1999-02-13 19:42:00 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 1999-02-13 19:42:00 +0100 |
| commit | 4e9498cbb171d52e2f3015d3e9d6c7b1b7205e27 (patch) | |
| tree | 1a65ae5e77e34f43611469568aa1c1ed2010b158 /conf | |
| parent | 67bd949a520151a5ab50090d02617adc4960868c (diff) | |
| download | bird-4e9498cbb171d52e2f3015d3e9d6c7b1b7205e27.tar bird-4e9498cbb171d52e2f3015d3e9d6c7b1b7205e27.zip | |
config->router_id works again.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/conf.c | 4 | ||||
| -rw-r--r-- | conf/conf.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/conf/conf.c b/conf/conf.c index 06cd3d1..dd85735 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -50,10 +50,6 @@ config_parse(struct config *c) cf_lex_init_tables(); protos_preconfig(c); cf_parse(); -#if 0 /* FIXME: We don't have interface list yet :( */ - if (!c->router_id && !(c->router_id = auto_router_id())) - cf_error("Cannot determine router ID (no suitable network interface found), please configure it manually"); -#endif filters_postconfig(); /* FIXME: Do we really need this? */ protos_postconfig(c); return 1; diff --git a/conf/conf.h b/conf/conf.h index 54f5d5e..69f4a02 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -18,7 +18,6 @@ struct config { linpool *mem; /* Linear pool containing configuration data */ list protos; /* Configured protocol instances (struct proto_config) */ u32 router_id; /* Our Router ID */ - u16 this_as; /* Our Autonomous System Number */ char *err_msg; /* Parser error message */ int err_lino; /* Line containing error */ char *file_name; /* Name of configuration file */ |