aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2011-08-30 15:03:50 +0300
committerAris Adamantiadis <aris@0xbadc0de.be>2011-09-02 11:43:07 +0300
commit555d1a43470d184cdfb0deedc39415c59b14a133 (patch)
tree80647a5755167f7b9b2bfd2437f11f11cea62146 /tests
parent17ae216340fea65edbfbb59789121e6e4af73f20 (diff)
downloadlibssh-555d1a43470d184cdfb0deedc39415c59b14a133.tar.gz
libssh-555d1a43470d184cdfb0deedc39415c59b14a133.tar.xz
libssh-555d1a43470d184cdfb0deedc39415c59b14a133.zip
benchmarks: fix some bugs
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/bench_raw.c2
-rw-r--r--tests/benchmarks/benchmarks.c29
-rw-r--r--tests/benchmarks/benchmarks.h1
3 files changed, 26 insertions, 6 deletions
diff --git a/tests/benchmarks/bench_raw.c b/tests/benchmarks/bench_raw.c
index 1992cac7..db1a057c 100644
--- a/tests/benchmarks/bench_raw.c
+++ b/tests/benchmarks/bench_raw.c
@@ -155,7 +155,7 @@ int benchmarks_raw_up (ssh_session session, struct argument_s *args,
if(args->verbose>0)
fprintf(stdout,"Finished upload, now waiting the ack\n");
- if((err=ssh_channel_read(channel,buffer,sizeof(buffer)-1,0))==SSH_ERROR)
+ if((err=ssh_channel_read(channel,buffer,5,0))==SSH_ERROR)
goto error;
buffer[err]=0;
if(!strstr(buffer,"done")){
diff --git a/tests/benchmarks/benchmarks.c b/tests/benchmarks/benchmarks.c
index 024639f7..ad61e280 100644
--- a/tests/benchmarks/benchmarks.c
+++ b/tests/benchmarks/benchmarks.c
@@ -178,6 +178,15 @@ static struct argp_option options[] = {
.doc = "[async SFTP] number of concurrent requests",
.group = 0
},
+ {
+ .name = "cipher",
+ .key = 'C',
+ .arg = "cipher",
+ .flags = 0,
+ .doc = "Cryptographic cipher to be used",
+ .group = 0
+ },
+
{NULL, 0, NULL, 0, NULL, 0}
};
@@ -214,6 +223,9 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
case 'c':
arguments->chunksize = atoi(arg);
break;
+ case 'C':
+ arguments->cipher = arg;
+ break;
case 'h':
if(arguments->nhosts >= MAX_HOSTS_CONNECT){
fprintf(stderr, "Too much hosts\n");
@@ -249,7 +261,8 @@ static void cmdline_parse(int argc, char **argv, struct argument_s *arguments) {
#else /* HAVE_ARGP_H */
(void) argc;
(void) argv;
- (void) arguments;
+ arguments->hosts[0]="localhost";
+ arguments->nhosts=1;
#endif /* HAVE_ARGP_H */
}
@@ -260,13 +273,19 @@ static void arguments_init(struct argument_s *arguments){
arguments->datasize = 10;
}
-static ssh_session connect_host(const char *host, int verbose){
+static ssh_session connect_host(const char *host, int verbose, char *cipher){
ssh_session session=ssh_new();
if(session==NULL)
goto error;
if(ssh_options_set(session,SSH_OPTIONS_HOST, host)<0)
goto error;
ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbose);
+ if(cipher != NULL){
+ if (ssh_options_set(session, SSH_OPTIONS_CIPHERS_C_S, cipher) ||
+ ssh_options_set(session, SSH_OPTIONS_CIPHERS_S_C, cipher)){
+ goto error;
+ }
+ }
if(ssh_connect(session)==SSH_ERROR)
goto error;
if(ssh_userauth_autopubkey(session,NULL) != SSH_AUTH_SUCCESS)
@@ -311,7 +330,7 @@ static void do_benchmarks(ssh_session session, struct argument_s *arguments,
}
err=benchmarks_ssh_latency(session, &ssh_rtt);
if(err==0){
- fprintf(stdout, "SSH RTT : %f ms\n",ssh_rtt);
+ fprintf(stdout, "SSH RTT : %f ms. Theoretical max BW (win=128K) : %s\n",ssh_rtt,network_speed(128000.0/(ssh_rtt / 1000.0)));
}
for (i=0 ; i<BENCHMARK_NUMBER ; ++i){
b = &benchmarks[i];
@@ -343,7 +362,7 @@ int main(int argc, char **argv){
}
arguments.ntests=BENCHMARK_NUMBER;
}
- buffer=malloc(arguments.chunksize);
+ buffer=malloc(arguments.chunksize > 1024 ? arguments.chunksize : 1024);
if(buffer == NULL){
fprintf(stderr,"Allocation of chunk buffer failed\n");
return EXIT_FAILURE;
@@ -364,7 +383,7 @@ int main(int argc, char **argv){
for(i=0; i<arguments.nhosts;++i){
if(arguments.verbose > 0)
fprintf(stdout,"Connecting to \"%s\"...\n",arguments.hosts[i]);
- session=connect_host(arguments.hosts[i], arguments.verbose);
+ session=connect_host(arguments.hosts[i], arguments.verbose, arguments.cipher);
if(session != NULL && arguments.verbose > 0)
fprintf(stdout,"Success\n");
if(session == NULL){
diff --git a/tests/benchmarks/benchmarks.h b/tests/benchmarks/benchmarks.h
index 1c9a3016..26da09bb 100644
--- a/tests/benchmarks/benchmarks.h
+++ b/tests/benchmarks/benchmarks.h
@@ -48,6 +48,7 @@ struct argument_s {
unsigned int datasize;
unsigned int chunksize;
int concurrent_requests;
+ char *cipher;
};
extern char *buffer;