Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-11 10:23:41 +00:00
Code Issues Projects Releases Wiki Activity

ifconfig: do not try to continue on errors. not much sence in doing that

Browse Source 
IMHO, but requires extra code.
This commit is contained in:
Denis Vlasenko 2006-11-27 10:03:21 +00:00
parent a7b2c41e03
commit 2813ce2aad
1 changed files with 57 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
networking/ifconfig.c
View File

@ -279,7 +279,6 @@ int ifconfig_main(int argc, char **argv)
const struct arg1opt *a1op; const struct arg1opt *a1op;
const struct options *op; const struct options *op;
int sockfd; /* socket fd we use to manipulate stuff with */ int sockfd; /* socket fd we use to manipulate stuff with */
int goterr;
int selector; int selector;
#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
unsigned int mask; unsigned int mask;
@ -293,7 +292,6 @@ int ifconfig_main(int argc, char **argv)
/*char host[128];*/ /*char host[128];*/
const char *host = NULL; /* make gcc happy */ const char *host = NULL; /* make gcc happy */
goterr = 0;
did_flags = 0; did_flags = 0;
#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
sai_hostname = 0; sai_hostname = 0;
@ -305,7 +303,7 @@ int ifconfig_main(int argc, char **argv)
--argc; --argc;
#if ENABLE_FEATURE_IFCONFIG_STATUS #if ENABLE_FEATURE_IFCONFIG_STATUS
if ((argc > 0) && (((*argv)[0] == '-') && ((*argv)[1] == 'a') && !(*argv)[2])) { if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
interface_opt_a = 1; interface_opt_a = 1;
--argc; --argc;
++argv; ++argv;
@ -337,13 +335,11 @@ int ifconfig_main(int argc, char **argv)
for (op = OptArray; op->name; op++) { /* Find table entry. */ for (op = OptArray; op->name; op++) { /* Find table entry. */
if (strcmp(p, op->name) == 0) { /* If name matches... */ if (strcmp(p, op->name) == 0) { /* If name matches... */
mask &= op->flags; mask &= op->flags;
if (mask) { /* set the mask and go. */ if (mask) /* set the mask and go. */
goto FOUND_ARG; goto FOUND_ARG;
}
/* If we get here, there was a valid arg with an */ /* If we get here, there was a valid arg with an */
/* invalid '-' prefix. */ /* invalid '-' prefix. */
++goterr; bb_error_msg_and_die("bad: '%s'", p-1);
goto LOOP;
} }
} }
@ -356,16 +352,13 @@ int ifconfig_main(int argc, char **argv)
if (mask & ARG_MASK) { if (mask & ARG_MASK) {
mask = op->arg_flags; mask = op->arg_flags;
a1op = Arg1Opt + (op - OptArray); a1op = Arg1Opt + (op - OptArray);
if (mask & A_NETMASK & did_flags) { if (mask & A_NETMASK & did_flags)
bb_show_usage(); bb_show_usage();
}
if (*++argv == NULL) { if (*++argv == NULL) {
if (mask & A_ARG_REQ) { if (mask & A_ARG_REQ)
bb_show_usage(); bb_show_usage();
} else { --argv;
--argv; mask &= A_SET_AFTER; /* just for broadcast */
mask &= A_SET_AFTER; /* just for broadcast */
}
} else { /* got an arg so process it */ } else { /* got an arg so process it */
HOSTNAME: HOSTNAME:
did_flags |= (mask & (A_NETMASK|A_HOSTNAME)); did_flags |= (mask & (A_NETMASK|A_HOSTNAME));
@ -382,121 +375,95 @@ int ifconfig_main(int argc, char **argv)
#if ENABLE_FEATURE_IPV6 #if ENABLE_FEATURE_IPV6
prefix = strchr(host, '/'); prefix = strchr(host, '/');
if (prefix) { if (prefix) {
if (safe_strtoi(prefix + 1, &prefix_len) || prefix_len = xatou_range(prefix + 1, 0, 128);
(prefix_len < 0) || (prefix_len > 128)) *prefix = '\0';
{
++goterr;
goto LOOP;
}
*prefix = 0;
} }
#endif #endif
sai.sin_family = AF_INET; sai.sin_family = AF_INET;
sai.sin_port = 0; sai.sin_port = 0;
if (!strcmp(host, bb_str_default)) { if (!strcmp(host, bb_str_default)) {
/* Default is special, meaning 0.0.0.0. */ /* Default is special, meaning 0.0.0.0. */
sai.sin_addr.s_addr = INADDR_ANY; sai.sin_addr.s_addr = INADDR_ANY;
}
#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
} else if (((host[0] == '+') && !host[1]) && (mask & A_BROADCAST) && else if ((host[0] == '+' && !host[1]) && (mask & A_BROADCAST)
(did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME)) { && (did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME)
) {
/* + is special, meaning broadcast is derived. */ /* + is special, meaning broadcast is derived. */
sai.sin_addr.s_addr = (~sai_netmask) | (sai_hostname & sai_netmask); sai.sin_addr.s_addr = (~sai_netmask) | (sai_hostname & sai_netmask);
}
#endif #endif
#if ENABLE_FEATURE_IPV6 #if ENABLE_FEATURE_IPV6
} else if (inet_pton(AF_INET6, host, &sai6.sin6_addr) > 0) { else if (inet_pton(AF_INET6, host, &sai6.sin6_addr) > 0) {
int sockfd6; int sockfd6;
struct in6_ifreq ifr6; struct in6_ifreq ifr6;
memcpy((char *) &ifr6.ifr6_addr, memcpy((char *) &ifr6.ifr6_addr,
(char *) &sai6.sin6_addr, (char *) &sai6.sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
/* Create a channel to the NET kernel. */ /* Create a channel to the NET kernel. */
if ((sockfd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0);
bb_perror_msg_and_die("socket6"); if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0)
} bb_perror_msg_and_die("SIOGIFINDEX");
if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) {
perror("SIOGIFINDEX");
++goterr;
continue;
}
ifr6.ifr6_ifindex = ifr.ifr_ifindex; ifr6.ifr6_ifindex = ifr.ifr_ifindex;
ifr6.ifr6_prefixlen = prefix_len; ifr6.ifr6_prefixlen = prefix_len;
if (ioctl(sockfd6, a1op->selector, &ifr6) < 0) { if (ioctl(sockfd6, a1op->selector, &ifr6) < 0)
perror(a1op->name); bb_perror_msg_and_die(a1op->name);
++goterr;
}
continue; continue;
}
#endif #endif
} else if (inet_aton(host, &sai.sin_addr) == 0) { else if (inet_aton(host, &sai.sin_addr) == 0) {
/* It's not a dotted quad. */ /* It's not a dotted quad. */
struct hostent *hp = gethostbyname(host); struct hostent *hp = xgethostbyname(host);
if (!hp) {
++goterr;
continue;
}
memcpy((char *) &sai.sin_addr, (char *) hp->h_addr_list[0], memcpy((char *) &sai.sin_addr, (char *) hp->h_addr_list[0],
sizeof(struct in_addr)); sizeof(struct in_addr));
} }
#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
if (mask & A_HOSTNAME) { if (mask & A_HOSTNAME)
sai_hostname = sai.sin_addr.s_addr; sai_hostname = sai.sin_addr.s_addr;
} if (mask & A_NETMASK)
if (mask & A_NETMASK) {
sai_netmask = sai.sin_addr.s_addr; sai_netmask = sai.sin_addr.s_addr;
}
#endif #endif
p = (char *) &sai; p = (char *) &sai;
#if ENABLE_FEATURE_IFCONFIG_HW #if ENABLE_FEATURE_IFCONFIG_HW
} else { /* A_CAST_HOST_COPY_IN_ETHER */ } else { /* A_CAST_HOST_COPY_IN_ETHER */
/* This is the "hw" arg case. */ /* This is the "hw" arg case. */
if (strcmp("ether", *argv) || (*++argv == NULL)) { if (strcmp("ether", *argv) || !*++argv)
bb_show_usage(); bb_show_usage();
}
/*safe_strncpy(host, *argv, sizeof(host));*/ /*safe_strncpy(host, *argv, sizeof(host));*/
host = *argv; host = *argv;
if (in_ether(host, &sa)) { if (in_ether(host, &sa))
bb_error_msg("invalid hw-addr %s", host); bb_error_msg_and_die("invalid hw-addr %s", host);
++goterr;
continue;
}
p = (char *) &sa; p = (char *) &sa;
} }
#endif #endif
memcpy( (((char *)&ifr) + a1op->ifr_offset), memcpy( (((char *)&ifr) + a1op->ifr_offset),
p, sizeof(struct sockaddr)); p, sizeof(struct sockaddr));
} else { } else {
/* FIXME: error check?? */
unsigned long i = strtoul(*argv, NULL, 0); unsigned long i = strtoul(*argv, NULL, 0);
p = ((char *)&ifr) + a1op->ifr_offset; p = ((char *)&ifr) + a1op->ifr_offset;
#if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
if (mask & A_MAP_TYPE) { if (mask & A_MAP_TYPE) {
if (ioctl(sockfd, SIOCGIFMAP, &ifr) < 0) { if (ioctl(sockfd, SIOCGIFMAP, &ifr) < 0)
++goterr; bb_perror_msg_and_die("SIOCGIFMAP");
continue; if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR)
}
if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR) {
*((unsigned char *) p) = i; *((unsigned char *) p) = i;
} else if (mask & A_MAP_USHORT) { else if (mask & A_MAP_USHORT)
*((unsigned short *) p) = i; *((unsigned short *) p) = i;
} else { else
*((unsigned long *) p) = i; *((unsigned long *) p) = i;
}
} else } else
#endif #endif
if (mask & A_CAST_CHAR_PTR) { if (mask & A_CAST_CHAR_PTR)
*((caddr_t *) p) = (caddr_t) i; *((caddr_t *) p) = (caddr_t) i;
} else { /* A_CAST_INT */ else /* A_CAST_INT */
*((int *) p) = i; *((int *) p) = i;
}
} }
if (ioctl(sockfd, a1op->selector, &ifr) < 0) { if (ioctl(sockfd, a1op->selector, &ifr) < 0)
perror(a1op->name); bb_perror_msg_and_die(a1op->name);
++goterr;
continue;
}
#ifdef QUESTIONABLE_ALIAS_CASE #ifdef QUESTIONABLE_ALIAS_CASE
if (mask & A_COLON_CHK) { if (mask & A_COLON_CHK) {
/* /*
@ -508,46 +475,33 @@ int ifconfig_main(int argc, char **argv)
*/ */
char *ptr; char *ptr;
short int found_colon = 0; short int found_colon = 0;
for (ptr = ifr.ifr_name; *ptr; ptr++)
for (ptr = ifr.ifr_name; *ptr; ptr++) { if (*ptr == ':')
if (*ptr == ':') {
found_colon++; found_colon++;
} if (found_colon && ptr[-1] == '-')
}
if (found_colon && *(ptr - 1) == '-') {
continue; continue;
}
} }
#endif #endif
} }
if (!(mask & A_SET_AFTER)) { if (!(mask & A_SET_AFTER))
continue; continue;
}
mask = N_SET; mask = N_SET;
} }
if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) { if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
perror("SIOCGIFFLAGS"); bb_perror_msg_and_die("SIOCGIFFLAGS");
++goterr; selector = op->selector;
} else { if (mask & SET_MASK)
selector = op->selector; ifr.ifr_flags |= selector;
if (mask & SET_MASK) { else
ifr.ifr_flags |= selector; ifr.ifr_flags &= ~selector;
} else { if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0)
ifr.ifr_flags &= ~selector; bb_perror_msg_and_die("SIOCSIFFLAGS");
} } /* while() */
if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
perror("SIOCSIFFLAGS");
++goterr;
}
}
LOOP:
continue;
} /* end of while-loop */
if (ENABLE_FEATURE_CLEAN_UP) close(sockfd); if (ENABLE_FEATURE_CLEAN_UP)
return goterr; close(sockfd);
return 0;
} }
#if ENABLE_FEATURE_IFCONFIG_HW #if ENABLE_FEATURE_IFCONFIG_HW