diff options
| -rw-r--r-- | usr.sbin/dhcrelay/bpf.c | 8 | ||||
| -rw-r--r-- | usr.sbin/dhcrelay/dhcrelay.c | 7 | ||||
| -rw-r--r-- | usr.sbin/dhcrelay/dispatch.c | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/usr.sbin/dhcrelay/bpf.c b/usr.sbin/dhcrelay/bpf.c index 6ca2b447d2a..020810bba54 100644 --- a/usr.sbin/dhcrelay/bpf.c +++ b/usr.sbin/dhcrelay/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.15 2017/02/13 19:15:39 krw Exp $ */ +/* $OpenBSD: bpf.c,v 1.16 2017/02/13 22:05:35 krw Exp $ */ /* BPF socket interface code, originally contributed by Archie Cobbs. */ @@ -223,7 +223,8 @@ struct bpf_insn dhcp_bpf_swfilter[] = { BPF_STMT(BPF_RET+BPF_K, 0), }; -int dhcp_bpf_swfilter_len = sizeof(dhcp_bpf_swfilter) / sizeof(struct bpf_insn); +int dhcp_bpf_swfilter_len = sizeof(dhcp_bpf_swfilter) / + sizeof(struct bpf_insn); /* * Packet write filter program: 'ip and udp and src port SERVER_PORT' @@ -421,7 +422,8 @@ receive_packet(struct interface_info *interface, unsigned char *buf, * do is drop it. */ if (hdr.bh_caplen != hdr.bh_datalen) { - interface->rbuf_offset += hdr.bh_hdrlen = hdr.bh_caplen; + interface->rbuf_offset += hdr.bh_hdrlen = + hdr.bh_caplen; continue; } diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c index 5048ed828c0..fd4d19e727a 100644 --- a/usr.sbin/dhcrelay/dhcrelay.c +++ b/usr.sbin/dhcrelay/dhcrelay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcrelay.c,v 1.56 2017/02/13 19:15:39 krw Exp $ */ +/* $OpenBSD: dhcrelay.c,v 1.57 2017/02/13 22:05:35 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org> @@ -269,7 +269,8 @@ main(int argc, char *argv[]) if (setsockopt(sp->fd, SOL_SOCKET, SO_RTABLE, &rdomain, sizeof(rdomain)) == -1) fatalx("setsockopt: %m"); - if (bind(sp->fd, (struct sockaddr *)&laddr, sizeof laddr) == -1) + if (bind(sp->fd, (struct sockaddr *)&laddr, sizeof laddr) == + -1) fatalx("bind: %m"); if (connect(sp->fd, (struct sockaddr *)&sp->to, sizeof sp->to) == -1) @@ -709,7 +710,7 @@ relay_agentinfo_append(struct packet_ctx *pc, struct dhcp_packet *dp, /* Save one byte for DHO_END. */ neededlen += 1; - /* Check if we have enough space for the new options. */ + /* Check if we have space for the new options. */ if (neededlen > maxlen) { log_warnx("no space for relay agent info"); return (newtotal); diff --git a/usr.sbin/dhcrelay/dispatch.c b/usr.sbin/dhcrelay/dispatch.c index f06e1028157..97d526d7420 100644 --- a/usr.sbin/dhcrelay/dispatch.c +++ b/usr.sbin/dhcrelay/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.17 2017/02/13 21:57:31 krw Exp $ */ +/* $OpenBSD: dispatch.c,v 1.18 2017/02/13 22:05:35 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -119,7 +119,7 @@ get_interface(const char *ifname, void (*handler)(struct protocol *), if (ifi->ifi_type == IFT_ENC) iface->hw_address.htype = HTYPE_IPSEC_TUNNEL; else - iface->hw_address.htype = HTYPE_ETHER; /* XXX */ + iface->hw_address.htype = HTYPE_ETHER; /*XXX*/ memcpy(iface->hw_address.haddr, LLADDR(foo), foo->sdl_alen); } else if (ifa->ifa_addr->sa_family == AF_INET) { |