Skip to content

Commit

Permalink
Merge pull request #504 from appneta/Bug_#411_tap0_zephyr
Browse files Browse the repository at this point in the history
Bug #411 allow TAP on all platforms
  • Loading branch information
fklassen authored Oct 21, 2018
2 parents b73dfe7 + b5d5ae4 commit 96f588c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ AC_ARG_ENABLE(dynamic-link,
AC_MSG_ERROR([Cannot specify both --enable-dynamic-link and --enable-static-link])
fi
])

if test $static_link = yes; then
AC_DEFINE([ENABLE_STATIC_LINK], [1], [Use static libraries ( .a or .A.tbd )])
else
Expand Down Expand Up @@ -582,10 +583,11 @@ AC_ARG_ENABLE([tuntap],
linux*)
AC_CHECK_HEADER([linux/if_tun.h], [have_tuntap=yes])
;;
freebsd*)
*)
AC_CHECK_HEADER([net/if_tun.h], [have_tuntap=yes])
;;
esac])

if test $have_tuntap = yes ; then
AC_DEFINE([HAVE_TUNTAP], [1],
[Do we have TUNTAP device support?])
Expand Down
2 changes: 2 additions & 0 deletions docs/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
- CVE-2018-17580 heap-buffer-overflow fast_edit_packet (#485)
- CVE-2018-17582 heap-buffer-overflow in get_next_packet (#484)
- Out-of-tree build (#482)
- Fails to open tap0 on Zephyr (#411)
- CVE-2018-13112 heap-buffer-overflow in get_l2len (#477 dup #408)
- manpage typos (#413)
- Fix replay when using --with-testnic (#178)

01/18/2018 Version 4.3.0 beta1
- Travis CI build fails due to new build images (#432)
Expand Down
1 change: 1 addition & 0 deletions src/tcpreplay_opts.def
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ EOText;
flag = {
name = duration;
arg-type = number;
flags-must = loop;
max = 1;
arg-default = -1;
arg-range = "1->";
Expand Down

0 comments on commit 96f588c

Please sign in to comment.