mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Added stub interface. (Interface which is propagated to OSPF but

Browse Source 
it does not sends nor listens packets.)

I added some new options, please look at it and look into doc if it's OK.
This commit is contained in:
Ondrej Filip
2000-09-02 08:54:40 +00:00
parent 5ddec4e6cf
commit e3bc10fdc4
7 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proto/ospf/config.Y
View File

@@ -88,6 +88,7 @@ ospf_iface_item:
| TYPE NONBROADCAST { OSPF_PATT->type = OSPF_IT_NBMA ; }
| TYPE POINTOPOINT { OSPF_PATT->type = OSPF_IT_PTP ; }
| STRICT NONBROADCAST bool { OSPF_PATT->strictnbma = $3 ; }
| STUB bool { OSPF_PATT->stub = $2 ; }
| NEIGHBORS '{' ipa_list '}'
| AUTHENTICATION NONE { OSPF_PATT->autype=AU_NONE ; }
| AUTHENTICATION SIMPLE { OSPF_PATT->autype=AU_SIMPLE ; }
@@ -137,6 +138,7 @@ ospf_iface_start:
OSPF_PATT->deadc = DEADC_D;
OSPF_PATT->type = OSPF_IT_UNDEF;
OSPF_PATT->strictnbma = 0;
OSPF_PATT->stub = 0;
init_list(&OSPF_PATT->nbma_list);
OSPF_PATT->autype=AU_NONE;
}

2
proto/ospf/hello.c
View File

@@ -249,6 +249,8 @@ hello_send(timer *timer,int poll, struct ospf_neighbor *dirn)
if(timer==NULL) ifa=dirn->ifa;
else ifa=(struct ospf_iface *)timer->data;
if(ifa->stub) return; /* Don't send any packet on stub iface */
p=(struct proto *)(ifa->proto);
DBG("%s: Hello/Poll timer fired on interface %s.\n",
p->name, ifa->iface->name);

4
proto/ospf/iface.c
View File

@@ -370,7 +370,8 @@ ospf_iface_info(struct ospf_iface *ifa)
cli_msg(-1015,"Interface \"%s\":", ifa->iface->name);
cli_msg(-1015,"\tArea: %I (%u)", ifa->oa->areaid, ifa->oa->areaid);
cli_msg(-1015,"\tType: %s %s", ospf_it[ifa->type], strict);
cli_msg(-1015,"\tState: %s", ospf_is[ifa->state]);
cli_msg(-1015,"\tState: %s %s", ospf_is[ifa->state],
ifa->stub ? "(stub)" : "");
cli_msg(-1015,"\tPriority: %u", ifa->priority);
cli_msg(-1015,"\tCost: %u", ifa->cost);
cli_msg(-1015,"\tHello timer: %u", ifa->helloint);
@@ -429,6 +430,7 @@ ospf_ifa_add(struct object_lock *lock)
ifa->strictnbma=ip->strictnbma;
ifa->waitint=ip->waitint;
ifa->deadc=ip->deadc;
ifa->stub=ip->stub;
ifa->autype=ip->autype;
memcpy(ifa->aukey,ip->password,8);
ifa->options=2; /* FIXME what options? */

20
proto/ospf/ospf.c
View File

@@ -558,14 +558,30 @@ ospf_reconfigure(struct proto *p, struct proto_config *c)
{
ifa->strictnbma=ip2->strictnbma;
OSPF_TRACE(D_EVENTS,
"Interface %s is now strict NBMA",
"Interface %s is now strict NBMA.",
ifa->iface->name);
}
if((ip1->strictnbma!=0)&&(ip2->strictnbma==0))
{
ifa->strictnbma=ip2->strictnbma;
OSPF_TRACE(D_EVENTS,
"Interface %s is no longer strict NBMA",
"Interface %s is no longer strict NBMA.",
ifa->iface->name);
}
/* stub */
if((ip1->stub==0)&&(ip2->stub!=0))
{
ifa->stub=ip2->stub;
OSPF_TRACE(D_EVENTS,
"Interface %s is now stub.",
ifa->iface->name);
}
if((ip1->stub!=0)&&(ip2->stub==0))
{
ifa->stub=ip2->stub;
OSPF_TRACE(D_EVENTS,
"Interface %s is no longer stub.",
ifa->iface->name);
}

2
proto/ospf/ospf.h
View File

@@ -103,6 +103,7 @@ struct ospf_iface {
u32 bdrid;
u8 type; /* OSPF view of type */
u8 strictnbma; /* Can I talk with unknown neighbors? */
u8 stub; /* Inactive interface */
#define OSPF_IT_BCAST 0
#define OSPF_IT_NBMA 1
#define OSPF_IT_PTP 2
@@ -390,6 +391,7 @@ struct ospf_iface_patt {
int type;
int autype;
int strictnbma;
int stub;
#define AU_NONE 0
#define AU_SIMPLE 1
#define AU_CRYPT 2

2
proto/ospf/packet.c
View File

@@ -84,6 +84,8 @@ ospf_rx_hook(sock *sk, int size)
int i;
u8 *pu8;
if(ifa->stub) return(1);
DBG("%s: RX_Hook called on interface %s.\n",p->name, sk->iface->name);
ps = (struct ospf_packet *) ipv4_skip_header(sk->rbuf, &size);