From 19d0d1be646eddcb24c9bc7be08572fc291b8d4c Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Fri, 24 Jul 2020 18:56:30 +0200 Subject: [PATCH] Formatting: Space between 'if' and parenthesis --- src/client.c | 2 +- src/common.c | 6 +++--- src/dns.c | 2 +- src/iodine.c | 2 +- src/iodined.c | 32 ++++++++++++++++---------------- src/read.c | 2 +- src/tun.c | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/client.c b/src/client.c index 7a6b98f..a91950b 100644 --- a/src/client.c +++ b/src/client.c @@ -1536,7 +1536,7 @@ handshake_raw_udp(int dns_fd, int seed) r = select(dns_fd + 1, &fds, NULL, NULL, &tv); - if(r > 0) { + if (r > 0) { /* recv() needed for windows, dont change to read() */ len = recv(dns_fd, in, sizeof(in), 0); if (len >= (16 + RAW_HDR_LEN)) { diff --git a/src/common.c b/src/common.c index 2170867..8a46490 100644 --- a/src/common.c +++ b/src/common.c @@ -204,7 +204,7 @@ open_dns_opt(struct sockaddr_storage *sockaddr, size_t sockaddr_len, int v6only) setsockopt(fd, IPPROTO_IP, IP_OPT_DONT_FRAG, (const void*) &flag, sizeof(flag)); #endif - if(bind(fd, (struct sockaddr*) sockaddr, sockaddr_len) < 0) + if (bind(fd, (struct sockaddr*) sockaddr, sockaddr_len) < 0) err(1, "bind"); fprintf(stderr, "Opened IPv%d UDP socket\n", sockaddr->ss_family == AF_INET6 ? 6 : 4); @@ -353,7 +353,7 @@ check_topdomain(char *str, char **errormsg) } for( i = 0; i < strlen(str); i++) { - if(str[i] == '.') { + if (str[i] == '.') { dots++; if (chunklen == 0) { if (errormsg) *errormsg = "Consecutive dots"; @@ -367,7 +367,7 @@ check_topdomain(char *str, char **errormsg) } else { chunklen++; } - if( (str[i] >= 'a' && str[i] <= 'z') || (str[i] >= 'A' && str[i] <= 'Z') || + if ((str[i] >= 'a' && str[i] <= 'z') || (str[i] >= 'A' && str[i] <= 'Z') || isdigit(str[i]) || str[i] == '-' || str[i] == '.' ) { continue; } else { diff --git a/src/dns.c b/src/dns.c index 7d85e19..c7bb36c 100644 --- a/src/dns.c +++ b/src/dns.c @@ -448,7 +448,7 @@ int dns_decode(char *buf, size_t buflen, struct query *q, qr_t qr, char *packet, switch (qr) { case QR_ANSWER: - if(qdcount < 1) { + if (qdcount < 1) { /* We need a question */ return -1; } diff --git a/src/iodine.c b/src/iodine.c index 64ed950..78f0cab 100644 --- a/src/iodine.c +++ b/src/iodine.c @@ -315,7 +315,7 @@ int main(int argc, char **argv) /* NOTREACHED */ } - if(check_topdomain(topdomain, &errormsg)) { + if (check_topdomain(topdomain, &errormsg)) { warnx("Invalid topdomain: %s", errormsg); usage(); /* NOTREACHED */ diff --git a/src/iodined.c b/src/iodined.c index 21acbf7..9bf8bd3 100644 --- a/src/iodined.c +++ b/src/iodined.c @@ -797,7 +797,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query memcpy(in, q->name, MIN(domain_len, sizeof(in))); - if(in[0] == 'V' || in[0] == 'v') { + if (in[0] == 'V' || in[0] == 'v') { int version = 0; read = unpack_data(unpacked, sizeof(unpacked), &(in[1]), domain_len - 1, &base32_ops); @@ -875,7 +875,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query format_addr(&q->from, q->fromlen), version); } return; - } else if(in[0] == 'L' || in[0] == 'l') { + } else if (in[0] == 'L' || in[0] == 'l') { read = unpack_data(unpacked, sizeof(unpacked), &(in[1]), domain_len - 1, &base32_ops); if (read < 17) { write_dns(dns_fd, q, "BADLEN", 6, 'T'); @@ -920,7 +920,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query } } return; - } else if(in[0] == 'I' || in[0] == 'i') { + } else if (in[0] == 'I' || in[0] == 'i') { /* Request for IP number */ char reply[17]; int length; @@ -949,14 +949,14 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query } write_dns(dns_fd, q, reply, length, 'T'); - } else if(in[0] == 'Z' || in[0] == 'z') { + } else if (in[0] == 'Z' || in[0] == 'z') { /* Check for case conservation and chars not allowed according to RFC */ /* Reply with received hostname as data */ /* No userid here, reply with lowest-grade downenc */ write_dns(dns_fd, q, in, domain_len, 'T'); return; - } else if(in[0] == 'S' || in[0] == 's') { + } else if (in[0] == 'S' || in[0] == 's') { int codec; const struct encoder *enc; @@ -1000,7 +1000,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query break; } return; - } else if(in[0] == 'O' || in[0] == 'o') { + } else if (in[0] == 'O' || in[0] == 'o') { if (domain_len < 3) { /* len at least 3, example: "O1T" */ write_dns(dns_fd, q, "BADLEN", 6, 'T'); return; @@ -1054,7 +1054,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query break; } return; - } else if(in[0] == 'Y' || in[0] == 'y') { + } else if (in[0] == 'Y' || in[0] == 'y') { int i; char *datap; int datalen; @@ -1126,7 +1126,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query write_dns(dns_fd, q, "BADCODEC", 8, 'T'); return; - } else if(in[0] == 'R' || in[0] == 'r') { + } else if (in[0] == 'R' || in[0] == 'r') { int req_frag_size; if (domain_len < 16) { /* we'd better have some chars for data... */ @@ -1159,7 +1159,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query write_dns(dns_fd, q, buf, req_frag_size, users[userid].downenc); } return; - } else if(in[0] == 'N' || in[0] == 'n') { + } else if (in[0] == 'N' || in[0] == 'n') { int max_frag_size; read = unpack_data(unpacked, sizeof(unpacked), &(in[1]), domain_len - 1, &base32_ops); @@ -1185,7 +1185,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query write_dns(dns_fd, q, &unpacked[1], 2, users[userid].downenc); } return; - } else if(in[0] == 'P' || in[0] == 'p') { + } else if (in[0] == 'P' || in[0] == 'p') { int dn_seq; int dn_frag; int didsend = 0; @@ -1305,7 +1305,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query !users[userid].lazy) send_chunk_or_dataless(dns_fd, userid, &users[userid].q); - } else if((in[0] >= '0' && in[0] <= '9') + } else if ((in[0] >= '0' && in[0] <= '9') || (in[0] >= 'a' && in[0] <= 'f') || (in[0] >= 'A' && in[0] <= 'F')) { int up_seq, up_frag, dn_seq, dn_frag, lastfrag; @@ -1818,14 +1818,14 @@ tunnel(int tun_fd, struct dnsfd *dns_fds, int bind_fd, int max_idle_time) /* Don't read from tun if no users can accept data anyway; tun queue/TCP buffers are larger than our outpacket-queues */ - if(!all_users_waiting_to_send()) { + if (!all_users_waiting_to_send()) { FD_SET(tun_fd, &fds); maxfd = MAX(tun_fd, maxfd); } i = select(maxfd + 1, &fds, NULL, NULL, &tv); - if(i < 0) { + if (i < 0) { if (running) warn("select"); return 1; @@ -2554,7 +2554,7 @@ main(int argc, char **argv) } topdomain = strdup(argv[1]); - if(check_topdomain(topdomain, &errormsg)) { + if (check_topdomain(topdomain, &errormsg)) { warnx("Invalid topdomain: %s", errormsg); usage(); /* NOTREACHED */ @@ -2574,7 +2574,7 @@ main(int argc, char **argv) usage(); } - if(port < 1 || port > 65535) { + if (port < 1 || port > 65535) { warnx("Bad port number given."); usage(); } @@ -2604,7 +2604,7 @@ main(int argc, char **argv) } } - if(bind_enable) { + if (bind_enable) { in_addr_t dns_ip = ((struct sockaddr_in *) &dns4addr)->sin_addr.s_addr; if (bind_port < 1 || bind_port > 65535) { warnx("Bad DNS server port number given."); diff --git a/src/read.c b/src/read.c index 1890359..b33a376 100644 --- a/src/read.c +++ b/src/read.c @@ -41,7 +41,7 @@ readname_loop(char *packet, int packetlen, char **src, char *dst, size_t length, c = *s++; /* is this a compressed label? */ - if((c & 0xc0) == 0xc0) { + if ((c & 0xc0) == 0xc0) { offset = (((s[-1] & 0x3f) << 8) | (s[0] & 0xff)); if (offset > packetlen) { if (len == 0) { diff --git a/src/tun.c b/src/tun.c index be290b1..bee1663 100644 --- a/src/tun.c +++ b/src/tun.c @@ -622,7 +622,7 @@ tun_setip(const char *ip, const char *other_ip, int netbits) netip.s_addr = inet_addr(ip); netip.s_addr = netip.s_addr & net.s_addr; r = system(cmdline); - if(r != 0) { + if (r != 0) { return r; } else {