diff options
| -rw-r--r-- | usr.sbin/ospfctl/ospfctl.c | 10 | ||||
| -rw-r--r-- | usr.sbin/ospfd/control.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ospfd/ospfe.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ospfd/parse.y | 11 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde_spf.c | 8 |
5 files changed, 22 insertions, 18 deletions
diff --git a/usr.sbin/ospfctl/ospfctl.c b/usr.sbin/ospfctl/ospfctl.c index 1879a7331bb..3ca17aa6288 100644 --- a/usr.sbin/ospfctl/ospfctl.c +++ b/usr.sbin/ospfctl/ospfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfctl.c,v 1.4 2005/02/02 19:08:42 henning Exp $ */ +/* $OpenBSD: ospfctl.c,v 1.5 2005/03/12 10:49:12 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -120,8 +120,8 @@ main(int argc, char *argv[]) &ifidx, sizeof(ifidx)); break; case SHOW_NBR: - printf("%-15s %-3s %-17s %-9s %-15s %s\n", - "ID", "Pri", "State", "DeadTime", "Address", "Interface"); + printf("%-15s %-3s %-17s %-9s %-15s %s\n", "ID", "Pri", + "State", "DeadTime", "Address", "Interface"); case SHOW_NBR_DTAIL: imsg_compose(ibuf, IMSG_CTL_SHOW_NBR, 0, 0, -1, NULL, 0); break; @@ -438,8 +438,8 @@ show_database_head(struct in_addr aid, u_int8_t type) printf("\n%-15s %s\n", "", header); free(header); - printf("\n%-15s %-15s %-4s %-10s %-8s\n", - "Link ID", "Adv Router", "Age", "Seq#", "Checksum"); + printf("\n%-15s %-15s %-4s %-10s %-8s\n", "Link ID", "Adv Router", + "Age", "Seq#", "Checksum"); } int diff --git a/usr.sbin/ospfd/control.c b/usr.sbin/ospfd/control.c index 20fec1d3ed7..e22b1ce13a6 100644 --- a/usr.sbin/ospfd/control.c +++ b/usr.sbin/ospfd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.2 2005/03/11 15:48:58 deraadt Exp $ */ +/* $OpenBSD: control.c,v 1.3 2005/03/12 10:49:12 norby Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -225,7 +225,6 @@ control_dispatch_imsg(int fd, short event, void *bula) case IMSG_CTL_RELOAD: ospfe_imsg_compose_parent(imsg.hdr.type, 0, NULL, 0); break; - case IMSG_CTL_SHOW_INTERFACE: if (imsg.hdr.len == IMSG_HEADER_SIZE + sizeof(ifidx)) { diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c index c42206230e0..fb4dff5441e 100644 --- a/usr.sbin/ospfd/ospfe.c +++ b/usr.sbin/ospfd/ospfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.c,v 1.9 2005/03/07 10:28:14 claudio Exp $ */ +/* $OpenBSD: ospfe.c,v 1.10 2005/03/12 10:49:12 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -551,7 +551,8 @@ orig_rtr_lsa(struct area *area) log_debug("orig_rtr_lsa: area %s", inet_ntoa(area->id)); - if ((buf = buf_dynamic(sizeof(lsa_hdr), READ_BUF_SIZE /* XXX */)) == NULL) + /* XXX READ_BUF_SIZE */ + if ((buf = buf_dynamic(sizeof(lsa_hdr), READ_BUF_SIZE)) == NULL) fatal("orig_rtr_lsa"); /* reserve space for LSA header and LSA Router header */ @@ -735,7 +736,8 @@ orig_net_lsa(struct iface *iface) log_debug("orig_net_lsa: iface %s", iface->name); - if ((buf = buf_dynamic(sizeof(lsa_hdr), READ_BUF_SIZE /* XXX */)) == NULL) + /* XXX READ_BUF_SIZE */ + if ((buf = buf_dynamic(sizeof(lsa_hdr), READ_BUF_SIZE)) == NULL) fatal("orig_net_lsa"); /* reserve space for LSA header and LSA Router header */ diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y index e90dbad962b..e65438810b6 100644 --- a/usr.sbin/ospfd/parse.y +++ b/usr.sbin/ospfd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.6 2005/03/07 10:28:14 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.7 2005/03/12 10:49:12 norby Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -192,7 +192,8 @@ conf_main : METRIC number { defaults.dead_interval = $2; } | TRANSMITDELAY number { - if ($2 < MIN_TRANSMIT_DELAY || $2 > MAX_TRANSMIT_DELAY) { + if ($2 < MIN_TRANSMIT_DELAY || + $2 > MAX_TRANSMIT_DELAY) { yyerror("transfer-delay out of range (%d-%d)", MIN_TRANSMIT_DELAY, MAX_TRANSMIT_DELAY); YYERROR; @@ -330,7 +331,8 @@ areaoptsl : interface nl area->dead_interval = $2; } | TRANSMITDELAY number nl { - if ($2 < MIN_TRANSMIT_DELAY || $2 > MAX_TRANSMIT_DELAY) { + if ($2 < MIN_TRANSMIT_DELAY || + $2 > MAX_TRANSMIT_DELAY) { yyerror("transfer-delay out of range (%d-%d)", MIN_TRANSMIT_DELAY, MAX_TRANSMIT_DELAY); YYERROR; @@ -413,7 +415,8 @@ interfaceoptsl : authkey nl iface->dead_interval = $2; } | TRANSMITDELAY number nl { - if ($2 < MIN_TRANSMIT_DELAY || $2 > MAX_TRANSMIT_DELAY) { + if ($2 < MIN_TRANSMIT_DELAY || + $2 > MAX_TRANSMIT_DELAY) { yyerror("transfer-delay out of range (%d-%d)", MIN_TRANSMIT_DELAY, MAX_TRANSMIT_DELAY); YYERROR; diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c index 609afb550d2..62246d704d0 100644 --- a/usr.sbin/ospfd/rde_spf.c +++ b/usr.sbin/ospfd/rde_spf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_spf.c,v 1.3 2005/03/08 20:12:18 norby Exp $ */ +/* $OpenBSD: rde_spf.c,v 1.4 2005/03/12 10:49:12 norby Exp $ */ /* * Copyright (c) 2005 Esben Norby <norby@openbsd.org> @@ -323,7 +323,7 @@ calc_next_hop(struct vertex *dst, struct vertex *parent) rtr_link->id != parent->ls_id) continue; dst->nexthop.s_addr = rtr_link->data; - } + } return; case LSA_TYPE_NETWORK: for (i = 0; i < lsa_num_links(parent); i++) { @@ -334,7 +334,7 @@ calc_next_hop(struct vertex *dst, struct vertex *parent) break; case LINK_TYPE_TRANSIT_NET: if ((htonl(dst->ls_id) & - dst->lsa->data.net.mask) == + dst->lsa->data.net.mask) == (rtr_link->data & dst->lsa->data.net.mask)) { dst->nexthop.s_addr = @@ -348,7 +348,7 @@ calc_next_hop(struct vertex *dst, struct vertex *parent) fatalx("calc_next_hop: invalid link " "type"); } - } + } return; default: fatalx("calc_next_hop: invalid dst type"); |