Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change to actually alive netmap repo #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.13
- fixed compilation issues by fixing issues caused by modern GCC
warnings related to indentation issues
- removed deprecated SSL functional call and replaced with right one
- tested compiliation on current Debian 9.1/stretch system (Sept. 2017)
0.12
- finished proper README documenting all options

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12
0.13
2 changes: 1 addition & 1 deletion download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NM="netmap"
LU="libuinet"

if [ ! -d $NM ]; then
git clone https://github.com/fichtner/netmap
git clone https://github.com/luigirizzo/netmap
cd $NM
git checkout 32e06f9d18bf82e40a7c5b6e769c0ca7607913fc
cd $ORIGPATH
Expand Down
39 changes: 39 additions & 0 deletions libuinet.patch
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,19 @@ index 5fbede0..d7a4045 100644
int alias_len;
int error = 0;

diff --git a/lib/libuinet/uinet_host_interface.c b/lib/libuinet/uinet_host_interface.c
index d095625..4ccf7d8 100644
--- a/lib/libuinet/uinet_host_interface.c
+++ b/lib/libuinet/uinet_host_interface.c
@@ -1108,7 +1108,7 @@ uhi_arc4rand(void *ptr, unsigned int len, int reseed)

/* XXX assuming that we don't have to manually seed this */

- RAND_pseudo_bytes(ptr, len);
+ RAND_bytes(ptr, len);
#else
if (reseed)
arc4random_stir();
diff --git a/lib/libuinet/uinet_if_pcap.c b/lib/libuinet/uinet_if_pcap.c
index 18bed04..1483329 100644
--- a/lib/libuinet/uinet_if_pcap.c
Expand Down Expand Up @@ -453,3 +466,29 @@ index cccf75a..42a3b06 100644
INOUT void **cookiep;
};

diff --git a/lib/libuinet/uinet_if_bridge.c b/lib/libuinet/uinet_if_bridge.c
index c2bdb5c..7b68deb 100644
--- a/lib/libuinet/uinet_if_bridge.c
+++ b/lib/libuinet/uinet_if_bridge.c
@@ -200,7 +200,7 @@ if_bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
if_bridge_init(sc);
else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
if_bridge_stop(sc);
- break;
+ break;
default:
error = ether_ioctl(ifp, cmd, data);
break;
diff --git a/lib/libuinet/uinet_if_span.c b/lib/libuinet/uinet_if_span.c
index 4b28237..771e534 100644
--- a/lib/libuinet/uinet_if_span.c
+++ b/lib/libuinet/uinet_if_span.c
@@ -158,7 +158,7 @@ if_span_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
if_span_init(sc);
else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
if_span_stop(sc);
- break;
+ break;
default:
error = ether_ioctl(ifp, cmd, data);
break;
6 changes: 3 additions & 3 deletions time.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,15 @@ timestr_parse(const char * input, struct taia * res, struct taia * b)

switch (*p) {
case 'w':
if (d*h*m*s) return -1;
if ((d*h*m*s)!=0) return -1;
w = n*604800;
break;
case 'd':
if (h*m*s) return -1;
if ((h*m*s)!=0) return -1;
d = n*86400;
break;
case 'h':
if (m*s) return -1;
if ((m*s)!=0) return -1;
h = n*3600;
break;
case 'm':
Expand Down