michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: tools: Allow user to set the source address for dtls-client

Browse source 
User can set the source IP address of the sent network packet
in dtls-client by using -b command line option. This helps if
the -i option picks up wrong address from network interface.

Change-Id: I8c26f1a14de2394085dea1d6008eb758a5ce7ad1
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2015-10-12 12:11:47 +03:00 • committed by Anas Nashif
commit dd71984334
2 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ip/tools/README
View file

@ -132,7 +132,7 @@ Example:
$ make TINYDTLS=/home/user/tinydtls-0.8.2 dtls-client
$ ./dtls-client 2001:db8::2
$ ./dtls-client -b 2001:db8::1 2001:db8::2
dtls-server

62
net/ip/tools/dtls-client.c
View file

@ -683,13 +683,14 @@ int main(int argc, char**argv)
struct sockaddr *addr_send, *addr_recv;
int family, addr_len;
const struct in6_addr any = IN6ADDR_ANY_INIT;
const char *target = NULL, *interface = NULL;
const char *target = NULL, *interface = NULL, *source = NULL;
fd_set rfds;
struct timeval tv = {};
int ifindex = -1, on, port;
void *address = NULL;
session_t dst;
struct client_data user_data;
char addr_buf[INET6_ADDRSTRLEN];
#ifdef DTLS_PSK
psk_id_length = strlen(PSK_DEFAULT_IDENTITY);
@ -700,8 +701,11 @@ int main(int argc, char**argv)
opterr = 0;
while ((c = getopt(argc, argv, "i:Dr")) != -1) {
while ((c = getopt(argc, argv, "b:i:Dr")) != -1) {
switch (c) {
case 'b':
source = optarg;
break;
case 'i':
interface = optarg;
break;
@ -724,9 +728,10 @@ int main(int argc, char**argv)
if (!target) {
printf("usage: %s [-i tun0] [-D] [-r] <IPv{6|4} address of the dtls-server>\n",
argv[0]);
printf("\n-i Use this network interface.\n");
printf("\n-r Renegoating keys once during the test run.\n");
printf("\n-D Activate debugging.\n");
printf("-i Use this network interface.\n");
printf("-r Renegoating keys once during the test run.\n");
printf("-D Activate debugging.\n");
printf("-b Bind to this IP address when sending data.\n");
exit(-EINVAL);
}
@ -739,22 +744,48 @@ int main(int argc, char**argv)
addr_recv = (struct sockaddr *)&addr4_recv;
addr4_send.sin_port = port = htons(SERVER_PORT);
addr4_recv.sin_family = AF_INET;
addr4_recv.sin_addr.s_addr = INADDR_ANY;
addr4_recv.sin_port = htons(CLIENT_PORT);
family = AF_INET;
addr_len = sizeof(addr4_send);
address = &addr4_recv.sin_addr;
if (source) {
if (inet_pton(AF_INET, source,
&addr4_recv.sin_addr) != 1) {
printf("Invalid address family for "
"source IPv4 address\n");
exit(-EINVAL);
}
printf("Binding to %s\n",
inet_ntop(family, address,
addr_buf, sizeof(addr_buf)));
} else
addr4_recv.sin_addr.s_addr = INADDR_ANY;
}
} else {
addr_send = (struct sockaddr *)&addr6_send;
addr_recv = (struct sockaddr *)&addr6_recv;
addr6_send.sin6_port = port = htons(SERVER_PORT);
addr6_recv.sin6_family = AF_INET6;
addr6_recv.sin6_addr = any;
addr6_recv.sin6_port = htons(CLIENT_PORT);
family = AF_INET6;
addr_len = sizeof(addr6_send);
address = &addr6_recv.sin6_addr;
if (source) {
if (inet_pton(AF_INET6, source,
&addr6_recv.sin6_addr) != 1) {
printf("Invalid address family for "
"source IPv6 address\n");
exit(-EINVAL);
}
printf("Binding to %s\n", inet_ntop(family, address,
addr_buf, sizeof(addr_buf)));
} else
addr6_recv.sin6_addr = any;
}
addr_send->sa_family = family;
@ -768,7 +799,6 @@ int main(int argc, char**argv)
if (interface) {
struct ifreq ifr;
char addr_buf[INET6_ADDRSTRLEN];
memset(&ifr, 0, sizeof(ifr));
snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), interface);
@ -779,16 +809,18 @@ int main(int argc, char**argv)
exit(-errno);
}
ifindex = get_ifindex(interface);
if (ifindex < 0) {
printf("Invalid interface %s\n", interface);
exit(-EINVAL);
}
if (!source) {
ifindex = get_ifindex(interface);
if (ifindex < 0) {
printf("Invalid interface %s\n", interface);
exit(-EINVAL);
}
get_address(ifindex, family, address);
get_address(ifindex, family, address);
printf("Binding to %s\n", inet_ntop(family, address,
printf("Binding to %s\n", inet_ntop(family, address,
addr_buf, sizeof(addr_buf)));
}
}
ret = bind(fd, addr_recv, addr_len);