From a107bcf34256d7cfecad34f40152da6010faec93 Mon Sep 17 00:00:00 2001 From: cbdbc Date: Tue, 31 Jan 2023 16:45:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20?= =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=97=D0=9E=D0=A1=D0=A0=D0=92=20=D0=9D=D0=B5=D0=B9=D1=82=D1=80?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=202020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 ++ common.mk | 18 ++++++++++++++++++ nto/Makefile | 2 ++ nto/aarch64/Makefile | 2 ++ nto/aarch64/o.le/Makefile | 1 + nto/arm/Makefile | 2 ++ nto/arm/o.le.v7/Makefile | 1 + nto/arm/o.le/Makefile | 1 + nto/e2k/Makefile | 2 ++ nto/e2k/o.le/Makefile | 1 + nto/mips/Makefile | 2 ++ nto/mips/o.be/Makefile | 1 + nto/mips/o.le.mc/Makefile | 1 + nto/mips/o.le/Makefile | 1 + nto/ppc/Makefile | 2 ++ nto/ppc/o.be.spe/Makefile | 1 + nto/ppc/o.be/Makefile | 1 + nto/x86/Makefile | 2 ++ nto/x86/o/Makefile | 1 + src/iperf_auth.c | 4 ++++ src/iperf_util.h | 3 +++ src/portable_endian.h | 3 +++ 22 files changed, 54 insertions(+) create mode 100644 Makefile create mode 100644 common.mk create mode 100644 nto/Makefile create mode 100644 nto/aarch64/Makefile create mode 100644 nto/aarch64/o.le/Makefile create mode 100644 nto/arm/Makefile create mode 100644 nto/arm/o.le.v7/Makefile create mode 100644 nto/arm/o.le/Makefile create mode 100644 nto/e2k/Makefile create mode 100644 nto/e2k/o.le/Makefile create mode 100644 nto/mips/Makefile create mode 100644 nto/mips/o.be/Makefile create mode 100644 nto/mips/o.le.mc/Makefile create mode 100644 nto/mips/o.le/Makefile create mode 100644 nto/ppc/Makefile create mode 100644 nto/ppc/o.be.spe/Makefile create mode 100644 nto/ppc/o.be/Makefile create mode 100644 nto/x86/Makefile create mode 100644 nto/x86/o/Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3beecfb --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +LIST=OS +include recurse.mk diff --git a/common.mk b/common.mk new file mode 100644 index 0000000..e49f3d4 --- /dev/null +++ b/common.mk @@ -0,0 +1,18 @@ +ifndef QCONFIG +QCONFIG=qconfig.mk +endif +include $(QCONFIG) + +CONFIGUREFLAGS += -C +CONFIGUREFLAGS += --prefix=/usr +#CONFIGUREFLAGS += --without-openssl +#CONFIGUREFLAGS += --disable-shared +CONFIGUREFLAGS += --with-openssl=$(USE_ROOT_$(OS))/usr + +CCFLAGS += -Dstrndup=BUF_strndup + +USEFILE=%1>%C --help +USETARGET=$(DESTDIR)/usr/bin/iperf3 + +include $(MKFILES_ROOT)/autotools.mk +include $(MKFILES_ROOT)/qtargets.mk diff --git a/nto/Makefile b/nto/Makefile new file mode 100644 index 0000000..074b0d5 --- /dev/null +++ b/nto/Makefile @@ -0,0 +1,2 @@ +LIST=CPU +include recurse.mk diff --git a/nto/aarch64/Makefile b/nto/aarch64/Makefile new file mode 100644 index 0000000..c95a666 --- /dev/null +++ b/nto/aarch64/Makefile @@ -0,0 +1,2 @@ +LIST=VARIANT +include recurse.mk diff --git a/nto/aarch64/o.le/Makefile b/nto/aarch64/o.le/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/aarch64/o.le/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/arm/Makefile b/nto/arm/Makefile new file mode 100644 index 0000000..c95a666 --- /dev/null +++ b/nto/arm/Makefile @@ -0,0 +1,2 @@ +LIST=VARIANT +include recurse.mk diff --git a/nto/arm/o.le.v7/Makefile b/nto/arm/o.le.v7/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/arm/o.le.v7/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/arm/o.le/Makefile b/nto/arm/o.le/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/arm/o.le/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/e2k/Makefile b/nto/e2k/Makefile new file mode 100644 index 0000000..c95a666 --- /dev/null +++ b/nto/e2k/Makefile @@ -0,0 +1,2 @@ +LIST=VARIANT +include recurse.mk diff --git a/nto/e2k/o.le/Makefile b/nto/e2k/o.le/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/e2k/o.le/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/mips/Makefile b/nto/mips/Makefile new file mode 100644 index 0000000..c95a666 --- /dev/null +++ b/nto/mips/Makefile @@ -0,0 +1,2 @@ +LIST=VARIANT +include recurse.mk diff --git a/nto/mips/o.be/Makefile b/nto/mips/o.be/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/mips/o.be/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/mips/o.le.mc/Makefile b/nto/mips/o.le.mc/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/mips/o.le.mc/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/mips/o.le/Makefile b/nto/mips/o.le/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/mips/o.le/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/ppc/Makefile b/nto/ppc/Makefile new file mode 100644 index 0000000..c95a666 --- /dev/null +++ b/nto/ppc/Makefile @@ -0,0 +1,2 @@ +LIST=VARIANT +include recurse.mk diff --git a/nto/ppc/o.be.spe/Makefile b/nto/ppc/o.be.spe/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/ppc/o.be.spe/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/ppc/o.be/Makefile b/nto/ppc/o.be/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/ppc/o.be/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/nto/x86/Makefile b/nto/x86/Makefile new file mode 100644 index 0000000..c95a666 --- /dev/null +++ b/nto/x86/Makefile @@ -0,0 +1,2 @@ +LIST=VARIANT +include recurse.mk diff --git a/nto/x86/o/Makefile b/nto/x86/o/Makefile new file mode 100644 index 0000000..0f9d7b9 --- /dev/null +++ b/nto/x86/o/Makefile @@ -0,0 +1 @@ +include ../../../common.mk diff --git a/src/iperf_auth.c b/src/iperf_auth.c index 867c55f..c4575c5 100644 --- a/src/iperf_auth.c +++ b/src/iperf_auth.c @@ -38,6 +38,10 @@ #include #include +#ifdef __KPDANTO__ +#include "iperf_util.h" +#endif + #if defined(HAVE_SSL) #include diff --git a/src/iperf_util.h b/src/iperf_util.h index b109af2..82641a5 100644 --- a/src/iperf_util.h +++ b/src/iperf_util.h @@ -31,6 +31,9 @@ #include "cjson.h" #include #include +#ifdef __KPDANTO__ +#include +#endif int readentropy(void *out, size_t outsize); diff --git a/src/portable_endian.h b/src/portable_endian.h index 6b996b3..4c8f369 100644 --- a/src/portable_endian.h +++ b/src/portable_endian.h @@ -135,6 +135,9 @@ # define __LITTLE_ENDIAN LITTLE_ENDIAN # define __PDP_ENDIAN PDP_ENDIAN +#elif defined(__KPDANTO__) +#include + #else // Unsupported platforms.