clones/mtr
1
0
Fork 0
mirror of https://github.com/traviscross/mtr.git synced 2024-09-21 10:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #274 from commonism/udp_checksum

Browse Source 
udp checksum is incorrect
This commit is contained in:
Roger Wolff 2019-07-28 16:46:02 +02:00 committed by GitHub
commit 9fed81ee89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 251 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -98,7 +98,8 @@ mtr_packet_SOURCES = \
packet/probe.c packet/probe.h \
packet/protocols.h \
packet/timeval.c packet/timeval.h \
packet/wait.h
packet/wait.h \
packet/sockaddr.c packet/sockaddr.h
mtr_packet_LDADD = $(CAP_LIBS)

13
configure.ac
View File

@ -110,7 +110,7 @@ AS_IF([test "x$with_ncurses" = "xyes"],
])
AM_CONDITIONAL([WITH_CURSES], [test "x$with_ncurses" = xyes])
AC_CHECK_LIB([cap], [cap_set_proc], [],
AC_CHECK_LIB([cap], [cap_set_proc], [have_cap="yes"],
AS_IF([test "$host_os" = linux-gnu],
AC_MSG_WARN([Capabilities support is strongly recommended for increased security. See SECURITY for more information.])))
@ -243,7 +243,16 @@ AC_ARG_ENABLE([bash-completion],
[], [enable_bash_completion=yes]
)
AM_CONDITIONAL([BUILD_BASH_COMPLETION], [test "x$enable_bash_completion" = xyes])
echo "build options:"
echo "--------------"
echo "ipv6 :$USES_IPV6"
echo "ipinfo :$with_ipinfo"
echo "ncurses :$with_ncurses"
echo "gtk :$with_gtk"
echo "cap :$have_cap"
echo "libs :$LIBS"
echo "cflags :$CFLAGS"
echo "--------------"
# Prepare config.h, Makefile, and output them.
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile])

141
packet/construct_unix.c
View File

