Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simple autentication added.

Browse source
This commit is contained in:
Ondrej Filip 2000-06-06 01:23:03 +00:00
parent fef1badfcf
commit c1824c4d4c
5 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/bird.conf.example
View file

@ -117,6 +117,8 @@ protocol static {
# dead count 5; # dead count 5;
# wait 50; # wait 50;
# type broadcast; # type broadcast;
# authentication simple;
# password "pass";
# }; # };
# interface "arc0" { # interface "arc0" {
# type nonbroadcast; # type nonbroadcast;
@ -130,6 +132,7 @@ protocol static {
# stub 1; # stub 1;
# interface "ppp1" { # interface "ppp1" {
# hello 8; # hello 8;
# authentication none;
# }; # };
# }; # };
#} #}

6
proto/ospf/config.Y
View file

@ -23,7 +23,7 @@ CF_DECLS
CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG) CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG)
CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT) CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT)
CF_KEYWORDS(HELLO, TRANSIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE) CF_KEYWORDS(HELLO, TRANSIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE)
CF_KEYWORDS(NEIGHBORS) CF_KEYWORDS(NEIGHBORS, NONE, SIMPLE, AUTHENTICATION, PASSWORD)
%type <t> opttext %type <t> opttext
@ -86,6 +86,9 @@ ospf_iface_item:
| TYPE NONBROADCAST { OSPF_PATT->type = OSPF_IT_NBMA ; } | TYPE NONBROADCAST { OSPF_PATT->type = OSPF_IT_NBMA ; }
| TYPE POINTOPOINT { OSPF_PATT->type = OSPF_IT_PTP ; } | TYPE POINTOPOINT { OSPF_PATT->type = OSPF_IT_PTP ; }
| NEIGHBORS '{' ipa_list '}' | NEIGHBORS '{' ipa_list '}'
| AUTHENTICATION NONE { OSPF_PATT->autype=AU_NONE ; }
| AUTHENTICATION SIMPLE { OSPF_PATT->autype=AU_SIMPLE ; }
| PASSWORD TEXT { memcpy(OSPF_PATT->password, $2, 8); }
| |
; ;
@ -116,6 +119,7 @@ ospf_iface_start:
OSPF_PATT->deadc = DEADC_D; OSPF_PATT->deadc = DEADC_D;
OSPF_PATT->type = OSPF_IT_UNDEF; OSPF_PATT->type = OSPF_IT_UNDEF;
init_list(&OSPF_PATT->nbma_list); init_list(&OSPF_PATT->nbma_list);
OSPF_PATT->autype=AU_NONE;
} }
; ;

4
proto/ospf/iface.c
View file

@ -398,8 +398,8 @@ ospf_ifa_add(struct object_lock *lock)
ifa->helloint=ip->helloint; ifa->helloint=ip->helloint;
ifa->waitint=ip->waitint; ifa->waitint=ip->waitint;
ifa->deadc=ip->deadc; ifa->deadc=ip->deadc;
ifa->autype=0; /* FIXME add authentification */ ifa->autype=ip->autype;
for(i=0;i<8;i++) ifa->aukey[i]=0; memcpy(ifa->aukey,ip->password,8);
ifa->options=2; /* FIXME what options? */ ifa->options=2; /* FIXME what options? */
if(ip->type==OSPF_IT_UNDEF) if(ip->type==OSPF_IT_UNDEF)

5
proto/ospf/ospf.h
View file

@ -377,6 +377,11 @@ struct ospf_iface_patt {
int waitint; int waitint;
int deadc; int deadc;
int type; int type;
int autype;
#define AU_NONE 0
#define AU_SIMPLE 1
#define AU_CRYPT 2
u8 password[8];
list nbma_list; list nbma_list;
}; };

28
proto/ospf/packet.c
View file

@ -31,10 +31,29 @@ fill_ospf_pkt_hdr(struct ospf_iface *ifa, void *buf, u8 h_type)
void void
ospf_tx_authenticate(struct ospf_iface *ifa, struct ospf_packet *pkt) ospf_tx_authenticate(struct ospf_iface *ifa, struct ospf_packet *pkt)
{ {
/* FIXME */ int i;
pkt->autype=ifa->autype;
memcpy(pkt->authetication, ifa->aukey, 8);
return; return;
} }
int
ospf_rx_authenticate(struct ospf_iface *ifa, struct ospf_packet *pkt)
{
int i;
if(pkt->autype!=ifa->autype) return 0;
if(ifa->autype==AU_NONE) return 1;
if(ifa->autype==AU_SIMPLE)
{
for(i=0;i<8;i++)
{
if(pkt->authetication[i]!=ifa->aukey[i]) return 0;
}
return 1;
}
return 0;
}
void void
ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt) ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt)
{ {
@ -95,7 +114,12 @@ ospf_rx_hook(sock *sk, int size)
return(1); return(1);
} }
/* FIXME: Do authetification */ if(!ospf_rx_authenticate(ifa,ps))
{
log("%s: Bad OSPF packet received: bad password", p->name);
return(1);
}
if(ps->areaid!=ifa->an) if(ps->areaid!=ifa->an)
{ {