deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Code style fixes

Browse source
This commit is contained in:
adamdunkels 2008-02-24 21:13:36 +00:00
parent 307fc41646
commit 3106840c56
1 changed files with 93 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
tools/tunslip.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the uIP TCP/IP stack.
*
* $Id: tunslip.c,v 1.14 2007/05/21 15:22:56 bg- Exp $
* $Id: tunslip.c,v 1.15 2008/02/24 21:13:36 adamdunkels Exp $
*
*/
@ -416,11 +416,13 @@ int
is_sensible_string(const unsigned char *s, int len)
{
int i;
for(i = 1; i < len; i++)
if (s[i] == 0 || s[i] == '\r' || s[i] == '\n' || s[i] == '\t')
for(i = 1; i < len; i++) {
if(s[i] == 0 || s[i] == '\r' || s[i] == '\n' || s[i] == '\t') {
continue;
else if (s[i] < ' ' || '~' < s[i])
} else if(s[i] < ' ' || '~' < s[i]) {
return 0;
}
}
return 1;
}
@ -475,7 +477,9 @@ serial_to_tun(FILE *inslip, int outfd)
#ifdef linux
after_fread:
#endif
if(ret == -1) err(1, "serial_to_tun: read");
if(ret == -1) {
err(1, "serial_to_tun: read");
}
if(ret == 0) {
clearerr(inslip);
return;
@ -496,8 +500,9 @@ serial_to_tun(FILE *inslip, int outfd)
static struct in_addr ipa;
inbufptr = 0;
if(memcmp(&ipa, &uip.inbuf[4], sizeof(ipa)) == 0)
if(memcmp(&ipa, &uip.inbuf[4], sizeof(ipa)) == 0) {
break;
}
/* New address. */
if(ipa.s_addr != 0) {
@ -525,14 +530,15 @@ serial_to_tun(FILE *inslip, int outfd)
/*
* If sensible ASCII string, print it as debug info!
*/
if (uip.inbuf[0] == DEBUG_LINE_MARKER)
if(uip.inbuf[0] == DEBUG_LINE_MARKER) {
fwrite(uip.inbuf + 1, inbufptr - 1, 1, stderr);
else if (is_sensible_string(uip.inbuf, inbufptr))
} else if(is_sensible_string(uip.inbuf, inbufptr)) {
fwrite(uip.inbuf, inbufptr, 1, stderr);
else
} else {
fprintf(stderr,
"serial_to_tun: drop packet len=%d ecode=%d\n",
inbufptr, ecode);
}
inbufptr = 0;
break;
}
@ -546,7 +552,9 @@ serial_to_tun(FILE *inslip, int outfd)
inbufptr = 0;
}
}
if(write(outfd, uip.inbuf, inbufptr) != inbufptr) err(1, "serial_to_tun: write");
if(write(outfd, uip.inbuf, inbufptr) != inbufptr) {
err(1, "serial_to_tun: write");
}
inbufptr = 0;
}
break;
@ -604,16 +612,17 @@ slip_flushbuf(int fd)
n = write(fd, slip_buf + slip_begin, (slip_end - slip_begin));
if (n == -1 && errno != EAGAIN)
if(n == -1 && errno != EAGAIN) {
err(1, "slip_flushbuf write failed");
else if (n == -1)
} else if(n == -1) {
PROGRESS("Q"); /* Outqueueis full! */
else {
} else {
slip_begin += n;
if (slip_begin == slip_end)
if(slip_begin == slip_end) {
slip_begin = slip_end = 0;
}
}
}
void
write_to_serial(int outfd, void *inbuf, int len)
@ -636,8 +645,9 @@ write_to_serial(int outfd, void *inbuf, int len)
iphdr->ip_id = nid;
nid = ~nid; /* negate */
iphdr->ip_sum += nid; /* add */
if (iphdr->ip_sum < nid) /* 1-complement overflow? */
if(iphdr->ip_sum < nid) { /* 1-complement overflow? */
iphdr->ip_sum++;
}
ecode = check_ip(inbuf, len);
if(ecode < 0) {
fprintf(stderr, "tun_to_serial: drop packet %d\n", ecode);
@ -836,14 +846,16 @@ ifconf(const char *tundev, const char *ipaddr, const char *netmask)
#ifdef linux
ssystem("ifconfig %s inet `hostname` up", tundev);
if (strcmp(ipaddr, "0.0.0.0") != 0)
if(strcmp(ipaddr, "0.0.0.0") != 0) {
ssystem("route add -net %s netmask %s dev %s",
inet_ntoa(netname), netmask, tundev);
}
#else
ssystem("ifconfig %s inet `hostname` %s up", tundev, ipaddr);
if (strcmp(ipaddr, "0.0.0.0") != 0)
if(strcmp(ipaddr, "0.0.0.0") != 0) {
ssystem("route add -net %s -netmask %s -interface %s",
inet_ntoa(netname), netmask, tundev);
}
ssystem("sysctl -w net.inet.ip.forwarding=1");
#endif /* !linux */
@ -878,17 +890,19 @@ main(int argc, char **argv)
break;
case 's':
if (strncmp("/dev/", optarg, 5) == 0)
if(strncmp("/dev/", optarg, 5) == 0) {
siodev = optarg + 5;
else
} else {
siodev = optarg;
}
break;
case 't':
if (strncmp("/dev/", optarg, 5) == 0)
if(strncmp("/dev/", optarg, 5) == 0) {
strcpy(tundev, optarg + 5);
else
} else {
strcpy(tundev, optarg);
}
break;
case '?':
@ -901,8 +915,9 @@ main(int argc, char **argv)
argc -= (optind - 1);
argv += (optind - 1);
if (argc != 3 && argc != 4)
if(argc != 3 && argc != 4) {
err(1, "usage: tunslip [-s siodev] [-t tundev] [-D dhcp-server] ipaddress netmask [dhcp-server]");
}
ipaddr = argv[1];
netmask = argv[2];
circuit_addr = inet_addr(ipaddr);
@ -949,8 +964,9 @@ main(int argc, char **argv)
*strchr(dhcp_server, ':') = '\0';
}
a = inet_addr(dhcp_server);
if (a == -1)
if(a == -1) {
err(1, "illegal dhcp-server address");
}
#ifndef linux
dhaddr.sin_len = sizeof(dhaddr);
#endif
@ -959,8 +975,9 @@ main(int argc, char **argv)
dhaddr.sin_addr.s_addr = a;
dhsock = socket(AF_INET, SOCK_DGRAM, 0);
if (dhsock < 0)
if(dhsock < 0) {
err (1, "socket");
}
memset(&myaddr, 0x0, sizeof(myaddr));
#ifndef linux
myaddr.sin_len = sizeof(myaddr);
@ -968,15 +985,18 @@ main(int argc, char **argv)
myaddr.sin_family = AF_INET;
myaddr.sin_addr.s_addr = INADDR_ANY;
myaddr.sin_port = htons(myport);
if (bind(dhsock, (struct sockaddr *)&myaddr, sizeof(myaddr)) < 0)
if(bind(dhsock, (struct sockaddr *)&myaddr, sizeof(myaddr)) < 0) {
err(1, "bind dhcp-relay");
}
if (connect(dhsock, (struct sockaddr *)&dhaddr, sizeof(dhaddr)) < 0)
if(connect(dhsock, (struct sockaddr *)&dhaddr, sizeof(dhaddr)) < 0) {
err(1, "connect to dhcp-server");
}
len = sizeof(myaddr);
if (getsockname(dhsock, (struct sockaddr *)&myaddr, &len) < 0)
if(getsockname(dhsock, (struct sockaddr *)&myaddr, &len) < 0) {
err(1, "getsockname dhsock");
}
giaddr = myaddr.sin_addr.s_addr;
@ -985,19 +1005,23 @@ main(int argc, char **argv)
*/
close(dhsock);
dhsock = socket(AF_INET, SOCK_DGRAM, 0);
if (dhsock < 0)
if(dhsock < 0) {
err (1, "socket");
}
myaddr.sin_family = AF_INET;
myaddr.sin_addr.s_addr = INADDR_ANY;
myaddr.sin_port = htons(myport);
if (bind(dhsock, (struct sockaddr *)&myaddr, sizeof(myaddr)) < 0)
if(bind(dhsock, (struct sockaddr *)&myaddr, sizeof(myaddr)) < 0) {
err(1, "bind dhcp-relay");
}
fprintf(stderr, "DHCP server at %s:%d\n", dhcp_server, dhport);
}
if(siodev != NULL) {
slipfd = devopen(siodev, O_RDWR | O_NONBLOCK);
if (slipfd == -1) err(1, "can't open siodev ``/dev/%s''", siodev);
if(slipfd == -1) {
err(1, "can't open siodev ``/dev/%s''", siodev);
}
} else {
static const char *siodevs[] = {
"ttyUSB0", "cuaU0", "ucom0" /* linux, fbsd6, fbsd5 */
@ -1009,7 +1033,9 @@ main(int argc, char **argv)
if (slipfd != -1)
break;
}
if (slipfd == -1) err(1, "can't open siodev");
if(slipfd == -1) {
err(1, "can't open siodev");
}
}
fprintf(stderr, "slip started on ``/dev/%s''\n", siodev);
stty_telos(slipfd);
@ -1043,8 +1069,9 @@ main(int argc, char **argv)
got_sigalarm = 0;
}
if (!slip_empty()) /* Anything to flush? */
if(!slip_empty()) { /* Anything to flush? */
FD_SET(slipfd, &wset);
}
FD_SET(slipfd, &rset); /* Read from slip ASAP! */
if(slipfd > maxfd) maxfd = slipfd;
@ -1060,11 +1087,12 @@ main(int argc, char **argv)
}
ret = select(maxfd + 1, &rset, &wset, NULL, NULL);
if(ret == -1 && errno != EINTR)
if(ret == -1 && errno != EINTR) {
err(1, "select");
else if(ret > 0) {
if(FD_ISSET(slipfd, &rset))
} else if(ret > 0) {
if(FD_ISSET(slipfd, &rset)) {
serial_to_tun(inslip, tunfd);
}
if(FD_ISSET(slipfd, &wset)) {
slip_flushbuf(slipfd);