summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevesk <stevesk@openbsd.org>2005-10-19 22:00:37 +0000
committerstevesk <stevesk@openbsd.org>2005-10-19 22:00:37 +0000
commitae61edb20b1bb659eae7ab284c380c89bb793fd8 (patch)
tree2b211990e2ab01456adad247fb3bf7a91928b184
parentAdded code to properly read power supply installed/power state (diff)
downloadwireguard-openbsd-ae61edb20b1bb659eae7ab284c380c89bb793fd8.tar.xz
wireguard-openbsd-ae61edb20b1bb659eae7ab284c380c89bb793fd8.zip
small cleanups while reading; ok claudio@
-rw-r--r--usr.sbin/ospfd/auth.c6
-rw-r--r--usr.sbin/ospfd/lsupdate.c4
-rw-r--r--usr.sbin/ospfd/packet.c4
-rw-r--r--usr.sbin/ospfd/printconf.c3
4 files changed, 8 insertions, 9 deletions
diff --git a/usr.sbin/ospfd/auth.c b/usr.sbin/ospfd/auth.c
index 93d5b2c04fa..e558f26aab2 100644
--- a/usr.sbin/ospfd/auth.c
+++ b/usr.sbin/ospfd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.5 2005/04/05 13:01:21 claudio Exp $ */
+/* $OpenBSD: auth.c,v 1.6 2005/10/19 22:00:37 stevesk Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -59,7 +59,7 @@ auth_validate(void *buf, u_int16_t len, struct iface *iface, struct nbr *nbr)
sizeof(ospf_hdr->auth_key.simple));
if (in_cksum(ospf_hdr, ntohs(ospf_hdr->len))) {
- log_debug("recv_packet: invalid checksum, interface %s",
+ log_debug("auth_validate: invalid checksum, interface %s",
iface->name);
return (-1);
}
@@ -147,7 +147,7 @@ auth_gen(struct buf *buf, struct iface *iface)
/* update length */
if (buf->wpos > USHRT_MAX)
- fatalx("auth_gen: resulting ospf packet to big");
+ fatalx("auth_gen: resulting ospf packet too big");
ospf_hdr->len = htons((u_int16_t)buf->wpos);
/* clear auth_key field */
bzero(ospf_hdr->auth_key.simple,
diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c
index 1f35e31887c..cd227414bc4 100644
--- a/usr.sbin/ospfd/lsupdate.c
+++ b/usr.sbin/ospfd/lsupdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsupdate.c,v 1.17 2005/10/19 21:43:20 claudio Exp $ */
+/* $OpenBSD: lsupdate.c,v 1.18 2005/10/19 22:00:37 stevesk Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -195,7 +195,7 @@ send_ls_update(struct iface *iface, struct in_addr addr, void *data, int len)
buf_free(buf);
return (ret);
fail:
- log_warn("send_hello");
+ log_warn("send_ls_update");
buf_free(buf);
return (-1);
}
diff --git a/usr.sbin/ospfd/packet.c b/usr.sbin/ospfd/packet.c
index e07c1b1730e..248b87de0f8 100644
--- a/usr.sbin/ospfd/packet.c
+++ b/usr.sbin/ospfd/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.15 2005/10/19 13:07:58 stevesk Exp $ */
+/* $OpenBSD: packet.c,v 1.16 2005/10/19 22:00:37 stevesk Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -247,7 +247,7 @@ ospf_hdr_sanity_check(const struct ip *ip_hdr, struct ospf_hdr *ospf_hdr,
"interface %s", inet_ntoa(addr), iface->name);
return (-1);
}
- } else {
+ } else {
if (ospf_hdr->area_id != 0) {
addr.s_addr = ospf_hdr->area_id;
log_debug("recv_packet: invalid area ID %s, "
diff --git a/usr.sbin/ospfd/printconf.c b/usr.sbin/ospfd/printconf.c
index 394e9c4035e..025b7653632 100644
--- a/usr.sbin/ospfd/printconf.c
+++ b/usr.sbin/ospfd/printconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printconf.c,v 1.1 2005/05/26 18:46:16 norby Exp $ */
+/* $OpenBSD: printconf.c,v 1.2 2005/10/19 22:00:37 stevesk Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -27,7 +27,6 @@
#include "ospf.h"
#include "ospfd.h"
#include "ospfe.h"
-#include "log.h"
void print_mainconf(struct ospfd_conf *);
void print_iface(struct iface *);