Skip to content

Commit b95e108

Browse files
committed
iperf: compatible work with no IPv4
We possible want to use iperf to test rpmsg socket etc. Signed-off-by: buxiasen <[email protected]>
1 parent 5c40e52 commit b95e108

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

netutils/iperf/iperf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,15 @@ static void iperf_print_addr(FAR const char *str, FAR struct sockaddr *addr)
220220
{
221221
switch (addr->sa_family)
222222
{
223+
#ifdef CONFIG_NET_IPv4
223224
case AF_INET:
224225
{
225226
FAR struct sockaddr_in *inaddr = (FAR struct sockaddr_in *)addr;
226227
printf("%s: %s:%d\n", str,
227228
inet_ntoa(inaddr->sin_addr), htons(inaddr->sin_port));
228229
return;
229230
}
231+
#endif
230232

231233
case AF_LOCAL:
232234
{

netutils/iperf/iperf_main.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ int main(int argc, FAR char *argv[])
140140
struct iperf_cfg_t cfg;
141141
struct in_addr addr;
142142
int nerrors;
143+
144+
#ifdef CONFIG_NET_IPv4
143145
char inetaddr[INET_ADDRSTRLEN];
146+
#endif
144147

145148
bzero(&addr, sizeof(struct in_addr));
146149
bzero(&cfg, sizeof(cfg));
@@ -226,6 +229,7 @@ int main(int argc, FAR char *argv[])
226229
}
227230
else
228231
{
232+
#ifdef CONFIG_NET_IPv4
229233
if (iperf_args.bind->count > 0)
230234
{
231235
addr.s_addr = inet_addr(iperf_args.bind->sval[0]);
@@ -248,6 +252,10 @@ int main(int argc, FAR char *argv[])
248252
printf(" IP: %s\n", inet_ntoa_r(addr, inetaddr, sizeof(inetaddr)));
249253

250254
cfg.sip = addr.s_addr;
255+
#else
256+
printf("ERROR: IPv4 Not Enabled\n");
257+
goto out;
258+
#endif
251259
}
252260

253261
if (iperf_args.udp->count == 0)

0 commit comments

Comments
 (0)