Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Troy Dawson
f60b08b789 epel8-playground decommissioned : https://pagure.io/epel/issue/136 2022-01-31 17:48:58 -08:00
6 changed files with 1 additions and 267 deletions

5
.gitignore vendored
View file

@ -1,5 +0,0 @@
uperf-1.0.3-beta.tar.gz
/uperf-1.0.4.tar.bz2
/uperf-1.0.5.tar.gz
/v1.0.6.tar.gz
/1.0.7.tar.gz

1
dead.package Normal file
View file

@ -0,0 +1 @@
epel8-playground decommissioned : https://pagure.io/epel/issue/136

View file

@ -1 +0,0 @@
SHA512 (1.0.7.tar.gz) = 27ee5e5852e8cb702c84958e4f00a8ab0df004681944e6a267e04fbb1e9448d011537ffdfcbb9d68b2a42eb59571ebed9579b9fcfa7947c6fc2a26bf80b34d59

View file

@ -1,105 +0,0 @@
$ git diff v1.0.6..09fbbdb93 src > ../uperf-1.0.6-09fbbdb93.patch
diff --git a/src/parse.c b/src/parse.c
index aedab06..bdedd0c 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -774,6 +774,7 @@ build_worklist(struct symbol *list)
int txnid = 0;
int fid = 0;
int in_group = 0;
+ int in_txn = 0;
w.ngrp = 0;
bzero(&w, sizeof (workorder_t));
@@ -799,6 +800,12 @@ build_worklist(struct symbol *list)
in_group = 0;
break;
case TOKEN_TXN_START:
+ if (!in_group) {
+ snprintf(err, sizeof (err),
+ "No current group");
+ add_error(err);
+ return (NULL);
+ }
curr_grp->ntxn++;
if (curr_txn == 0) {
curr_grp->tlist = calloc(1, sizeof (txn_t));
@@ -813,10 +820,18 @@ build_worklist(struct symbol *list)
curr_txn->iter = 1;
curr_flowop = 0;
fid = 0;
+ in_txn = 1;
break;
case TOKEN_TXN_END:
+ in_txn = 0;
break;
case TOKEN_FLOWOP_START:
+ if (!in_txn) {
+ snprintf(err, sizeof (err),
+ "No current transaction");
+ add_error(err);
+ return (NULL);
+ }
curr_txn->nflowop++;
if (curr_flowop == NULL) {
curr_txn->flist = calloc(1, sizeof (flowop_t));
@@ -839,6 +854,12 @@ build_worklist(struct symbol *list)
}
break;
case TOKEN_ITERATIONS:
+ if (!in_txn) {
+ snprintf(err, sizeof (err),
+ "No current transaction");
+ add_error(err);
+ return (NULL);
+ }
curr_txn->iter = string2int(list->symbol);
break;
case TOKEN_TYPE:
@@ -858,14 +879,32 @@ build_worklist(struct symbol *list)
flowop_parse_options(list->symbol, curr_flowop);
break;
case TOKEN_RATE:
+ if (!in_txn) {
+ snprintf(err, sizeof (err),
+ "No current transaction");
+ add_error(err);
+ return (NULL);
+ }
strlcpy(curr_txn->rate_str, list->symbol, NAMELEN);
curr_txn->rate_count = string2int(list->symbol);
break;
case TOKEN_DURATION:
+ if (!in_txn) {
+ snprintf(err, sizeof (err),
+ "No current transaction");
+ add_error(err);
+ return (NULL);
+ }
curr_txn->duration = string2nsec(list->symbol);
curr_txn->iter = 1;
break;
case TOKEN_NTHREADS:
+ if (!in_group) {
+ snprintf(err, sizeof (err),
+ "No current group");
+ add_error(err);
+ return (NULL);
+ }
curr_grp->nthreads = string2int(list->symbol);
curr_grp->strand_flag |= STRAND_TYPE_THREAD;
break;
@@ -876,6 +915,12 @@ build_worklist(struct symbol *list)
add_error(err);
return (NULL);
#else
+ if (!in_group) {
+ snprintf(err, sizeof (err),
+ "No current group");
+ add_error(err);
+ return (NULL);
+ }
curr_grp->nthreads = string2int(list->symbol);
curr_grp->strand_flag |= STRAND_TYPE_PROCESS;
break;

View file

@ -1,38 +0,0 @@
diff --git a/src/ssl.c b/src/ssl.c
index 1352434..6507f26 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -25,6 +25,8 @@
#endif /* HAVE_CONFIG_H */
#include <stdio.h>
+#include <string.h>
+#include <errno.h>
#include <stdlib.h>
#include <sys/socket.h> /* basic socket definitions */
#include <netdb.h>
@@ -152,11 +154,11 @@ ssl_init(void *arg)
int i;
if (IS_MASTER(options)) {
- if (file_present("server.pem") == 0)
- ctx = initialize_ctx("server.pem", PASS, NULL);
+ if (file_present("/usr/share/uperf/server.pem") == 0)
+ ctx = initialize_ctx("/usr/share/uperf/server.pem", PASS, NULL);
} else {
- if (file_present("client.pem") == 0)
- ctx = initialize_ctx("client.pem", PASS, NULL);
+ if (file_present("/usr/share/uperf/client.pem") == 0)
+ ctx = initialize_ctx("/usr/share/uperf/client.pem", PASS, NULL);
}
if (ctx == NULL)
return (1);
@@ -394,7 +396,7 @@ initialize_ctx(char *keyfile, char *password, const char *method)
#else
SSL_METHOD *meth;
#endif
- SSL_CTX *ctx;
+ SSL_CTX *ctx = NULL;
SSL_library_init();

View file

@ -1,118 +0,0 @@
Summary: Network performance tool with modelling and replay support
Name: uperf
Version: 1.0.7
Release: 1%{?dist}
License: GPLv3
URL: http://www.uperf.org/
Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz
Patch1: uperf-1.0.6-ssl-crash.patch
BuildRequires: gcc
BuildRequires: lksctp-tools-devel
BuildRequires: openssl-devel
%description
Network performance tool that supports modelling and replay of various
networking patterns.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
find src -type f -print0 | xargs --null chmod 0644
find workloads -type f -print0 | xargs --null chmod 0644
chmod 0644 AUTHORS ChangeLog COPYING README
%build
%configure \
--enable-cpc \
--enable-netstat \
--enable-udp \
--enable-sctp \
--enable-ssl
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
# Move stuff to own subdir
install -d -m 0755 %{buildroot}%{_datadir}/%{name}
install -p -m 0644 %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/%{name}
install -p -m 0644 {server,client}.pem %{buildroot}%{_datadir}/%{name}
rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc
%files
%license COPYING
%doc AUTHORS ChangeLog README
%{_bindir}/uperf
%{_datadir}/uperf
%changelog
* Fri Apr 17 2020 Terje Rosten <terje.rosten@ntnu.no> - 1.0.7-1
- 1.0.7
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 30 2019 Terje Rosten <terje.rosten@ntnu.no> - 1.0.6-1
- 1.0.6
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Nov 20 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.0.5-1
- 1.0.5
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Mon Dec 03 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.0.4-1
- 1.0.4
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.3-0.6.beta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.3-0.5.beta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.3-0.4.beta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Mar 18 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.0.3-0.3.beta
- move workloads files
* Thu Mar 18 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.0.3-0.2.beta
- don't ship pem files
* Mon Feb 1 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.0.3-0.1.beta
- initial build