Make rip use newly defined password lists.

This commit is contained in:
Pavel Machek 1999-05-26 14:37:47 +00:00
parent 858a717796
commit fd5f8704bb
3 changed files with 5 additions and 4 deletions

View file

@ -24,7 +24,7 @@ struct rip_patt *rip_get_iface(void);
CF_DECLS CF_DECLS
CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME, PASSWORD, CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME, PASSWORDS,
MODE, BROADCAST, QUIET, NOLISTEN, VERSION1, MODE, BROADCAST, QUIET, NOLISTEN, VERSION1,
AUTHENTICATION, NONE, PLAINTEXT, MD5) AUTHENTICATION, NONE, PLAINTEXT, MD5)
@ -47,8 +47,8 @@ RIP_CFG:
| RIP_CFG PORT expr ';' { RIP_CFG->port = $3; } | RIP_CFG PORT expr ';' { RIP_CFG->port = $3; }
| RIP_CFG PERIOD expr ';' { RIP_CFG->period = $3; } | RIP_CFG PERIOD expr ';' { RIP_CFG->period = $3; }
| RIP_CFG GARBAGETIME expr ';' { RIP_CFG->garbage_time = $3; } | RIP_CFG GARBAGETIME expr ';' { RIP_CFG->garbage_time = $3; }
| RIP_CFG PASSWORD TEXT ';' { RIP_CFG->password = $3; }
| RIP_CFG AUTHENTICATION rip_auth ';' {RIP_CFG->authtype = $3; } | RIP_CFG AUTHENTICATION rip_auth ';' {RIP_CFG->authtype = $3; }
| RIP_CFG PASSWORDS '{' password_list '}' {RIP_CFG->passwords = $4; }
| RIP_CFG rip_iface_list ';' | RIP_CFG rip_iface_list ';'
; ;

View file

@ -603,7 +603,7 @@ rip_init_config(struct rip_proto_config *c)
c->port = 520; c->port = 520;
c->period = 30; c->period = 30;
c->garbage_time = 120+180; c->garbage_time = 120+180;
c->password = "PASSWORD"; c->passwords = NULL;
c->authtype = AT_NONE; c->authtype = AT_NONE;
} }

View file

@ -3,6 +3,7 @@
*/ */
#include "nest/route.h" #include "nest/route.h"
#include "nest/password.h"
struct rip_connection { struct rip_connection {
node n; node n;
@ -92,7 +93,7 @@ struct rip_proto_config {
int period; int period;
int garbage_time; int garbage_time;
char *password; struct password_item *passwords;
int authtype; int authtype;
#define AT_NONE 0 #define AT_NONE 0
#define AT_PLAINTEXT 2 #define AT_PLAINTEXT 2