haskal
/
iodine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Formatting: Space between 'if' and parenthesis

This commit is contained in:
Erik Ekman 2020-07-24 18:56:30 +02:00
parent 310aedac8e
commit 19d0d1be64
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@ -1536,7 +1536,7 @@ handshake_raw_udp(int dns_fd, int seed)
r = select(dns_fd + 1, &fds, NULL, NULL, &tv); r = select(dns_fd + 1, &fds, NULL, NULL, &tv);
if(r > 0) { if (r > 0) {
/* recv() needed for windows, dont change to read() */ /* recv() needed for windows, dont change to read() */
len = recv(dns_fd, in, sizeof(in), 0); len = recv(dns_fd, in, sizeof(in), 0);
if (len >= (16 + RAW_HDR_LEN)) { if (len >= (16 + RAW_HDR_LEN)) {

6
src/common.c
View File

@ -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)); setsockopt(fd, IPPROTO_IP, IP_OPT_DONT_FRAG, (const void*) &flag, sizeof(flag));
#endif #endif
if(bind(fd, (struct sockaddr*) sockaddr, sockaddr_len) < 0) if (bind(fd, (struct sockaddr*) sockaddr, sockaddr_len) < 0)
err(1, "bind"); err(1, "bind");
fprintf(stderr, "Opened IPv%d UDP socket\n", sockaddr->ss_family == AF_INET6 ? 6 : 4); 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++) { for( i = 0; i < strlen(str); i++) {
if(str[i] == '.') { if (str[i] == '.') {
dots++; dots++;
if (chunklen == 0) { if (chunklen == 0) {
if (errormsg) *errormsg = "Consecutive dots"; if (errormsg) *errormsg = "Consecutive dots";
@ -367,7 +367,7 @@ check_topdomain(char *str, char **errormsg)
} else { } else {
chunklen++; 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] == '.' ) { isdigit(str[i]) || str[i] == '-' || str[i] == '.' ) {
continue; continue;
} else { } else {

2
src/dns.c
View File

@ -448,7 +448,7 @@ int dns_decode(char *buf, size_t buflen, struct query *q, qr_t qr, char *packet,
switch (qr) { switch (qr) {
case QR_ANSWER: case QR_ANSWER:
if(qdcount < 1) { if (qdcount < 1) {
/* We need a question */ /* We need a question */
return -1; return -1;
} }

2
src/iodine.c
View File

@ -315,7 +315,7 @@ int main(int argc, char **argv)
/* NOTREACHED */ /* NOTREACHED */
} }
if(check_topdomain(topdomain, &errormsg)) { if (check_topdomain(topdomain, &errormsg)) {
warnx("Invalid topdomain: %s", errormsg); warnx("Invalid topdomain: %s", errormsg);
usage(); usage();
/* NOTREACHED */ /* NOTREACHED */

32
src/iodined.c
View File

@ -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))); 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; int version = 0;
read = unpack_data(unpacked, sizeof(unpacked), &(in[1]), domain_len - 1, &base32_ops); 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); format_addr(&q->from, q->fromlen), version);
} }
return; 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); read = unpack_data(unpacked, sizeof(unpacked), &(in[1]), domain_len - 1, &base32_ops);
if (read < 17) { if (read < 17) {
write_dns(dns_fd, q, "BADLEN", 6, 'T'); 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; return;
} else if(in[0] == 'I' || in[0] == 'i') { } else if (in[0] == 'I' || in[0] == 'i') {
/* Request for IP number */ /* Request for IP number */
char reply[17]; char reply[17];
int length; 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'); 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 */ /* Check for case conservation and chars not allowed according to RFC */
/* Reply with received hostname as data */ /* Reply with received hostname as data */
/* No userid here, reply with lowest-grade downenc */ /* No userid here, reply with lowest-grade downenc */
write_dns(dns_fd, q, in, domain_len, 'T'); write_dns(dns_fd, q, in, domain_len, 'T');
return; return;
} else if(in[0] == 'S' || in[0] == 's') { } else if (in[0] == 'S' || in[0] == 's') {
int codec; int codec;
const struct encoder *enc; const struct encoder *enc;
@ -1000,7 +1000,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query
break; break;
} }
return; 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" */ if (domain_len < 3) { /* len at least 3, example: "O1T" */
write_dns(dns_fd, q, "BADLEN", 6, 'T'); write_dns(dns_fd, q, "BADLEN", 6, 'T');
return; return;
@ -1054,7 +1054,7 @@ handle_null_request(int tun_fd, int dns_fd, struct dnsfd *dns_fds, struct query
break; break;
} }
return; return;
} else if(in[0] == 'Y' || in[0] == 'y') { } else if (in[0] == 'Y' || in[0] == 'y') {
int i; int i;
char *datap; char *datap;
int datalen; 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'); write_dns(dns_fd, q, "BADCODEC", 8, 'T');
return; return;
} else if(in[0] == 'R' || in[0] == 'r') { } else if (in[0] == 'R' || in[0] == 'r') {
int req_frag_size; int req_frag_size;
if (domain_len < 16) { /* we'd better have some chars for data... */ 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); write_dns(dns_fd, q, buf, req_frag_size, users[userid].downenc);
} }
return; return;
} else if(in[0] == 'N' || in[0] == 'n') { } else if (in[0] == 'N' || in[0] == 'n') {
int max_frag_size; int max_frag_size;
read = unpack_data(unpacked, sizeof(unpacked), &(in[1]), domain_len - 1, &base32_ops); 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); write_dns(dns_fd, q, &unpacked[1], 2, users[userid].downenc);
} }
return; return;
} else if(in[0] == 'P' || in[0] == 'p') { } else if (in[0] == 'P' || in[0] == 'p') {
int dn_seq; int dn_seq;
int dn_frag; int dn_frag;
int didsend = 0; 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) !users[userid].lazy)
send_chunk_or_dataless(dns_fd, userid, &users[userid].q); 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')
|| (in[0] >= 'A' && in[0] <= 'F')) { || (in[0] >= 'A' && in[0] <= 'F')) {
int up_seq, up_frag, dn_seq, dn_frag, lastfrag; 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; /* Don't read from tun if no users can accept data anyway;
tun queue/TCP buffers are larger than our outpacket-queues */ 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); FD_SET(tun_fd, &fds);
maxfd = MAX(tun_fd, maxfd); maxfd = MAX(tun_fd, maxfd);
} }
i = select(maxfd + 1, &fds, NULL, NULL, &tv); i = select(maxfd + 1, &fds, NULL, NULL, &tv);
if(i < 0) { if (i < 0) {
if (running) if (running)
warn("select"); warn("select");
return 1; return 1;
@ -2554,7 +2554,7 @@ main(int argc, char **argv)
} }
topdomain = strdup(argv[1]); topdomain = strdup(argv[1]);
if(check_topdomain(topdomain, &errormsg)) { if (check_topdomain(topdomain, &errormsg)) {
warnx("Invalid topdomain: %s", errormsg); warnx("Invalid topdomain: %s", errormsg);
usage(); usage();
/* NOTREACHED */ /* NOTREACHED */
@ -2574,7 +2574,7 @@ main(int argc, char **argv)
usage(); usage();
} }
if(port < 1 || port > 65535) { if (port < 1 || port > 65535) {
warnx("Bad port number given."); warnx("Bad port number given.");
usage(); 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; in_addr_t dns_ip = ((struct sockaddr_in *) &dns4addr)->sin_addr.s_addr;
if (bind_port < 1 || bind_port > 65535) { if (bind_port < 1 || bind_port > 65535) {
warnx("Bad DNS server port number given."); warnx("Bad DNS server port number given.");

2
src/read.c
View File

@ -41,7 +41,7 @@ readname_loop(char *packet, int packetlen, char **src, char *dst, size_t length,
c = *s++; c = *s++;
/* is this a compressed label? */ /* is this a compressed label? */
if((c & 0xc0) == 0xc0) { if ((c & 0xc0) == 0xc0) {
offset = (((s[-1] & 0x3f) << 8) | (s[0] & 0xff)); offset = (((s[-1] & 0x3f) << 8) | (s[0] & 0xff));
if (offset > packetlen) { if (offset > packetlen) {
if (len == 0) { if (len == 0) {

2
src/tun.c
View File

@ -622,7 +622,7 @@ tun_setip(const char *ip, const char *other_ip, int netbits)
netip.s_addr = inet_addr(ip); netip.s_addr = inet_addr(ip);
netip.s_addr = netip.s_addr & net.s_addr; netip.s_addr = netip.s_addr & net.s_addr;
r = system(cmdline); r = system(cmdline);
if(r != 0) { if (r != 0) {
return r; return r;
} else { } else {