summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2019-06-17 21:17:04 +0000
committerclaudio <claudio@openbsd.org>2019-06-17 21:17:04 +0000
commit9909f9ada7cda56f6762cd1bad9e93b042bebd75 (patch)
tree5c13ba4948c80c97c768a6f097f03bd5604cf23f
parentsetusercontext resets PATH (which we want). but then it becomes (diff)
downloadwireguard-openbsd-9909f9ada7cda56f6762cd1bad9e93b042bebd75.tar.xz
wireguard-openbsd-9909f9ada7cda56f6762cd1bad9e93b042bebd75.zip
A bit more KNF no binary change
-rw-r--r--usr.sbin/bgpd/bgpd.h4
-rw-r--r--usr.sbin/bgpd/session.c14
2 files changed, 11 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 81b7f66823d..b04b61a481b 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.h,v 1.386 2019/06/17 13:35:42 claudio Exp $ */
+/* $OpenBSD: bgpd.h,v 1.387 2019/06/17 21:17:04 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -775,7 +775,7 @@ struct filter_ovs {
* Communities are encoded depending on their type. The low byte of flags
* is the COMMUNITY_TYPE (BASIC, LARGE, EXT). BASIC encoding is just using
* data1 and data2, LARGE uses all data fields and EXT is also using all
- * data fields. The 4-byte flags fields consists of up to 3 data flags
+ * data fields. The 4-byte flags fields consists of up to 3 data flags
* for e.g. COMMUNITY_ANY and the low byte is the community type.
* If flags is 0 the community struct is unused. If the upper 24bit of
* flags is 0 a fast compare can be used.
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 509f85a30ac..c60433fb41e 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.384 2019/06/17 13:35:43 claudio Exp $ */
+/* $OpenBSD: session.c,v 1.385 2019/06/17 21:17:04 claudio Exp $ */
/*
* Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -1119,8 +1119,10 @@ session_setup_socket(struct peer *p)
}
if (p->conf.ebgp) {
- /* set TTL to foreign router's distance
- 1=direct n=multihop with ttlsec, we always use 255 */
+ /*
+ * set TTL to foreign router's distance
+ * 1=direct n=multihop with ttlsec, we always use 255
+ */
if (p->conf.ttlsec) {
ttl = 256 - p->conf.distance;
if (setsockopt(p->fd, IPPROTO_IP, IP_MINTTL,
@@ -1143,8 +1145,10 @@ session_setup_socket(struct peer *p)
break;
case AID_INET6:
if (p->conf.ebgp) {
- /* set hoplimit to foreign router's distance
- 1=direct n=multihop with ttlsec, we always use 255 */
+ /*
+ * set hoplimit to foreign router's distance
+ * 1=direct n=multihop with ttlsec, we always use 255
+ */
if (p->conf.ttlsec) {
ttl = 256 - p->conf.distance;
if (setsockopt(p->fd, IPPROTO_IPV6,