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 (connect(s, s_addr, addrlen) < 0) {
|
||||||
if (ENABLE_FEATURE_CLEAN_UP) close(s);
|
if (ENABLE_FEATURE_CLEAN_UP) close(s);
|
||||||
if (s_addr->sa_family == AF_INET)
|
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));
|
inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
|
||||||
bb_perror_msg_and_die("cannot connect to remote host");
|
bb_perror_msg_and_die("cannot connect to remote host");
|
||||||
}
|
}
|
||||||
|
@ -11,11 +11,6 @@
|
|||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <netinet/ether.h>
|
#include <netinet/ether.h>
|
||||||
@ -49,12 +44,12 @@ static int received;
|
|||||||
static int brd_recv;
|
static int brd_recv;
|
||||||
static int req_recv;
|
static int req_recv;
|
||||||
|
|
||||||
|
|
||||||
#define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
|
#define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
|
||||||
((tv1).tv_usec-(tv2).tv_usec)/1000 )
|
((tv1).tv_usec-(tv2).tv_usec)/1000 )
|
||||||
|
|
||||||
static int send_pack(int sock, struct in_addr *src_addr,
|
static int send_pack(int sock, struct in_addr *src_addr,
|
||||||
struct in_addr *dst_addr, struct sockaddr_ll *ME,
|
struct in_addr *dst_addr, struct sockaddr_ll *ME,
|
||||||
struct sockaddr_ll *HE)
|
struct sockaddr_ll *HE)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
struct timeval now;
|
struct timeval now;
|
||||||
@ -67,7 +62,7 @@ static int send_pack(int sock, struct in_addr *src_addr,
|
|||||||
ah->ar_pro = htons(ETH_P_IP);
|
ah->ar_pro = htons(ETH_P_IP);
|
||||||
ah->ar_hln = ME->sll_halen;
|
ah->ar_hln = ME->sll_halen;
|
||||||
ah->ar_pln = 4;
|
ah->ar_pln = 4;
|
||||||
ah->ar_op = cfg&advert ? htons(ARPOP_REPLY) : htons(ARPOP_REQUEST);
|
ah->ar_op = cfg & advert ? htons(ARPOP_REPLY) : htons(ARPOP_REQUEST);
|
||||||
|
|
||||||
memcpy(p, &ME->sll_addr, ah->ar_hln);
|
memcpy(p, &ME->sll_addr, ah->ar_hln);
|
||||||
p += ME->sll_halen;
|
p += ME->sll_halen;
|
||||||
@ -75,7 +70,7 @@ static int send_pack(int sock, struct in_addr *src_addr,
|
|||||||
memcpy(p, src_addr, 4);
|
memcpy(p, src_addr, 4);
|
||||||
p += 4;
|
p += 4;
|
||||||
|
|
||||||
if (cfg&advert)
|
if (cfg & advert)
|
||||||
memcpy(p, &ME->sll_addr, ah->ar_hln);
|
memcpy(p, &ME->sll_addr, ah->ar_hln);
|
||||||
else
|
else
|
||||||
memcpy(p, &HE->sll_addr, ah->ar_hln);
|
memcpy(p, &HE->sll_addr, ah->ar_hln);
|
||||||
@ -89,7 +84,7 @@ static int send_pack(int sock, struct in_addr *src_addr,
|
|||||||
if (err == p - buf) {
|
if (err == p - buf) {
|
||||||
last = now;
|
last = now;
|
||||||
sent++;
|
sent++;
|
||||||
if (!(cfg&unicasting))
|
if (!(cfg & unicasting))
|
||||||
brd_sent++;
|
brd_sent++;
|
||||||
}
|
}
|
||||||
RELEASE_CONFIG_BUFFER(buf);
|
RELEASE_CONFIG_BUFFER(buf);
|
||||||
@ -98,25 +93,17 @@ static int send_pack(int sock, struct in_addr *src_addr,
|
|||||||
|
|
||||||
static void finish(void)
|
static void finish(void)
|
||||||
{
|
{
|
||||||
if (!(cfg&quiet)) {
|
if (!(cfg & quiet)) {
|
||||||
printf("Sent %d probes (%d broadcast(s))\n"
|
printf("Sent %d probe(s) (%d broadcast(s))\n"
|
||||||
"Received %d repl%s",
|
"Received %d repl%s"
|
||||||
|
" (%d request(s), %d broadcast(s))\n",
|
||||||
sent, brd_sent,
|
sent, brd_sent,
|
||||||
received, (received > 1) ? "ies" : "y");
|
received, (received == 1) ? "ies" : "y",
|
||||||
if (brd_recv || req_recv) {
|
req_recv, brd_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);
|
|
||||||
}
|
}
|
||||||
if (cfg&dad)
|
if (cfg & dad)
|
||||||
exit(!!received);
|
exit(!!received);
|
||||||
if (cfg&unsolicited)
|
if (cfg & unsolicited)
|
||||||
exit(0);
|
exit(0);
|
||||||
exit(!received);
|
exit(!received);
|
||||||
}
|
}
|
||||||
@ -132,12 +119,12 @@ static void catcher(void)
|
|||||||
start = tv;
|
start = tv;
|
||||||
|
|
||||||
if (count-- == 0
|
if (count-- == 0
|
||||||
|| (timeout && MS_TDIFF(tv, start) > timeout * 1000 + 500))
|
|| (timeout && MS_TDIFF(tv, start) > timeout * 1000 + 500))
|
||||||
finish();
|
finish();
|
||||||
|
|
||||||
if (last.tv_sec == 0 || MS_TDIFF(tv, last) > 500) {
|
if (last.tv_sec == 0 || MS_TDIFF(tv, last) > 500) {
|
||||||
send_pack(s, &src, &dst, &me, &he);
|
send_pack(s, &src, &dst, &me, &he);
|
||||||
if (count == 0 && cfg&unsolicited)
|
if (count == 0 && (cfg & unsolicited))
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
alarm(1);
|
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;
|
struct in_addr src_ip, dst_ip;
|
||||||
|
|
||||||
/* Filter out wild packets */
|
/* Filter out wild packets */
|
||||||
if (FROM->sll_pkttype != PACKET_HOST &&
|
if (FROM->sll_pkttype != PACKET_HOST
|
||||||
FROM->sll_pkttype != PACKET_BROADCAST &&
|
&& FROM->sll_pkttype != PACKET_BROADCAST
|
||||||
FROM->sll_pkttype != PACKET_MULTICAST)
|
&& FROM->sll_pkttype != PACKET_MULTICAST)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Only these types are recognised */
|
/* Only these types are recognised */
|
||||||
@ -160,9 +147,8 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* ARPHRD check and this darned FDDI hack here :-( */
|
/* ARPHRD check and this darned FDDI hack here :-( */
|
||||||
if (ah->ar_hrd != htons(FROM->sll_hatype) &&
|
if (ah->ar_hrd != htons(FROM->sll_hatype)
|
||||||
(FROM->sll_hatype != ARPHRD_FDDI
|
&& (FROM->sll_hatype != ARPHRD_FDDI || ah->ar_hrd != htons(ARPHRD_ETHER)))
|
||||||
|| ah->ar_hrd != htons(ARPHRD_ETHER)))
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Protocol must be IP. */
|
/* Protocol must be IP. */
|
||||||
@ -176,7 +162,7 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
|||||||
return 0;
|
return 0;
|
||||||
memcpy(&src_ip, p + ah->ar_hln, 4);
|
memcpy(&src_ip, p + ah->ar_hln, 4);
|
||||||
memcpy(&dst_ip, p + ah->ar_hln + 4 + ah->ar_hln, 4);
|
memcpy(&dst_ip, p + ah->ar_hln + 4 + ah->ar_hln, 4);
|
||||||
if (!(cfg&dad)) {
|
if (!(cfg & dad)) {
|
||||||
if (src_ip.s_addr != dst.s_addr)
|
if (src_ip.s_addr != dst.s_addr)
|
||||||
return 0;
|
return 0;
|
||||||
if (src.s_addr != dst_ip.s_addr)
|
if (src.s_addr != dst_ip.s_addr)
|
||||||
@ -204,15 +190,15 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
|||||||
if (src.s_addr && src.s_addr != dst_ip.s_addr)
|
if (src.s_addr && src.s_addr != dst_ip.s_addr)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!(cfg&quiet)) {
|
if (!(cfg & quiet)) {
|
||||||
int s_printed = 0;
|
int s_printed = 0;
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
|
||||||
gettimeofday(&tv, NULL);
|
gettimeofday(&tv, NULL);
|
||||||
|
|
||||||
printf("%s %s from %s [%s]",
|
printf("%scast re%s from %s [%s]",
|
||||||
FROM->sll_pkttype == PACKET_HOST ? "Unicast" : "Broadcast",
|
FROM->sll_pkttype == PACKET_HOST ? "Uni" : "Broad",
|
||||||
ah->ar_op == htons(ARPOP_REPLY) ? "reply" : "request",
|
ah->ar_op == htons(ARPOP_REPLY) ? "ply" : "quest",
|
||||||
inet_ntoa(src_ip),
|
inet_ntoa(src_ip),
|
||||||
ether_ntoa((struct ether_addr *) p));
|
ether_ntoa((struct ether_addr *) p));
|
||||||
if (dst_ip.s_addr != src.s_addr) {
|
if (dst_ip.s_addr != src.s_addr) {
|
||||||
@ -223,7 +209,7 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
|||||||
if (!s_printed)
|
if (!s_printed)
|
||||||
printf("for ");
|
printf("for ");
|
||||||
printf("[%s]",
|
printf("[%s]",
|
||||||
ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
|
ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (last.tv_sec) {
|
if (last.tv_sec) {
|
||||||
@ -243,9 +229,9 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
|||||||
brd_recv++;
|
brd_recv++;
|
||||||
if (ah->ar_op == htons(ARPOP_REQUEST))
|
if (ah->ar_op == htons(ARPOP_REQUEST))
|
||||||
req_recv++;
|
req_recv++;
|
||||||
if (cfg&quit_on_reply)
|
if (cfg & quit_on_reply)
|
||||||
finish();
|
finish();
|
||||||
if (!(cfg&broadcast_only)) {
|
if (!(cfg & broadcast_only)) {
|
||||||
memcpy(he.sll_addr, p, me.sll_halen);
|
memcpy(he.sll_addr, p, me.sll_halen);
|
||||||
cfg |= unicasting;
|
cfg |= unicasting;
|
||||||
}
|
}
|
||||||
@ -279,11 +265,10 @@ int arping_main(int argc, char **argv)
|
|||||||
count = xatou(_count);
|
count = xatou(_count);
|
||||||
if (opt & 0x80) /* -w: timeout */
|
if (opt & 0x80) /* -w: timeout */
|
||||||
timeout = xatoul_range(_timeout, 0, INT_MAX/2000);
|
timeout = xatoul_range(_timeout, 0, INT_MAX/2000);
|
||||||
if (opt & 0x100) { /* -i: interface */
|
//if (opt & 0x100) /* -i: interface */
|
||||||
if (strlen(device) > IF_NAMESIZE) {
|
if (strlen(device) > IF_NAMESIZE) {
|
||||||
bb_error_msg_and_die("interface name '%s' is too long",
|
bb_error_msg_and_die("interface name '%s' is too long",
|
||||||
device);
|
device);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//if (opt & 0x200) /* -s: source */
|
//if (opt & 0x200) /* -s: source */
|
||||||
}
|
}
|
||||||
@ -315,7 +300,7 @@ int arping_main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
if (ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)) {
|
if (ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)) {
|
||||||
bb_error_msg("interface %s is not ARPable", device);
|
bb_error_msg("interface %s is not ARPable", device);
|
||||||
exit(cfg&dad ? 0 : 2);
|
return (cfg & dad ? 0 : 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -333,56 +318,44 @@ int arping_main(int argc, char **argv)
|
|||||||
bb_error_msg_and_die("invalid source address %s", source);
|
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;
|
src = dst;
|
||||||
|
|
||||||
if (!(cfg&dad) || src.s_addr) {
|
if (!(cfg & dad) || src.s_addr) {
|
||||||
struct sockaddr_in saddr;
|
struct sockaddr_in saddr;
|
||||||
int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
|
int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
|
||||||
|
|
||||||
if (device) {
|
if (device) {
|
||||||
if (setsockopt
|
if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
|
||||||
(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device,
|
|
||||||
strlen(device) + 1) == -1)
|
|
||||||
bb_error_msg("warning: interface %s is ignored", device);
|
bb_error_msg("warning: interface %s is ignored", device);
|
||||||
}
|
}
|
||||||
memset(&saddr, 0, sizeof(saddr));
|
memset(&saddr, 0, sizeof(saddr));
|
||||||
saddr.sin_family = AF_INET;
|
saddr.sin_family = AF_INET;
|
||||||
if (src.s_addr) {
|
if (src.s_addr) {
|
||||||
saddr.sin_addr = src;
|
saddr.sin_addr = src;
|
||||||
if (bind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr)) == -1) {
|
xbind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
|
||||||
bb_error_msg_and_die("bind");
|
} else if (!(cfg & dad)) {
|
||||||
}
|
|
||||||
} else if (!(cfg&dad)) {
|
|
||||||
static const int on = 1;
|
static const int on = 1;
|
||||||
socklen_t alen = sizeof(saddr);
|
socklen_t alen = sizeof(saddr);
|
||||||
|
|
||||||
saddr.sin_port = htons(1025);
|
saddr.sin_port = htons(1025);
|
||||||
saddr.sin_addr = dst;
|
saddr.sin_addr = dst;
|
||||||
|
|
||||||
if (setsockopt
|
if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *) &on, sizeof(on)) == -1)
|
||||||
(probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *) &on,
|
|
||||||
sizeof(on)) == -1)
|
|
||||||
bb_perror_msg("warning: setsockopt(SO_DONTROUTE)");
|
bb_perror_msg("warning: setsockopt(SO_DONTROUTE)");
|
||||||
if (connect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr))
|
xconnect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
|
||||||
== -1) {
|
if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1) {
|
||||||
bb_error_msg_and_die("connect");
|
|
||||||
}
|
|
||||||
if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) ==
|
|
||||||
-1) {
|
|
||||||
bb_error_msg_and_die("getsockname");
|
bb_error_msg_and_die("getsockname");
|
||||||
}
|
}
|
||||||
src = saddr.sin_addr;
|
src = saddr.sin_addr;
|
||||||
}
|
}
|
||||||
close(probe_fd);
|
close(probe_fd);
|
||||||
};
|
}
|
||||||
|
|
||||||
me.sll_family = AF_PACKET;
|
me.sll_family = AF_PACKET;
|
||||||
me.sll_ifindex = ifindex;
|
me.sll_ifindex = ifindex;
|
||||||
me.sll_protocol = htons(ETH_P_ARP);
|
me.sll_protocol = htons(ETH_P_ARP);
|
||||||
if (bind(s, (struct sockaddr *) &me, sizeof(me)) == -1) {
|
xbind(s, (struct sockaddr *) &me, sizeof(me));
|
||||||
bb_error_msg_and_die("bind");
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
socklen_t alen = sizeof(me);
|
socklen_t alen = sizeof(me);
|
||||||
@ -393,18 +366,18 @@ int arping_main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
if (me.sll_halen == 0) {
|
if (me.sll_halen == 0) {
|
||||||
bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
|
bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
|
||||||
exit(cfg&dad ? 0 : 2);
|
return (cfg & dad ? 0 : 2);
|
||||||
}
|
}
|
||||||
he = me;
|
he = me;
|
||||||
memset(he.sll_addr, -1, he.sll_halen);
|
memset(he.sll_addr, -1, he.sll_halen);
|
||||||
|
|
||||||
if (!(cfg&quiet)) {
|
if (!(cfg & quiet)) {
|
||||||
printf("ARPING to %s from %s via %s\n",
|
printf("ARPING to %s from %s via %s\n",
|
||||||
inet_ntoa(dst), inet_ntoa(src),
|
inet_ntoa(dst), inet_ntoa(src),
|
||||||
device ? device : "unknown");
|
device ? device : "unknown");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!src.s_addr && !(cfg&dad)) {
|
if (!src.s_addr && !(cfg & dad)) {
|
||||||
bb_error_msg_and_die("no src address in the non-DAD mode");
|
bb_error_msg_and_die("no src address in the non-DAD mode");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -430,8 +403,8 @@ int arping_main(int argc, char **argv)
|
|||||||
socklen_t alen = sizeof(from);
|
socklen_t alen = sizeof(from);
|
||||||
int cc;
|
int cc;
|
||||||
|
|
||||||
if ((cc = recvfrom(s, packet, 4096, 0,
|
cc = recvfrom(s, packet, 4096, 0, (struct sockaddr *) &from, &alen);
|
||||||
(struct sockaddr *) &from, &alen)) < 0) {
|
if (cc < 0) {
|
||||||
bb_perror_msg("recvfrom");
|
bb_perror_msg("recvfrom");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -12,10 +12,6 @@
|
|||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <net/if_packet.h>
|
#include <net/if_packet.h>
|
||||||
#include <netpacket/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_addr = *(struct in_addr *) *hostinfo->h_addr_list;
|
||||||
address.sin_port = bb_lookup_port(argv[1], "tcp", 0);
|
address.sin_port = bb_lookup_port(argv[1], "tcp", 0);
|
||||||
|
|
||||||
if (connect(sfd, (struct sockaddr *) &address, sizeof(address)) < 0)
|
xconnect(sfd, (struct sockaddr *) &address, sizeof(address));
|
||||||
bb_perror_msg_and_die("connect");
|
|
||||||
cfd = sfd;
|
cfd = sfd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user