summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEsben Norby <norby@cvs.openbsd.org>2005-03-29 17:26:36 +0000
committerEsben Norby <norby@cvs.openbsd.org>2005-03-29 17:26:36 +0000
commitfd6a239f31bd0a601c18b7a32618796e4ce58af2 (patch)
treed603d4cbe1a5a71debde9e14f0072cd0fd2d3800
parent449d36e96f33619430f75dba54f492186d6c6a27 (diff)
The RFC never mentions anything about transfer, this should be transmit.
From Jason Ackley (thanks). ok claudio@
Diffstat
-rw-r--r--usr.sbin/ospfctl/ospfctl.c4
-rw-r--r--usr.sbin/ospfd/config.c4
-rw-r--r--usr.sbin/ospfd/interface.c4
-rw-r--r--usr.sbin/ospfd/lsupdate.c4
-rw-r--r--usr.sbin/ospfd/ospfd.h8
-rw-r--r--usr.sbin/ospfd/parse.y22
6 files changed, 23 insertions, 23 deletions
diff --git a/usr.sbin/ospfctl/ospfctl.c b/usr.sbin/ospfctl/ospfctl.c
index 37648194368..518580da9d7 100644
--- a/usr.sbin/ospfctl/ospfctl.c
+++ b/usr.sbin/ospfctl/ospfctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfctl.c,v 1.10 2005/03/26 13:37:16 claudio Exp $ */
+/* $OpenBSD: ospfctl.c,v 1.11 2005/03/29 17:26:35 norby Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -293,7 +293,7 @@ show_interface_msg(struct imsg *imsg)
inet_ntoa(iface->rtr_id),
print_if_type(iface->type), iface->metric);
printf(" Transmit delay is %d sec(s), state %s, priority %d\n",
- iface->transfer_delay, print_if_state(iface->state),
+ iface->transmit_delay, print_if_state(iface->state),
iface->priority);
printf(" Designated Router (ID) %s, ",
inet_ntoa(iface->dr_id));
diff --git a/usr.sbin/ospfd/config.c b/usr.sbin/ospfd/config.c
index a24a65f6eda..dbec979d430 100644
--- a/usr.sbin/ospfd/config.c
+++ b/usr.sbin/ospfd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.3 2005/02/16 15:23:33 norby Exp $ */
+/* $OpenBSD: config.c,v 1.4 2005/03/29 17:26:35 norby Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -92,7 +92,7 @@ show_interface(struct iface *iface)
log_debug(" area: %s", inet_ntoa(iface->area->id));
log_debug(" hello interval: %d", iface->hello_interval);
log_debug(" dead interval: %d", iface->dead_interval);
- log_debug(" transfer delay: %d", iface->transfer_delay);
+ log_debug(" transmit delay: %d", iface->transmit_delay);
log_debug(" priority: %d", iface->priority);
log_debug(" hello timer: ");
log_debug(" wait timer: ");
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index 138c8306d65..e179c6c94a0 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interface.c,v 1.12 2005/03/22 22:13:48 norby Exp $ */
+/* $OpenBSD: interface.c,v 1.13 2005/03/29 17:26:35 norby Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -642,7 +642,7 @@ if_to_ctl(struct iface *iface)
ictl.adj_cnt = 0;
ictl.baudrate = iface->baudrate;
ictl.dead_interval = iface->dead_interval;
- ictl.transfer_delay = iface->transfer_delay;
+ ictl.transmit_delay = iface->transmit_delay;
ictl.hello_interval = iface->hello_interval;
ictl.flags = iface->flags;
ictl.metric = iface->metric;
diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c
index a3760edb7c2..ac5adf198d2 100644
--- a/usr.sbin/ospfd/lsupdate.c
+++ b/usr.sbin/ospfd/lsupdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsupdate.c,v 1.7 2005/03/22 22:13:48 norby Exp $ */
+/* $OpenBSD: lsupdate.c,v 1.8 2005/03/29 17:26:35 norby Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -180,7 +180,7 @@ send_ls_update(struct iface *iface, struct in_addr addr, void *data, int len)
/* age LSA befor sending it out */
memcpy(&age, ptr, sizeof(age));
age = ntohs(age);
- if ((age += iface->transfer_delay) >= MAX_AGE)
+ if ((age += iface->transmit_delay) >= MAX_AGE)
age = MAX_AGE;
age = ntohs(age);
memcpy(ptr, &age, sizeof(age));
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h
index ccafbb988ce..e8dcc8e77d9 100644
--- a/usr.sbin/ospfd/ospfd.h
+++ b/usr.sbin/ospfd/ospfd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfd.h,v 1.22 2005/03/26 13:35:16 claudio Exp $ */
+/* $OpenBSD: ospfd.h,v 1.23 2005/03/29 17:26:35 norby Exp $ */
/*
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -152,7 +152,7 @@ struct area {
u_int32_t stub_default_cost;
u_int32_t num_spf_calc;
u_int32_t dead_interval;
- u_int16_t transfer_delay;
+ u_int16_t transmit_delay;
u_int16_t hello_interval;
u_int16_t rxmt_interval;
u_int16_t metric;
@@ -289,7 +289,7 @@ struct iface {
int state;
int mtu;
u_int16_t flags;
- u_int16_t transfer_delay;
+ u_int16_t transmit_delay;
u_int16_t hello_interval;
u_int16_t rxmt_interval;
u_int16_t metric;
@@ -367,7 +367,7 @@ struct ctl_iface {
int mtu;
int nbr_cnt;
int adj_cnt;
- u_int16_t transfer_delay;
+ u_int16_t transmit_delay;
u_int16_t hello_interval;
u_int16_t flags;
u_int16_t metric;
diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y
index 2e57ad8fa8c..7465c0e9f5a 100644
--- a/usr.sbin/ospfd/parse.y
+++ b/usr.sbin/ospfd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.9 2005/03/22 22:13:48 norby Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2005/03/29 17:26:35 norby Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -65,7 +65,7 @@ int check_file_secrecy(int fd, const char *fname);
static struct {
u_int32_t dead_interval;
- u_int16_t transfer_delay;
+ u_int16_t transmit_delay;
u_int16_t hello_interval;
u_int16_t rxmt_interval;
u_int16_t metric;
@@ -194,11 +194,11 @@ conf_main : METRIC number {
| TRANSMITDELAY number {
if ($2 < MIN_TRANSMIT_DELAY ||
$2 > MAX_TRANSMIT_DELAY) {
- yyerror("transfer-delay out of range (%d-%d)",
+ yyerror("transmit-delay out of range (%d-%d)",
MIN_TRANSMIT_DELAY, MAX_TRANSMIT_DELAY);
YYERROR;
}
- defaults.transfer_delay = $2;
+ defaults.transmit_delay = $2;
}
| HELLOINTERVAL number {
if ($2 < MIN_HELLO_INTERVAL ||
@@ -333,11 +333,11 @@ areaoptsl : interface nl
| TRANSMITDELAY number nl {
if ($2 < MIN_TRANSMIT_DELAY ||
$2 > MAX_TRANSMIT_DELAY) {
- yyerror("transfer-delay out of range (%d-%d)",
+ yyerror("transmit-delay out of range (%d-%d)",
MIN_TRANSMIT_DELAY, MAX_TRANSMIT_DELAY);
YYERROR;
}
- area->transfer_delay = $2;
+ area->transmit_delay = $2;
}
| HELLOINTERVAL number nl {
if ($2 < MIN_HELLO_INTERVAL ||
@@ -417,11 +417,11 @@ interfaceoptsl : authkey nl
| TRANSMITDELAY number nl {
if ($2 < MIN_TRANSMIT_DELAY ||
$2 > MAX_TRANSMIT_DELAY) {
- yyerror("transfer-delay out of range (%d-%d)",
+ yyerror("transmit-delay out of range (%d-%d)",
MIN_TRANSMIT_DELAY, MAX_TRANSMIT_DELAY);
YYERROR;
}
- iface->transfer_delay = $2;
+ iface->transmit_delay = $2;
}
| HELLOINTERVAL number nl {
if ($2 < MIN_HELLO_INTERVAL ||
@@ -706,7 +706,7 @@ parse_config(char *filename, int opts)
}
defaults.dead_interval = DEFAULT_RTR_DEAD_TIME;
- defaults.transfer_delay = DEFAULT_TRANSMIT_DELAY;
+ defaults.transmit_delay = DEFAULT_TRANSMIT_DELAY;
defaults.hello_interval = DEFAULT_HELLO_INTERVAL;
defaults.rxmt_interval = DEFAULT_RXMT_INTERVAL;
defaults.metric = DEFAULT_METRIC;
@@ -861,7 +861,7 @@ conf_get_area(struct in_addr id)
LIST_INSERT_HEAD(&conf->area_list, a, entry);
a->dead_interval = defaults.dead_interval;
- a->transfer_delay = defaults.transfer_delay;
+ a->transmit_delay = defaults.transmit_delay;
a->hello_interval = defaults.hello_interval;
a->rxmt_interval = defaults.rxmt_interval;
a->metric = defaults.metric;
@@ -888,7 +888,7 @@ conf_get_if(struct kif *kif)
i = if_new(kif);
i->dead_interval = area->dead_interval;
- i->transfer_delay = area->transfer_delay;
+ i->transmit_delay = area->transmit_delay;
i->hello_interval = area->hello_interval;
i->rxmt_interval = area->rxmt_interval;
i->metric = area->metric;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 03:10:14 +0000