diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2019-06-17 13:46:34 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2019-06-17 13:46:34 +0000 |
commit | 4f55d2abd9337513311d1c9ebe81a131e268b4c8 (patch) | |
tree | 87dd8c6e3a69f4c659f18f92758c4e9d4bcc05ab /usr.sbin | |
parent | e847d6210932c69e6a8643d976b54a2d397b12be (diff) |
Cleanup some spaces here as well. Again no binary change.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/bgpctl/bgpctl.c | 14 | ||||
-rw-r--r-- | usr.sbin/bgpctl/mrtparser.c | 16 | ||||
-rw-r--r-- | usr.sbin/bgpctl/parser.c | 6 |
3 files changed, 18 insertions, 18 deletions
diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c index 6470ffa6f2c..7f800c8a4de 100644 --- a/usr.sbin/bgpctl/bgpctl.c +++ b/usr.sbin/bgpctl/bgpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpctl.c,v 1.239 2019/06/17 11:03:07 claudio Exp $ */ +/* $OpenBSD: bgpctl.c,v 1.240 2019/06/17 13:46:33 claudio Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -1778,7 +1778,7 @@ show_communities(u_char *data, size_t len, int flag0) break; } ext = htobe64(ext); - + print_ext_community((void *)&ext); break; } @@ -2113,7 +2113,7 @@ show_mrt_dump(struct mrt_rib *mr, struct mrt_peer *mp, void *arg) /* filter by neighbor */ if (req->neighbor.addr.aid != AID_UNSPEC && memcmp(&req->neighbor.addr, &ctl.remote_addr, - sizeof(ctl.remote_addr)) != 0) + sizeof(ctl.remote_addr)) != 0) continue; /* filter by AF */ if (req->aid && req->aid != ctl.prefix.aid) @@ -2132,7 +2132,7 @@ show_mrt_dump(struct mrt_rib *mr, struct mrt_peer *mp, void *arg) } /* filter by AS */ if (req->as.type != AS_UNDEF && - !match_aspath(mre->aspath, mre->aspath_len, &req->as)) + !match_aspath(mre->aspath, mre->aspath_len, &req->as)) continue; if (req->flags & F_CTL_DETAIL) { @@ -2177,7 +2177,7 @@ network_mrt_dump(struct mrt_rib *mr, struct mrt_peer *mp, void *arg) /* filter by neighbor */ if (req->neighbor.addr.aid != AID_UNSPEC && memcmp(&req->neighbor.addr, &ctl.remote_addr, - sizeof(ctl.remote_addr)) != 0) + sizeof(ctl.remote_addr)) != 0) continue; /* filter by AF */ if (req->aid && req->aid != ctl.prefix.aid) @@ -2196,7 +2196,7 @@ network_mrt_dump(struct mrt_rib *mr, struct mrt_peer *mp, void *arg) } /* filter by AS */ if (req->as.type != AS_UNDEF && - !match_aspath(mre->aspath, mre->aspath_len, &req->as)) + !match_aspath(mre->aspath, mre->aspath_len, &req->as)) continue; bzero(&net, sizeof(net)); @@ -2483,7 +2483,7 @@ show_mrt_notification(u_char *p, u_int16_t len) if (len > 1) { shutcomm_len = *p++; len--; - if(len < shutcomm_len) { + if (len < shutcomm_len) { printf("truncated shutdown reason"); return; } diff --git a/usr.sbin/bgpctl/mrtparser.c b/usr.sbin/bgpctl/mrtparser.c index 4a930a5e5db..fa933125663 100644 --- a/usr.sbin/bgpctl/mrtparser.c +++ b/usr.sbin/bgpctl/mrtparser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mrtparser.c,v 1.10 2019/02/25 11:51:58 claudio Exp $ */ +/* $OpenBSD: mrtparser.c,v 1.11 2019/06/17 13:46:33 claudio Exp $ */ /* * Copyright (c) 2011 Claudio Jeker <claudio@openbsd.org> * @@ -466,7 +466,7 @@ mrt_parse_dump(struct mrt_hdr *hdr, void *msg, struct mrt_peer **pp, err(1, "calloc"); r->nentries = 1; r->entries = re; - + if (len < 2 * sizeof(u_int16_t)) goto fail; /* view */ @@ -580,7 +580,7 @@ mrt_parse_dump_mp(struct mrt_hdr *hdr, void *msg, struct mrt_peer **pp, err(1, "calloc"); r->nentries = 1; r->entries = re; - + if (len < 4 * sizeof(u_int16_t)) goto fail; /* source AS */ @@ -627,7 +627,7 @@ mrt_parse_dump_mp(struct mrt_hdr *hdr, void *msg, struct mrt_peer **pp, len -= sizeof(struct in6_addr); break; } - + if (len < 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t)) goto fail; /* view + status */ @@ -644,7 +644,7 @@ mrt_parse_dump_mp(struct mrt_hdr *hdr, void *msg, struct mrt_peer **pp, b += sizeof(afi); len -= sizeof(afi); afi = ntohs(afi); - + /* safi */ safi = *b++; len -= 1; @@ -755,7 +755,7 @@ mrt_extract_attr(struct mrt_rib_entry *re, u_char *a, int alen, u_int8_t aid, alen -= 1; type = *a++; alen -= 1; - + if (flags & MRT_ATTR_EXTLEN) { if (alen < 2) return (-1); @@ -1006,7 +1006,7 @@ mrt_parse_state(struct mrt_hdr *hdr, void *msg) u_int16_t tmp16, afi; int r; u_int8_t aid; - + t.tv_sec = ntohl(hdr->timestamp); t.tv_nsec = 0; @@ -1122,7 +1122,7 @@ mrt_parse_msg(struct mrt_hdr *hdr, void *msg) u_int16_t tmp16, afi; int r; u_int8_t aid; - + t.tv_sec = ntohl(hdr->timestamp); t.tv_nsec = 0; diff --git a/usr.sbin/bgpctl/parser.c b/usr.sbin/bgpctl/parser.c index 63e1efd9aa7..e081bb19089 100644 --- a/usr.sbin/bgpctl/parser.c +++ b/usr.sbin/bgpctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.95 2019/06/17 11:03:07 claudio Exp $ */ +/* $OpenBSD: parser.c,v 1.96 2019/06/17 13:46:33 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1229,7 +1229,7 @@ parsesubtype(const char *name, int *type, int *subtype) static int parseextvalue(int type, char *s, u_int32_t *v, u_int32_t *flag) { - const char *errstr; + const char *errstr; char *p; struct in_addr ip; u_int32_t uvalh, uval; @@ -1383,7 +1383,7 @@ parseextcommunity(struct community *c, const char *t, char *s) c->flags |= dflag1 << 8; return; } - + /* verify type/subtype combo */ for (cp = iana_ext_comms; cp->subname != NULL; cp++) { if (cp->type == type && cp->subtype == subtype) { |