From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1136654-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E577C138346
for <garchives@archives.gentoo.org>; Wed, 8 Jan 2020 08:18:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F2DBCE085A;
Wed, 8 Jan 2020 08:18:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CAACAE085A
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Jan 2020 08:18:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BB7BD34DEB9
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Jan 2020 08:18:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 64D6C37
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Jan 2020 08:18:25 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1578471503.736680b96c87f1c12b91b0f010b7ce569a96dc1a.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ethloop/files/, net-analyzer/ethloop/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/ethloop/ethloop-10-r4.ebuild net-analyzer/ethloop/files/ethloop-10-misc.patch
X-VCS-Directories: net-analyzer/ethloop/ net-analyzer/ethloop/files/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 736680b96c87f1c12b91b0f010b7ce569a96dc1a
X-VCS-Branch: master
Date: Wed, 8 Jan 2020 08:18:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 319c32bd-1605-4efe-8b86-a54ac8a5be41
X-Archives-Hash: 988dbae8644a8d7cfb28f43f57244500
commit: 736680b96c87f1c12b91b0f010b7ce569a96dc1a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 8 08:16:36 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 08:18:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736680b9
net-analyzer/ethloop: EAPI=7, fix more compiler warnings
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/ethloop/ethloop-10-r4.ebuild | 27 ++++++++++
net-analyzer/ethloop/files/ethloop-10-misc.patch | 65 ++++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/net-analyzer/ethloop/ethloop-10-r4.ebuild b/net-analyzer/ethloop/ethloop-10-r4.ebuild
new file mode 100644
index 00000000000..4067bea8c94
--- /dev/null
+++ b/net-analyzer/ethloop/ethloop-10-r4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Local simulator for testing Linux QoS disciplines"
+HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
+SRC_URI="http://luxik.cdi.cz/~devik/qos/${PN}/${PN}${PV}.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}
+PATCHES=(
+ "${FILESDIR}"/${P}-misc.patch
+)
+
+src_compile() {
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dosbin ethloop
+}
diff --git a/net-analyzer/ethloop/files/ethloop-10-misc.patch b/net-analyzer/ethloop/files/ethloop-10-misc.patch
new file mode 100644
index 00000000000..a866386a700
--- /dev/null
+++ b/net-analyzer/ethloop/files/ethloop-10-misc.patch
@@ -0,0 +1,65 @@
+--- a/ethloop.c
++++ b/ethloop.c
+@@ -1,5 +1,7 @@
+ /* vim: cin sw=4 ts=4
+ */
++#include <arpa/inet.h> /* htons() */
++#include <sys/types.h> /* recv() */
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <sys/poll.h>
+@@ -13,6 +15,7 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <string.h>
+
+ int sock;
+
+@@ -133,11 +136,11 @@
+ int recv_raw(int tmo)
+ {
+ struct pollfd pf = {sock,POLLIN,0};
+- int r; unsigned short proto;
++ ssize_t r;
+ if(poll(&pf,1,tmo) <= 0) return 0;
+- r = recv(sock,&buf,1550,0);
++ r = recv(sock,&buf,sizeof(buf),0);
+ if (r <= 0) {
+- printf("error recv (%d)\n",r);
++ printf("error recv (%ld)\n",r);
+ return 0;
+ }
+ if (ntohs(buf.proto) != ETH_P_CUST) {
+@@ -239,10 +242,10 @@
+ }
+ }
+
+-main(int c,char *av[])
++int main(int c,char *av[])
+ {
+- unsigned long av_k1=0,av_k2=0,t_k1=0,t_k2=0;
+- unsigned long av_k3=0,av_k4=0,t_k3=0,t_k4=0;
++ unsigned long av_k1=0,av_k2=0;
++ unsigned long av_k3=0,av_k4=0;
+ int x,tmo,flow,diff,lcheck = 0,lwrite = 0,i,n;
+ struct flowtab *fp;
+ sock = socket(PF_PACKET,SOCK_RAW,htons(ETH_P_ALL));
+@@ -309,7 +312,7 @@
+ /* write stats every .5 second */
+ if (us - ALIGN(lwrite,LOGTIME) < LOGTIME) continue;
+ lwrite = us;
+- fprintf(stderr,"store %d at %d ms\n",slog_cnt,us/1000);
++ fprintf(stderr,"store %d at %ld ms\n",slog_cnt,us/1000);
+ for (fp = ftab,i=0;i<FLOWS;fp++,i++) {
+ stp = slog + slog_cnt;
+ stp->av_delay[i] = fp->av_delay/EWMAC;
+@@ -338,7 +341,7 @@
+ printf("%d.%d",(i+1)/2,(i&1)?0:5);
+ for (flow = 0; flow <= maxflow; flow++) {
+ fp = ftab + flow;
+- printf(" %d %d %d %d",stp->av_wrate[flow],
++ printf(" %ld %ld %ld %ld",stp->av_wrate[flow],
+ stp->av_rate[flow], stp->av_delay[flow]/1000,
+ stp->av_jitter[flow]);
+ }