RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Whitespace removal.

Browse Source
This commit is contained in:
Ralf Corsepius
2009-11-29 12:12:39 +00:00
parent 33c3b54d57
commit 0893220b2a
55 changed files with 347 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
cpukit/libmisc/monitor/mon-network.c
View File

@@ -50,19 +50,19 @@ void mon_ifconfig(int argc, char *argv[],
memset(&dstaddr, 0, sizeof(dstaddr));
memset(&netmask, 0, sizeof(netmask));
memset(&broadcast, 0, sizeof(broadcast));
ipaddr.sin_len = sizeof(ipaddr);
ipaddr.sin_family = AF_INET;
dstaddr.sin_len = sizeof(dstaddr);
dstaddr.sin_family = AF_INET;
netmask.sin_len = sizeof(netmask);
netmask.sin_family = AF_INET;
broadcast.sin_len = sizeof(broadcast);
broadcast.sin_family = AF_INET;
cur_idx = 0;
if (argc <= 1) {
/* display all interfaces */
@@ -81,11 +81,11 @@ void mon_ifconfig(int argc, char *argv[],
cur_idx += 2;
}
}
if ((f_down !=0) && (f_ip != 0)) {
f_up = 1;
}
while(argc > cur_idx) {
if (strcmp(argv[cur_idx], "up") == 0) {
f_up = 1;
@@ -101,7 +101,7 @@ void mon_ifconfig(int argc, char *argv[],
if ((cur_idx + 1) >= argc) {
printf("No netmask address\n");
return;
}
}
if (inet_pton(AF_INET, argv[cur_idx+1], &netmask.sin_addr) < 0) {
printf("bad netmask: %s\n", argv[cur_idx]);
return;
@@ -112,7 +112,7 @@ void mon_ifconfig(int argc, char *argv[],
if ((cur_idx + 1) >= argc) {
printf("No broadcast address\n");
return;
}
}
if (inet_pton(AF_INET, argv[cur_idx+1], &broadcast.sin_addr) < 0) {
printf("bad broadcast: %s\n", argv[cur_idx]);
return;
@@ -123,22 +123,22 @@ void mon_ifconfig(int argc, char *argv[],
if ((cur_idx + 1) >= argc) {
printf("No pointopoint address\n");
return;
}
}
if (inet_pton(AF_INET, argv[cur_idx+1], &dstaddr.sin_addr) < 0) {
printf("bad pointopoint: %s\n", argv[cur_idx]);
return;
}
f_ptp = 1;
cur_idx += 1;
} else {
printf("Bad parameter: %s\n", argv[cur_idx]);
return;
}
cur_idx += 1;
}
printf("ifconfig ");
if (iface != NULL) {
printf("%s ", iface);
@@ -147,25 +147,25 @@ void mon_ifconfig(int argc, char *argv[],
inet_ntop(AF_INET, &ipaddr.sin_addr, str, 256);
printf("%s ", str);
}
if (f_netmask != 0) {
char str[256];
inet_ntop(AF_INET, &netmask.sin_addr, str, 256);
printf("netmask %s ", str);
}
if (f_bcast != 0) {
char str[256];
inet_ntop(AF_INET, &broadcast.sin_addr, str, 256);
printf("broadcast %s ", str);
}
if (f_ptp != 0) {
char str[256];
inet_ntop(AF_INET, &dstaddr.sin_addr, str, 256);
printf("pointopoint %s ", str);
}
if (f_up != 0) {
printf("up\n");
} else if (f_down != 0) {
@@ -174,12 +174,12 @@ void mon_ifconfig(int argc, char *argv[],
printf("\n");
}
}
if ((iface == NULL) || ((f_ip == 0) && (f_down == 0) && (f_up == 0))) {
rtems_bsdnet_show_if_stats();
return;
}
flags = 0;
if (f_netmask) {
rc = rtems_bsdnet_ifconfig(iface, SIOCSIFNETMASK, &netmask);
@@ -188,7 +188,7 @@ void mon_ifconfig(int argc, char *argv[],
return;
}
}
if (f_bcast) {
rc = rtems_bsdnet_ifconfig(iface, SIOCSIFBRDADDR, &broadcast);
if (rc < 0) {
@@ -196,7 +196,7 @@ void mon_ifconfig(int argc, char *argv[],
return;
}
}
if (f_ptp) {
rc = rtems_bsdnet_ifconfig(iface, SIOCSIFDSTADDR, &dstaddr);
if (rc < 0) {
@@ -205,8 +205,8 @@ void mon_ifconfig(int argc, char *argv[],
}
flags |= IFF_POINTOPOINT;
}
/* This must come _after_ setting the netmask, broadcast addresses */
/* This must come _after_ setting the netmask, broadcast addresses */
if (f_ip) {
rc = rtems_bsdnet_ifconfig(iface, SIOCSIFADDR, &ipaddr);
if (rc < 0) {
@@ -214,15 +214,15 @@ void mon_ifconfig(int argc, char *argv[],
return;
}
}
if (f_up != 0) {
flags |= IFF_UP;
}
if (f_down != 0) {
printf("Warning: taking interfaces down is not supported\n");
}
rc = rtems_bsdnet_ifconfig(iface, SIOCSIFFLAGS, &flags);
if (rc < 0) {
printf("Could not set interface flags: %s\n", strerror(errno));
@@ -245,28 +245,28 @@ void mon_route(int argc, char *argv[],
int cur_idx;
int flags;
int rc;
memset(&dst, 0, sizeof(dst));
memset(&gw, 0, sizeof(gw));
memset(&netmask, 0, sizeof(netmask));
dst.sin_len = sizeof(dst);
dst.sin_family = AF_INET;
dst.sin_addr.s_addr = inet_addr("0.0.0.0");
dst.sin_addr.s_addr = inet_addr("0.0.0.0");
gw.sin_len = sizeof(gw);
gw.sin_family = AF_INET;
gw.sin_addr.s_addr = inet_addr("0.0.0.0");
gw.sin_addr.s_addr = inet_addr("0.0.0.0");
netmask.sin_len = sizeof(netmask);
netmask.sin_family = AF_INET;
netmask.sin_addr.s_addr = inet_addr("255.255.255.0");
netmask.sin_addr.s_addr = inet_addr("255.255.255.0");
if (argc < 2) {
rtems_bsdnet_show_inet_routes();
return;
}
}
if (strcmp(argv[1], "add") == 0) {
cmd = RTM_ADD;
} else if (strcmp(argv[1], "del") == 0) {
@@ -276,12 +276,12 @@ void mon_route(int argc, char *argv[],
printf("\tit should be 'add' or 'del'\n");
return;
}
if (argc < 3) {
printf("not enough arguments\n");
return;
}
if (strcmp(argv[2], "-host") == 0) {
f_host = 1;
} else if (strcmp(argv[2], "-net") == 0) {
@@ -291,14 +291,14 @@ void mon_route(int argc, char *argv[],
printf("\tit should be '-host' or '-net'\n");
return;
}
if (argc < 4) {
printf("not enough arguments\n");
return;
}
inet_pton(AF_INET, argv[3], &dst.sin_addr);
cur_idx = 4;
while(cur_idx < argc) {
if (strcmp(argv[cur_idx], "gw") == 0) {
@@ -323,7 +323,7 @@ void mon_route(int argc, char *argv[],
}
cur_idx += 1;
}
flags = RTF_STATIC;
if (f_gw != 0) {
flags |= RTF_GATEWAY;