mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
use xbind, xconnect where appropriate.
small edits to arping
This commit is contained in:
parent
7e46cf748e
commit
1dc1b37b33
@ -54,7 +54,8 @@ void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
|
||||
if (connect(s, s_addr, addrlen) < 0) {
|
||||
if (ENABLE_FEATURE_CLEAN_UP) close(s);
|
||||
if (s_addr->sa_family == AF_INET)
|
||||
bb_perror_msg_and_die("cannot connect to remote host (%s)",
|
||||
bb_perror_msg_and_die("%s (%s)",
|
||||
"cannot connect to remote host",
|
||||
inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
|
||||
bb_perror_msg_and_die("cannot connect to remote host");
|
||||
}
|
||||
|
@ -11,11 +11,6 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <net/if.h>
|
||||
#include <netinet/ether.h>
|
||||
@ -49,9 +44,9 @@ static int received;
|
||||
static int brd_recv;
|
||||
static int req_recv;
|
||||
|
||||
|
||||
#define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
|
||||
((tv1).tv_usec-(tv2).tv_usec)/1000 )
|
||||
|
||||
static int send_pack(int sock, struct in_addr *src_addr,
|
||||
struct in_addr *dst_addr, struct sockaddr_ll *ME,
|
||||
struct sockaddr_ll *HE)
|
||||
@ -99,20 +94,12 @@ static int send_pack(int sock, struct in_addr *src_addr,
|
||||
static void finish(void)
|
||||
{
|
||||
if (!(cfg & quiet)) {
|
||||
printf("Sent %d probes (%d broadcast(s))\n"
|
||||
"Received %d repl%s",
|
||||
printf("Sent %d probe(s) (%d broadcast(s))\n"
|
||||
"Received %d repl%s"
|
||||
" (%d request(s), %d broadcast(s))\n",
|
||||
sent, brd_sent,
|
||||
received, (received > 1) ? "ies" : "y");
|
||||
if (brd_recv || req_recv) {
|
||||
printf(" (");
|
||||
if (req_recv)
|
||||
printf("%d request(s)", req_recv);
|
||||
if (brd_recv)
|
||||
printf("%s%d broadcast(s)", req_recv ? ", " : "", brd_recv);
|
||||
putchar(')');
|
||||
}
|
||||
putchar('\n');
|
||||
fflush(stdout);
|
||||
received, (received == 1) ? "ies" : "y",
|
||||
req_recv, brd_recv);
|
||||
}
|
||||
if (cfg & dad)
|
||||
exit(!!received);
|
||||
@ -137,7 +124,7 @@ static void catcher(void)
|
||||
|
||||
if (last.tv_sec == 0 || MS_TDIFF(tv, last) > 500) {
|
||||
send_pack(s, &src, &dst, &me, &he);
|
||||
if (count == 0 && cfg&unsolicited)
|
||||
if (count == 0 && (cfg & unsolicited))
|
||||
finish();
|
||||
}
|
||||
alarm(1);
|
||||
@ -150,9 +137,9 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
||||
struct in_addr src_ip, dst_ip;
|
||||
|
||||
/* Filter out wild packets */
|
||||
if (FROM->sll_pkttype != PACKET_HOST &&
|
||||
FROM->sll_pkttype != PACKET_BROADCAST &&
|
||||
FROM->sll_pkttype != PACKET_MULTICAST)
|
||||
if (FROM->sll_pkttype != PACKET_HOST
|
||||
&& FROM->sll_pkttype != PACKET_BROADCAST
|
||||
&& FROM->sll_pkttype != PACKET_MULTICAST)
|
||||
return 0;
|
||||
|
||||
/* Only these types are recognised */
|
||||
@ -160,9 +147,8 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
||||
return 0;
|
||||
|
||||
/* ARPHRD check and this darned FDDI hack here :-( */
|
||||
if (ah->ar_hrd != htons(FROM->sll_hatype) &&
|
||||
(FROM->sll_hatype != ARPHRD_FDDI
|
||||
|| ah->ar_hrd != htons(ARPHRD_ETHER)))
|
||||
if (ah->ar_hrd != htons(FROM->sll_hatype)
|
||||
&& (FROM->sll_hatype != ARPHRD_FDDI || ah->ar_hrd != htons(ARPHRD_ETHER)))
|
||||
return 0;
|
||||
|
||||
/* Protocol must be IP. */
|
||||
@ -210,9 +196,9 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
||||
|
||||
gettimeofday(&tv, NULL);
|
||||
|
||||
printf("%s %s from %s [%s]",
|
||||
FROM->sll_pkttype == PACKET_HOST ? "Unicast" : "Broadcast",
|
||||
ah->ar_op == htons(ARPOP_REPLY) ? "reply" : "request",
|
||||
printf("%scast re%s from %s [%s]",
|
||||
FROM->sll_pkttype == PACKET_HOST ? "Uni" : "Broad",
|
||||
ah->ar_op == htons(ARPOP_REPLY) ? "ply" : "quest",
|
||||
inet_ntoa(src_ip),
|
||||
ether_ntoa((struct ether_addr *) p));
|
||||
if (dst_ip.s_addr != src.s_addr) {
|
||||
@ -279,12 +265,11 @@ int arping_main(int argc, char **argv)
|
||||
count = xatou(_count);
|
||||
if (opt & 0x80) /* -w: timeout */
|
||||
timeout = xatoul_range(_timeout, 0, INT_MAX/2000);
|
||||
if (opt & 0x100) { /* -i: interface */
|
||||
//if (opt & 0x100) /* -i: interface */
|
||||
if (strlen(device) > IF_NAMESIZE) {
|
||||
bb_error_msg_and_die("interface name '%s' is too long",
|
||||
device);
|
||||
}
|
||||
}
|
||||
//if (opt & 0x200) /* -s: source */
|
||||
}
|
||||
argc -= optind;
|
||||
@ -315,7 +300,7 @@ int arping_main(int argc, char **argv)
|
||||
}
|
||||
if (ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)) {
|
||||
bb_error_msg("interface %s is not ARPable", device);
|
||||
exit(cfg&dad ? 0 : 2);
|
||||
return (cfg & dad ? 0 : 2);
|
||||
}
|
||||
}
|
||||
|
||||
@ -333,7 +318,7 @@ int arping_main(int argc, char **argv)
|
||||
bb_error_msg_and_die("invalid source address %s", source);
|
||||
}
|
||||
|
||||
if (!(cfg&dad) && cfg&unsolicited && src.s_addr == 0)
|
||||
if (!(cfg & dad) && (cfg & unsolicited) && src.s_addr == 0)
|
||||
src = dst;
|
||||
|
||||
if (!(cfg & dad) || src.s_addr) {
|
||||
@ -341,18 +326,14 @@ int arping_main(int argc, char **argv)
|
||||
int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
|
||||
|
||||
if (device) {
|
||||
if (setsockopt
|
||||
(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device,
|
||||
strlen(device) + 1) == -1)
|
||||
if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
|
||||
bb_error_msg("warning: interface %s is ignored", device);
|
||||
}
|
||||
memset(&saddr, 0, sizeof(saddr));
|
||||
saddr.sin_family = AF_INET;
|
||||
if (src.s_addr) {
|
||||
saddr.sin_addr = src;
|
||||
if (bind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr)) == -1) {
|
||||
bb_error_msg_and_die("bind");
|
||||
}
|
||||
xbind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
|
||||
} else if (!(cfg & dad)) {
|
||||
static const int on = 1;
|
||||
socklen_t alen = sizeof(saddr);
|
||||
@ -360,29 +341,21 @@ int arping_main(int argc, char **argv)
|
||||
saddr.sin_port = htons(1025);
|
||||
saddr.sin_addr = dst;
|
||||
|
||||
if (setsockopt
|
||||
(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *) &on,
|
||||
sizeof(on)) == -1)
|
||||
if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *) &on, sizeof(on)) == -1)
|
||||
bb_perror_msg("warning: setsockopt(SO_DONTROUTE)");
|
||||
if (connect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr))
|
||||
== -1) {
|
||||
bb_error_msg_and_die("connect");
|
||||
}
|
||||
if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) ==
|
||||
-1) {
|
||||
xconnect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
|
||||
if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1) {
|
||||
bb_error_msg_and_die("getsockname");
|
||||
}
|
||||
src = saddr.sin_addr;
|
||||
}
|
||||
close(probe_fd);
|
||||
};
|
||||
}
|
||||
|
||||
me.sll_family = AF_PACKET;
|
||||
me.sll_ifindex = ifindex;
|
||||
me.sll_protocol = htons(ETH_P_ARP);
|
||||
if (bind(s, (struct sockaddr *) &me, sizeof(me)) == -1) {
|
||||
bb_error_msg_and_die("bind");
|
||||
}
|
||||
xbind(s, (struct sockaddr *) &me, sizeof(me));
|
||||
|
||||
{
|
||||
socklen_t alen = sizeof(me);
|
||||
@ -393,7 +366,7 @@ int arping_main(int argc, char **argv)
|
||||
}
|
||||
if (me.sll_halen == 0) {
|
||||
bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
|
||||
exit(cfg&dad ? 0 : 2);
|
||||
return (cfg & dad ? 0 : 2);
|
||||
}
|
||||
he = me;
|
||||
memset(he.sll_addr, -1, he.sll_halen);
|
||||
@ -430,8 +403,8 @@ int arping_main(int argc, char **argv)
|
||||
socklen_t alen = sizeof(from);
|
||||
int cc;
|
||||
|
||||
if ((cc = recvfrom(s, packet, 4096, 0,
|
||||
(struct sockaddr *) &from, &alen)) < 0) {
|
||||
cc = recvfrom(s, packet, 4096, 0, (struct sockaddr *) &from, &alen);
|
||||
if (cc < 0) {
|
||||
bb_perror_msg("recvfrom");
|
||||
continue;
|
||||
}
|
||||
|
@ -12,10 +12,6 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_packet.h>
|
||||
#include <netpacket/packet.h>
|
||||
|
@ -120,8 +120,7 @@ int nc_main(int argc, char **argv)
|
||||
address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
|
||||
address.sin_port = bb_lookup_port(argv[1], "tcp", 0);
|
||||
|
||||
if (connect(sfd, (struct sockaddr *) &address, sizeof(address)) < 0)
|
||||
bb_perror_msg_and_die("connect");
|
||||
xconnect(sfd, (struct sockaddr *) &address, sizeof(address));
|
||||
cfd = sfd;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user