@ -25,6 +25,7 @@
#include <unistd.h>
#include "protocols.h"
#include "sockaddr.h"
/* For Mac OS X and FreeBSD */
#ifndef SOL_IP
@ -90,33 +91,20 @@ void construct_addr_port(
const struct sockaddr_storage *addr,
int port)
{
struct sockaddr_in *addr4;
struct sockaddr_in6 *addr6;
memcpy(addr_with_port, addr, sizeof(struct sockaddr_storage));
if (addr->ss_family == AF_INET6) {
addr6 = (struct sockaddr_in6 *) addr_with_port;
addr6->sin6_port = htons(port);
} else {
addr4 = (struct sockaddr_in *) addr_with_port;
addr4->sin_port = htons(port);
}
*sockaddr_port_offset(addr_with_port) = htons(port);
}
/* Construct a header for IP version 4 */
static
void construct_ip4_header(
const struct net_state_t *net_state,
const struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct sockaddr_storage *srcaddr,
const struct sockaddr_storage *destaddr,
const struct probe_param_t *param)
{
struct IPHeader *ip;
struct sockaddr_in *srcaddr4 = (struct sockaddr_in *) srcaddr;
struct sockaddr_in *destaddr4 = (struct sockaddr_in *) destaddr;
ip = (struct IPHeader *) &packet_buffer[0];
@ -127,15 +115,20 @@ void construct_ip4_header(
ip->len = length_byte_swap(net_state, packet_size);
ip->ttl = param->ttl;
ip->protocol = param->protocol;
memcpy(&ip->saddr, &srcaddr4->sin_addr, sizeof(uint32_t));
memcpy(&ip->daddr, &destaddr4->sin_addr, sizeof(uint32_t));
// ip->id = htons(getpid());
memcpy(&ip->saddr,
sockaddr_addr_offset(&probe->local_addr),
sockaddr_addr_size(&probe->local_addr));
memcpy(&ip->daddr,
sockaddr_addr_offset(&probe->remote_addr),
sockaddr_addr_size(&probe->remote_addr));
}
/* Construct an ICMP header for IPv4 */
static
void construct_icmp4_header(
const struct net_state_t *net_state,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct probe_param_t *param)
@ -155,7 +148,7 @@ void construct_icmp4_header(
icmp->type = ICMP_ECHO;
icmp->id = htons(getpid());
icmp->sequence = htons(sequence);
icmp->sequence = htons(probe->sequence);
icmp->checksum = htons(compute_checksum(icmp, icmp_size));
}
@ -163,7 +156,7 @@ void construct_icmp4_header(
static
int construct_icmp6_packet(
const struct net_state_t *net_state,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct probe_param_t *param)
@ -176,7 +169,7 @@ int construct_icmp6_packet(
icmp->type = ICMP6_ECHO;
icmp->id = htons(getpid());
icmp->sequence = htons(sequence);
icmp->sequence = htons(probe->sequence);
return 0;
}
@ -193,7 +186,7 @@ int construct_icmp6_packet(
static
void set_udp_ports(
struct UDPHeader *udp,
int sequence,
struct probe_t *probe,
const struct probe_param_t *param)
{
if (param->dest_port) {
@ -201,13 +194,13 @@ void set_udp_ports(
if (param->local_port) {
udp->srcport = htons(param->local_port);
udp->checksum = htons(sequence);
udp->checksum = htons(probe->sequence);
} else {
udp->srcport = htons(sequence);
udp->srcport = htons(probe->sequence);
udp->checksum = 0;
}
} else {
udp->dstport = htons(sequence);
udp->dstport = htons(probe->sequence);
if (param->local_port) {
udp->srcport = htons(param->local_port);
@ -217,6 +210,27 @@ void set_udp_ports(
udp->checksum = 0;
}
*sockaddr_port_offset(&probe->local_addr) = udp->srcport;
*sockaddr_port_offset(&probe->remote_addr) = udp->dstport;
}
/* Prepend pseudoheader to the udp datagram and calculate checksum */
static
int udp4_checksum(void *pheader, void *udata, int psize, int dsize,
int alt_checksum)
{
unsigned int totalsize = psize + dsize;
unsigned char csumpacket[totalsize];
memcpy(csumpacket, pheader, psize); /* pseudo header */
memcpy(csumpacket+psize, udata, dsize); /* udp header & payload */
if (alt_checksum && dsize >= sizeof(struct UDPHeader) + 2) {
csumpacket[psize + sizeof(struct UDPHeader)] = 0;
csumpacket[psize + sizeof(struct UDPHeader) + 1] = 0;
}
return compute_checksum(csumpacket, totalsize);
}
/*
@ -226,7 +240,7 @@ void set_udp_ports(
static
void construct_udp4_header(
const struct net_state_t *net_state,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct probe_param_t *param)
@ -244,15 +258,38 @@ void construct_udp4_header(
memset(udp, 0, sizeof(struct UDPHeader));
set_udp_ports(udp, sequence, param);
set_udp_ports(udp, probe, param);
udp->length = htons(udp_size);
/* calculate udp checksum */
struct UDPPseudoHeader udph = {
.saddr = *(uint32_t *)sockaddr_addr_offset(&probe->local_addr),
.daddr = *(uint32_t *)sockaddr_addr_offset(&probe->remote_addr),
.zero = 0,
.protocol = 17,
.len = udp->length
};
/* get position to write checksum */
uint16_t *checksum_off = &udp->checksum;
if (udp->checksum != 0)
{ /* checksum is sequence number - correct the payload to match the checksum
checksum_off is udp payload */
checksum_off = (uint16_t *)&packet_buffer[packet_size -
udp_size +
sizeof(struct UDPHeader)];
}
*checksum_off = htons(udp4_checksum(&udph, udp,
sizeof(struct UDPPseudoHeader),
udp_size, udp->checksum != 0));
}
/* Construct a header for UDPv6 probes */
static
int construct_udp6_packet(
const struct net_state_t *net_state,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct probe_param_t *param)
@ -266,7 +303,7 @@ int construct_udp6_packet(
memset(udp, 0, sizeof(struct UDPHeader));
set_udp_ports(udp, sequence, param);
set_udp_ports(udp, probe, param);
udp->length = htons(udp_size);
if (net_state->platform.ip6_socket_raw) {
@ -503,11 +540,9 @@ static
int construct_ip4_packet(
const struct net_state_t *net_state,
int *packet_socket,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct sockaddr_storage *src_sockaddr,
const struct sockaddr_storage *dest_sockaddr,
const struct probe_param_t *param)
{
int send_socket = net_state->platform.ip4_send_socket;
@ -525,14 +560,14 @@ int construct_ip4_packet(
#endif
} else {
if (net_state->platform.ip4_socket_raw) {
construct_ip4_header(net_state, packet_buffer, packet_size,
src_sockaddr, dest_sockaddr, param);
construct_ip4_header(net_state, probe, packet_buffer, packet_size,
param);
}
if (param->protocol == IPPROTO_ICMP) {
construct_icmp4_header(net_state, sequence, packet_buffer,
construct_icmp4_header(net_state, probe, packet_buffer,
packet_size, param);
} else if (param->protocol == IPPROTO_UDP) {
construct_udp4_header(net_state, sequence, packet_buffer,
construct_udp4_header(net_state, probe, packet_buffer,
packet_size, param);
} else {
errno = EINVAL;
@ -542,8 +577,8 @@ int construct_ip4_packet(
if (is_stream_protocol) {
send_socket =
open_stream_socket(net_state, param->protocol, sequence,
src_sockaddr, dest_sockaddr, param);
open_stream_socket(net_state, param->protocol, probe->sequence,
&probe->local_addr, &probe->remote_addr, param);
if (send_socket == -1) {
return -1;
@ -596,7 +631,7 @@ int construct_ip4_packet(
}
/* Bind to our local address */
if (bind_send_socket && bind(socket, (struct sockaddr *)src_sockaddr,
if (bind_send_socket && bind(socket, (struct sockaddr *)&probe->local_addr,
sizeof(struct sockaddr_in))) {
return -1;
}
@ -629,11 +664,9 @@ static
int construct_ip6_packet(
const struct net_state_t *net_state,
int *packet_socket,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_size,
const struct sockaddr_storage *src_sockaddr,
const struct sockaddr_storage *dest_sockaddr,
const struct probe_param_t *param)
{
int send_socket;
@ -656,7 +689,7 @@ int construct_ip6_packet(
}
if (construct_icmp6_packet
(net_state, sequence, packet_buffer, packet_size, param)) {
(net_state, probe, packet_buffer, packet_size, param)) {
return -1;
}
} else if (param->protocol == IPPROTO_UDP) {
@ -667,7 +700,7 @@ int construct_ip6_packet(
}
if (construct_udp6_packet
(net_state, sequence, packet_buffer, packet_size, param)) {
(net_state, probe, packet_buffer, packet_size, param)) {
return -1;
}
} else {
@ -677,8 +710,8 @@ int construct_ip6_packet(
if (is_stream_protocol) {
send_socket =
open_stream_socket(net_state, param->protocol, sequence,
src_sockaddr, dest_sockaddr, param);
open_stream_socket(net_state, param->protocol, probe->sequence,
&probe->local_addr, &probe->remote_addr, param);
if (send_socket == -1) {
return -1;
@ -702,7 +735,7 @@ int construct_ip6_packet(
if (net_state->platform.ip6_socket_raw) {
if (memcmp(&current_sockaddr,
src_sockaddr, sizeof(struct sockaddr_in6)) == 0) {
&probe->local_addr, sizeof(struct sockaddr_in6)) == 0) {
bind_send_socket = false;
}
} else {
@ -715,7 +748,7 @@ int construct_ip6_packet(
/* Bind to our local address */
if (bind_send_socket) {
if (bind(send_socket, (struct sockaddr *) src_sockaddr,
if (bind(send_socket, (struct sockaddr *) &probe->local_addr,
sizeof(struct sockaddr_in6))) {
return -1;
}
@ -749,11 +782,9 @@ int construct_ip6_packet(
int construct_packet(
const struct net_state_t *net_state,
int *packet_socket,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_buffer_size,
const struct sockaddr_storage *dest_sockaddr,
const struct sockaddr_storage *src_sockaddr,
const struct probe_param_t *param)
{
int packet_size;
@ -771,15 +802,15 @@ int construct_packet(
memset(packet_buffer, param->bit_pattern, packet_size);
if (param->ip_version == 6) {
if (construct_ip6_packet(net_state, packet_socket, sequence,
if (construct_ip6_packet(net_state, packet_socket, probe,
packet_buffer, packet_size,
src_sockaddr, dest_sockaddr, param)) {
param)) {
return -1;
}
} else if (param->ip_version == 4) {
if (construct_ip4_packet(net_state, packet_socket, sequence,
if (construct_ip4_packet(net_state, packet_socket, probe,
packet_buffer, packet_size,
src_sockaddr, dest_sockaddr, param)) {
param)) {
return -1;
}
} else {

4
packet/construct_unix.h
View File

@ -24,11 +24,9 @@
int construct_packet(
const struct net_state_t *net_state,
int *packet_socket,
int sequence,
struct probe_t *probe,
char *packet_buffer,
int packet_buffer_size,
const struct sockaddr_storage *dest_sockaddr,
const struct sockaddr_storage *src_sockaddr,
const struct probe_param_t *param);
#endif

50
packet/deconstruct_unix.c
View File

@ -23,6 +23,7 @@
#include <string.h>
#include "protocols.h"
#include "sockaddr.h"
#define MAX_MPLS_LABELS 8
@ -64,6 +65,8 @@ void handle_inner_udp_packet(
struct net_state_t *net_state,
const struct sockaddr_storage *remote_addr,
int icmp_result,
int af,
const void *ip,
const struct UDPHeader *udp,
int udp_length,
struct timeval *timestamp,
@ -79,11 +82,46 @@ void handle_inner_udp_packet(
if (probe == NULL) {
probe = find_probe(net_state, IPPROTO_UDP, 0, udp->checksum);
}
if (probe == NULL)
return;
if (probe != NULL) {
receive_probe(net_state, probe, icmp_result,
remote_addr, timestamp, mpls_count, mpls);
if (probe->remote_addr.ss_family != remote_addr->ss_family)
return;
if (udp->dstport != *sockaddr_port_offset(&probe->remote_addr) )
return;
if (udp->srcport != *sockaddr_port_offset(&probe->local_addr) )
return;
void *saddr, *daddr;
if (af == AF_INET)
{
saddr = &((struct IPHeader *)ip)->saddr;
daddr = &((struct IPHeader *)ip)->daddr;
}else
if (af == AF_INET6)
{
daddr = &((struct IP6Header *)ip)->daddr;
saddr = &((struct IP6Header *)ip)->saddr;
}else
{
return;
}
if( memcmp(sockaddr_addr_offset(&probe->remote_addr),
daddr,
sockaddr_addr_size(&probe->remote_addr)) != 0 )
return;
if( memcmp(sockaddr_addr_offset(&probe->local_addr),
saddr,
sockaddr_addr_size(&probe->local_addr)) != 0)
return;
/* probe is not null */
receive_probe(net_state, probe, icmp_result,
remote_addr, timestamp, mpls_count, mpls);
}
void handle_error_queue_packet(
@ -96,7 +134,7 @@ void handle_error_queue_packet(
struct timeval *timestamp)
{
if (proto == IPPROTO_UDP) {
handle_inner_udp_packet(net_state, remote_addr, ICMP_TIME_EXCEEDED,
handle_inner_udp_packet(net_state, remote_addr, ICMP_TIME_EXCEEDED, 0, NULL,
(struct UDPHeader *)packet, packet_length, timestamp, 0, NULL);
} else if (proto == IPPROTO_ICMP || proto == IPPROTO_ICMPV6) {
const struct ICMPHeader *icmp = (struct ICMPHeader *)packet;
@ -157,7 +195,7 @@ void handle_inner_ip4_packet(
udp = (struct UDPHeader *) (ip + 1);
udp_length = packet_length - sizeof(struct IPHeader);
handle_inner_udp_packet(net_state, remote_addr, icmp_result, udp,
handle_inner_udp_packet(net_state, remote_addr, icmp_result, AF_INET, ip, udp,
udp_length, timestamp, mpls_count, mpls);
} else if (ip->protocol == IPPROTO_TCP) {
if (packet_length < ip_tcp_size) {
@ -233,7 +271,7 @@ void handle_inner_ip6_packet(
udp = (struct UDPHeader *) (ip + 1);
udp_length = packet_length - sizeof(struct IP6Header);
handle_inner_udp_packet(net_state, remote_addr, icmp_result, udp,
handle_inner_udp_packet(net_state, remote_addr, icmp_result, AF_INET6, ip, udp,
udp_length, timestamp, mpls_count, mpls);
} else if (ip->protocol == IPPROTO_TCP) {
if (packet_length < ip_tcp_size) {

55
packet/probe.c
View File

@ -36,8 +36,7 @@
#include "platform.h"
#include "protocols.h"
#include "timeval.h"
#define IP_TEXT_LENGTH 64
#include "sockaddr.h"
/* Convert the destination address from text to sockaddr */
int decode_address_string(
@ -114,19 +113,9 @@ int resolve_probe_addresses(
}
/* DGRAM ICMP id is taken from src_port not from ICMP header */
if (param->protocol == IPPROTO_ICMP) {
if (src_sockaddr->ss_family == AF_INET) {
if (!net_state->platform.ip4_socket_raw) {
struct sockaddr_in *sin_src =
(struct sockaddr_in *) src_sockaddr;
sin_src->sin_port = htons(getpid());
}
} else if (src_sockaddr->ss_family == AF_INET6) {
if (!net_state->platform.ip6_socket_raw) {
struct sockaddr_in6 *sin6_src =
(struct sockaddr_in6 *) src_sockaddr;
sin6_src->sin6_port = htons(getpid());
}
}
if ( (src_sockaddr->ss_family == AF_INET && !net_state->platform.ip4_socket_raw) ||
(src_sockaddr->ss_family == AF_INET6 && !net_state->platform.ip6_socket_raw) )
*sockaddr_port_offset(src_sockaddr) = htons(getpid());
}
return 0;
@ -258,15 +247,12 @@ void respond_to_probe(
int mpls_count,
const struct mpls_label_t *mpls)
{
char ip_text[IP_TEXT_LENGTH];
char ip_text[INET6_ADDRSTRLEN];
char response[COMMAND_BUFFER_SIZE];
char mpls_str[COMMAND_BUFFER_SIZE];
int remaining_size;
const char *result;
const char *ip_argument;
struct sockaddr_in *sockaddr4;
struct sockaddr_in6 *sockaddr6;
void *addr;
if (icmp_type == ICMP_TIME_EXCEEDED) {
result = "ttl-expired";
@ -279,15 +265,11 @@ void respond_to_probe(
if (remote_addr->ss_family == AF_INET6) {
ip_argument = "ip-6";
sockaddr6 = (struct sockaddr_in6 *) remote_addr;
addr = &sockaddr6->sin6_addr;
} else {
ip_argument = "ip-4";
sockaddr4 = (struct sockaddr_in *) remote_addr;
addr = &sockaddr4->sin_addr;
}
if (inet_ntop(remote_addr->ss_family, addr, ip_text, IP_TEXT_LENGTH) ==
if (inet_ntop(remote_addr->ss_family, sockaddr_addr_offset(remote_addr), ip_text, INET6_ADDRSTRLEN) ==
NULL) {
error(EXIT_FAILURE, errno, "inet_ntop failure");
}
@ -328,8 +310,6 @@ int find_source_addr(
{
int sock;
int len;
struct sockaddr_in *destaddr4;
struct sockaddr_in6 *destaddr6;
struct sockaddr_storage dest_with_port;
struct sockaddr_in *srcaddr4;
struct sockaddr_in6 *srcaddr6;
@ -342,17 +322,8 @@ int find_source_addr(
the connect will fail. We aren't actually sending
anything to the port.
*/
if (destaddr->ss_family == AF_INET6) {
destaddr6 = (struct sockaddr_in6 *) &dest_with_port;
destaddr6->sin6_port = htons(1);
len = sizeof(struct sockaddr_in6);
} else {
destaddr4 = (struct sockaddr_in *) &dest_with_port;
destaddr4->sin_port = htons(1);
len = sizeof(struct sockaddr_in);
}
*sockaddr_port_offset(&dest_with_port) = htons(1);
len = sockaddr_addr_size(&dest_with_port);
sock = socket(destaddr->ss_family, SOCK_DGRAM, IPPROTO_UDP);
if (sock == -1) {
@ -393,15 +364,7 @@ int find_source_addr(
Zero the port, as we may later use this address to finding, and
we don't want to use the port from the socket we just created.
*/
if (destaddr->ss_family == AF_INET6) {
srcaddr6 = (struct sockaddr_in6 *) srcaddr;
srcaddr6->sin6_port = 0;
} else {
srcaddr4 = (struct sockaddr_in *) srcaddr;
srcaddr4->sin_port = 0;
}
*sockaddr_port_offset(&srcaddr) = 0;
return 0;
}

4
packet/probe.h
View File

@ -104,6 +104,10 @@ struct probe_t {
/* The address being probed */
struct sockaddr_storage remote_addr;
/* The local address which was used */
struct sockaddr_storage local_addr;
/* Platform specific probe tracking */
struct probe_platform_t platform;
};

42
packet/probe_unix.c
View File

@ -37,6 +37,7 @@
#include "platform.h"
#include "protocols.h"
#include "sockaddr.h"
#include "construct_unix.h"
#include "deconstruct_unix.h"
#include "timeval.h"
@ -67,13 +68,11 @@ int send_packet(
if (net_state->platform.ip6_socket_raw) {
send_socket = net_state->platform.udp6_send_socket;
} else {
struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)sockaddr;
send_socket = net_state->platform.ip6_txrx_udp_socket;
if (param->dest_port) {
addr_in6->sin6_port = htons(param->dest_port);
*sockaddr_port_offset(sockaddr) = htons(param->dest_port);
} else {
addr_in6->sin6_port = sequence;
*sockaddr_port_offset(sockaddr) = sequence;
}
}
}
@ -90,13 +89,11 @@ int send_packet(
send_socket = net_state->platform.ip4_txrx_icmp_socket;
}
} else if (param->protocol == IPPROTO_UDP) {
struct sockaddr_in *addr_in = (struct sockaddr_in *)sockaddr;
send_socket = net_state->platform.ip4_txrx_udp_socket;
if (param->dest_port) {
addr_in->sin_port = htons(param->dest_port);
*sockaddr_port_offset(sockaddr) = htons(param->dest_port);
} else {
addr_in->sin_port = sequence;
*sockaddr_port_offset(sockaddr) = sequence;
}
}
}
@ -128,8 +125,7 @@ void check_length_order(
{
char packet[PACKET_BUFFER_SIZE];
struct probe_param_t param;
struct sockaddr_storage dest_sockaddr;
struct sockaddr_storage src_sockaddr;
struct probe_t p0 = {.sequence = MIN_PORT };
ssize_t bytes_sent;
int packet_size;
@ -146,8 +142,9 @@ void check_length_order(
param.remote_address = "127.0.0.1";
param.is_probing_byte_order = true;
if (resolve_probe_addresses(net_state, &param, &dest_sockaddr,
&src_sockaddr)) {
if (resolve_probe_addresses(net_state, &param, &p0.remote_addr,
&p0.local_addr)) {
fprintf(stderr, "Error decoding localhost address\n");
exit(EXIT_FAILURE);
}
@ -155,16 +152,16 @@ void check_length_order(
/* First attempt to ping the localhost with network byte order */
net_state->platform.ip_length_host_order = false;
packet_size = construct_packet(net_state, NULL, MIN_PORT,
packet_size = construct_packet(net_state, NULL, &p0,
packet, PACKET_BUFFER_SIZE,
&dest_sockaddr, &src_sockaddr, &param);
&param);
if (packet_size < 0) {
error(EXIT_FAILURE, errno, "Unable to send to localhost");
}
bytes_sent =
send_packet(net_state, &param, MIN_PORT, packet, packet_size,
&dest_sockaddr);
&p0.remote_addr);
if (bytes_sent > 0) {
return;
}
@ -172,16 +169,16 @@ void check_length_order(
/* Since network byte order failed, try host byte order */
net_state->platform.ip_length_host_order = true;
packet_size = construct_packet(net_state, NULL, MIN_PORT,
packet_size = construct_packet(net_state, NULL, &p0,
packet, PACKET_BUFFER_SIZE,
&dest_sockaddr, &src_sockaddr, &param);
&param);
if (packet_size < 0) {
error(EXIT_FAILURE, errno, "Unable to send to localhost");
}
bytes_sent =
send_packet(net_state, &param, MIN_PORT, packet, packet_size,
&dest_sockaddr);
&p0.remote_addr);
if (bytes_sent < 0) {
error(EXIT_FAILURE, errno, "Unable to send with swapped length");
}
@ -549,7 +546,6 @@ void send_probe(
{
char packet[PACKET_BUFFER_SIZE];
struct probe_t *probe;
struct sockaddr_storage src_sockaddr;
int trytimes;
int packet_size;
@ -560,7 +556,7 @@ void send_probe(
}
if (resolve_probe_addresses(net_state, param, &probe->remote_addr,
&src_sockaddr)) {
&probe->local_addr)) {
printf("%d invalid-argument\n", param->command_token);
free_probe(net_state, probe);
return;
@ -576,9 +572,9 @@ void send_probe(
for (trytimes=MIN_PORT; trytimes < MAX_PORT; trytimes++) {
packet_size = construct_packet(net_state, &probe->platform.socket,
probe->sequence, packet, PACKET_BUFFER_SIZE,
&probe->remote_addr, &src_sockaddr, param);
probe, packet, PACKET_BUFFER_SIZE,
param);
if (packet_size > 0) break; // no retry if we succeed.
if ((param->protocol != IPPROTO_TCP) &&

69
packet/sockaddr.c Normal file
View File

@ -0,0 +1,69 @@
#include <stddef.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
void *sockaddr_addr_offset(const void *x)
{
if( x == NULL )
return NULL;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return ((void *)(x) + offsetof(struct sockaddr_in, sin_addr));
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return ((void *)(x) + offsetof(struct sockaddr_in6, sin6_addr));
}
return NULL;
}
unsigned int sockaddr_addr_size(const void *x)
{
if( x == NULL )
return 0;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return sizeof(struct in_addr);
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return sizeof(struct in6_addr);
}
return 0;
}
unsigned int sockaddr_size(const void *x)
{
if( x == NULL )
return 0;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return sizeof(struct sockaddr_in);
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return sizeof(struct sockaddr_in6);
}
return 0;
}
in_port_t *sockaddr_port_offset(const void *x)
{
if( x == NULL )
return NULL;
if( ((struct sockaddr *)(x))->sa_family == AF_INET )
{
return ((void *)(x) + offsetof(struct sockaddr_in, sin_port));
}else
if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
{
return ((void *)(x) + offsetof(struct sockaddr_in6, sin6_port));
}
return NULL;
}

6
packet/sockaddr.h Normal file
View File

@ -0,0 +1,6 @@
unsigned int sockaddr_size(const void *x);
void *sockaddr_addr_offset(const void *x);
unsigned int sockaddr_addr_size(const void *x);
in_port_t *sockaddr_port_offset(const void *x);