diff options
Diffstat (limited to 'usr.sbin/switchd')
| -rw-r--r-- | usr.sbin/switchd/ofp10.c | 5 | ||||
| -rw-r--r-- | usr.sbin/switchd/ofp13.c | 10 | ||||
| -rw-r--r-- | usr.sbin/switchd/ofrelay.c | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/usr.sbin/switchd/ofp10.c b/usr.sbin/switchd/ofp10.c index 5679506f07c..80d350cc73a 100644 --- a/usr.sbin/switchd/ofp10.c +++ b/usr.sbin/switchd/ofp10.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofp10.c,v 1.13 2016/11/11 22:07:40 reyk Exp $ */ +/* $OpenBSD: ofp10.c,v 1.14 2016/11/17 16:24:00 rzalamena Exp $ */ /* * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org> @@ -305,7 +305,8 @@ ofp10_packet_match(struct packet *pkt, struct ofp10_match *m, uint32_t flags) bzero(m, sizeof(*m)); m->m_wildcards = htonl(~flags); - if ((flags & (OFP10_WILDCARD_DL_SRC|OFP10_WILDCARD_DL_DST)) && (eh == NULL)) + if ((flags & (OFP10_WILDCARD_DL_SRC|OFP10_WILDCARD_DL_DST)) && + (eh == NULL)) return (-1); if (flags & OFP10_WILDCARD_DL_SRC) diff --git a/usr.sbin/switchd/ofp13.c b/usr.sbin/switchd/ofp13.c index fcf508a7de2..b443e3f2335 100644 --- a/usr.sbin/switchd/ofp13.c +++ b/usr.sbin/switchd/ofp13.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofp13.c,v 1.28 2016/11/17 12:40:56 reyk Exp $ */ +/* $OpenBSD: ofp13.c,v 1.29 2016/11/17 16:24:00 rzalamena Exp $ */ /* * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org> @@ -993,7 +993,7 @@ ofp13_packet_in(struct switchd *sc, struct switch_connection *con, ssize_t len, mlen; uint32_t srcport = 0, dstport; int addflow = 0, sendbuffer = 0; - off_t off, moff; + off_t off, moff; void *ptr; struct ofp_instruction_actions *ia; @@ -1562,7 +1562,8 @@ ofp13_multipart_request_validate(struct switchd *sc, type = ntohs(mp->mp_type); flags = ntohs(mp->mp_flags); - log_debug("\ttype %s flags %#04x", print_map(type, ofp_mp_t_map), flags); + log_debug("\ttype %s flags %#04x", + print_map(type, ofp_mp_t_map), flags); totallen = ntohs(oh->oh_length); off += sizeof(*mp); @@ -1582,7 +1583,8 @@ ofp13_multipart_request_validate(struct switchd *sc, matchtype = ntohs(om->om_type); matchlen = ntohs(om->om_length); log_debug("\ttable_id %d out_port %u out_group %u " - "cookie %llu mask %llu match type %s length %d (padded to %d)", + "cookie %llu mask %llu match type %s length %d " + "(padded to %d)", fsr->fsr_table_id, ntohl(fsr->fsr_out_port), ntohl(fsr->fsr_out_group), be64toh(fsr->fsr_cookie), be64toh(fsr->fsr_cookie_mask), diff --git a/usr.sbin/switchd/ofrelay.c b/usr.sbin/switchd/ofrelay.c index 8a314262d52..b5560221eb9 100644 --- a/usr.sbin/switchd/ofrelay.c +++ b/usr.sbin/switchd/ofrelay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofrelay.c,v 1.7 2016/11/11 16:59:33 reyk Exp $ */ +/* $OpenBSD: ofrelay.c,v 1.8 2016/11/17 16:24:00 rzalamena Exp $ */ /* * Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org> @@ -304,7 +304,7 @@ void ofrelay_bufput(struct switch_connection *con, struct ibuf *buf) { /* Just reset the buffer */ - ofrelay_bufget(con, buf); + ofrelay_bufget(con, buf); } int |