Skip to content
This repository was archived by the owner on Oct 17, 2024. It is now read-only.

Commit

Permalink
Nominally support AFP 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@rdmark
rdmark committed Sep 16, 2024
1 parent 79237d2 commit d1317bb
Show file tree
Hide file tree
Showing 12 changed files with 163 additions and 28 deletions.
16 changes: 13 additions & 3 deletions test/T2_spectest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,13 @@ void usage( char * av0 )
fprintf( stdout,"\t-S\tsecond volume (default none)\n");

fprintf( stdout,"\t-w\tpassword (default none)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version (default 2.1)\n");
fprintf( stdout,"\t-1\tAFP 2.1 version (default)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version\n");
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

fprintf( stdout,"\t-f\ttest to run\n");
Expand All @@ -303,12 +305,16 @@ int cc;
static char *vers = "AFPVersion 2.1";
static char *uam = "Cleartxt Passwrd";

while (( cc = getopt( ac, av, "iv23456ah:H:p:s:u:d:w:c:f:lmMS:L" )) != EOF ) {
while (( cc = getopt( ac, av, "iv1234567ah:H:p:s:u:d:w:c:f:lmMS:L" )) != EOF ) {
switch ( cc ) {
case '1':
vers = "AFPVersion 2.1";
Version = 21;
break;
case '2':
vers = "AFP2.2";
Version = 22;
break;
break;
case '3':
vers = "AFPX03";
Version = 30;
Expand All @@ -325,6 +331,10 @@ static char *uam = "Cleartxt Passwrd";
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'a':
adouble = AD_V2;
break;
Expand Down
12 changes: 11 additions & 1 deletion test/afp_ls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ void usage( char * av0 )
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");
fprintf( stdout,"\t-t\trun it twice (ie one with the cache warm)\n");

Expand All @@ -206,7 +208,7 @@ int cc;
static char *vers = "AFPVersion 2.1";
static char *uam = "Cleartxt Passwrd";

while (( cc = getopt( ac, av, "Rimlv345th:p:s:u:w:d:" )) != EOF ) {
while (( cc = getopt( ac, av, "Rimlv34567th:p:s:u:w:d:" )) != EOF ) {
switch ( cc ) {
case 'i':
Quiet = 1;
Expand All @@ -223,6 +225,14 @@ static char *uam = "Cleartxt Passwrd";
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'R':
Recurse = 1;
break;
Expand Down
21 changes: 18 additions & 3 deletions test/afparg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,13 @@ void usage( char * av0 )
fprintf( stdout,"\t-u\tuser name (default uid)\n");

fprintf( stdout,"\t-w\tpassword (default none)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version (default 2.1)\n");
fprintf( stdout,"\t-1\tAFP 2.1 version (default)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version\n");
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

fprintf( stdout,"\t-f\ttest to run\n");
Expand All @@ -247,12 +250,16 @@ char **av;
{
int cc;

while (( cc = getopt( ac, av, "v2345h:p:s:u:w:f:l" )) != EOF ) {
while (( cc = getopt( ac, av, "v1234567h:p:s:u:w:f:l" )) != EOF ) {
switch ( cc ) {
case '1':
vers = "AFPVersion 2.1";
Version = 21;
break;
case '2':
vers = "AFP2.2";
Version = 22;
break;
break;
case '3':
vers = "AFPX03";
Version = 30;
Expand All @@ -265,6 +272,14 @@ int cc;
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'h':
Server = strdup(optarg);
break;
Expand Down
12 changes: 11 additions & 1 deletion test/encoding_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ void usage( char * av0 )
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

exit (1);
Expand All @@ -236,7 +238,7 @@ int cc;
static char *vers = "AFPVersion 2.1";
static char *uam = "Cleartxt Passwrd";

while (( cc = getopt( ac, av, "Rmlv345h:p:s:u:w:d:c:" )) != EOF ) {
while (( cc = getopt( ac, av, "Rmlv34567h:p:s:u:w:d:c:" )) != EOF ) {
switch ( cc ) {
case '3':
vers = "AFPX03";
Expand All @@ -250,6 +252,14 @@ static char *uam = "Cleartxt Passwrd";
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'R':
Recurse = 1;
break;
Expand Down
21 changes: 18 additions & 3 deletions test/fail_spectest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,13 @@ void usage( char * av0 )
fprintf( stdout,"\t-H\tsecond server for two connections (default use only one server)\n");

fprintf( stdout,"\t-w\tpassword (default none)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version (default 2.1)\n");
fprintf( stdout,"\t-1\tAFP 2.1 version (default)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version\n");
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

fprintf( stdout,"\t-x\tdon't run tests known to kill some afpd versions\n");
Expand All @@ -293,12 +296,16 @@ char **av;
{
int cc;

while (( cc = getopt( ac, av, "v2345h:H:p:s:u:d:w:c:f:lmx" )) != EOF ) {
while (( cc = getopt( ac, av, "v1234567h:H:p:s:u:d:w:c:f:lmx" )) != EOF ) {
switch ( cc ) {
case '1':
vers = "AFPVersion 2.1";
Version = 21;
break;
case '2':
vers = "AFP2.2";
Version = 22;
break;
break;
case '3':
vers = "AFPX03";
Version = 30;
Expand All @@ -311,6 +318,14 @@ int cc;
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'c':
Path = strdup(optarg);
break;
Expand Down
12 changes: 11 additions & 1 deletion test/lantest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,8 @@ void usage( char * av0 )
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version (default)\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-n\thow often to run (default: 1)\n");
fprintf( stdout,"\t-v\tverbose\n");
fprintf( stdout,"\t-V\tvery verbose\n");
Expand All @@ -674,7 +676,7 @@ int main(int ac, char **av)
if (pw)
User = strdup(pw->pw_name);

while (( cc = getopt( ac, av, "t:vVgG345h:n:p:s:u:w:c:F:" )) != EOF ) {
while (( cc = getopt( ac, av, "t:vVgG34567h:n:p:s:u:w:c:F:" )) != EOF ) {
switch ( cc ) {
case 't':
tests = strdup(optarg);
Expand All @@ -691,6 +693,14 @@ int main(int ac, char **av)
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'n':
Iterations = atoi(optarg);
break;
Expand Down
21 changes: 18 additions & 3 deletions test/logintest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,13 @@ void usage( char * av0 )
fprintf( stdout,"\t-u\tuser name (default uid)\n");

fprintf( stdout,"\t-w\tpassword (default none)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version (default 2.1)\n");
fprintf( stdout,"\t-1\tAFP 2.1 version (default)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version\n");
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

exit (1);
Expand All @@ -150,12 +153,16 @@ int cc;
static char *uam = "Cleartxt Passwrd";
unsigned int ret;

while (( cc = getopt( ac, av, "v2345h:p:u:w:m" )) != EOF ) {
while (( cc = getopt( ac, av, "v1234567h:p:u:w:m" )) != EOF ) {
switch ( cc ) {
case '1':
vers = "AFPVersion 2.1";
Version = 21;
break;
case '2':
vers = "AFP2.2";
Version = 22;
break;
break;
case '3':
vers = "AFPX03";
Version = 30;
Expand All @@ -168,6 +175,14 @@ unsigned int ret;
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'm':
Mac = 1;
break;
Expand Down
21 changes: 18 additions & 3 deletions test/rotest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,13 @@ void usage( char * av0 )
fprintf( stdout,"\t-s\tvolume to mount (default home)\n");

fprintf( stdout,"\t-w\tpassword (default none)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version (default 2.1)\n");
fprintf( stdout,"\t-1\tAFP 2.1 version (default)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version\n");
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

exit (1);
Expand All @@ -373,15 +376,19 @@ char **av;
int cc;
static char *uam = "Cleartxt Passwrd";

while (( cc = getopt( ac, av, "v2345h:p:u:w:ms:" )) != EOF ) {
while (( cc = getopt( ac, av, "v1234567h:p:u:w:ms:" )) != EOF ) {
switch ( cc ) {
case 's':
Vol = strdup(optarg);
break;
case '1':
vers = "AFPVersion 2.1";
Version = 21;
break;
case '2':
vers = "AFP2.2";
Version = 22;
break;
break;
case '3':
vers = "AFPX03";
Version = 30;
Expand All @@ -394,6 +401,14 @@ static char *uam = "Cleartxt Passwrd";
vers = "AFP3.2";
Version = 32;
break;
case '6':
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'm':
Mac = 1;
break;
Expand Down
16 changes: 13 additions & 3 deletions test/sleeptest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,13 @@ void usage( char * av0 )
fprintf( stdout,"\t-H\tsecond server for two connections (default use only one server)\n");

fprintf( stdout,"\t-w\tpassword (default none)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version (default 2.1)\n");
fprintf( stdout,"\t-1\tAFP 2.1 version (default)\n");
fprintf( stdout,"\t-2\tAFP 2.2 version\n");
fprintf( stdout,"\t-3\tAFP 3.0 version\n");
fprintf( stdout,"\t-4\tAFP 3.1 version\n");
fprintf( stdout,"\t-5\tAFP 3.2 version\n");
fprintf( stdout,"\t-6\tAFP 3.3 version\n");
fprintf( stdout,"\t-7\tAFP 3.4 version\n");
fprintf( stdout,"\t-v\tverbose\n");

fprintf( stdout,"\t-x\tdon't run tests known to kill some afpd versions\n");
Expand All @@ -199,12 +201,16 @@ char **av;
{
int cc;

while (( cc = getopt( ac, av, "v23456ah:H:p:s:S:u:d:w:c:f:Llmxi" )) != EOF ) {
while (( cc = getopt( ac, av, "v1234567ah:H:p:s:S:u:d:w:c:f:Llmxi" )) != EOF ) {
switch ( cc ) {
case '1':
vers = "AFPVersion 2.1";
Version = 21;
break;
case '2':
vers = "AFP2.2";
Version = 22;
break;
break;
case '3':
vers = "AFPX03";
Version = 30;
Expand All @@ -221,6 +227,10 @@ int cc;
vers = "AFP3.3";
Version = 33;
break;
case '7':
vers = "AFP3.4";
Version = 34;
break;
case 'a':
adouble = AD_V2;
break;
Expand Down
Loading

0 comments on commit d1317bb

Please sign in to comment.