Clean up indentation.

Note that -5047 can also mean "disk quota exceeded".

Define the ASP errors as 32-bit (negative) numbers, just like the AFP
errors.

Add a couple of ASP errors to the list of error values.

svn path=/trunk/; revision=27792
This commit is contained in:
Guy Harris 2009-03-18 23:30:21 +00:00
parent 4932b881f2
commit 987e12f435
2 changed files with 18 additions and 15 deletions

View File

@ -25,7 +25,7 @@
#ifndef PACKET_AFP_H
#define PACKET_AFP_H
#define AFP_OK 0
#define AFP_OK 0
#define AFPERR_ACCESS (-5000) /* permission denied */
#define AFPERR_AUTHCONT (-5001) /* logincont */
#define AFPERR_BADUAM (-5002) /* uam doesn't exist */
@ -35,8 +35,8 @@
#define AFPERR_DENYCONF (-5006) /* file synchronization locks conflict */
#define AFPERR_DIRNEMPT (-5007) /* directory not empty */
#define AFPERR_DFULL (-5008) /* disk full */
#define AFPERR_EOF (-5009) /* end of file -- catsearch and afp_read */
#define AFPERR_BUSY (-5010) /* FileBusy */
#define AFPERR_EOF (-5009) /* end of file -- catsearch and afp_read */
#define AFPERR_BUSY (-5010) /* FileBusy */
#define AFPERR_FLATVOL (-5011) /* volume doesn't support directories */
#define AFPERR_NOITEM (-5012) /* ItemNotFound */
#define AFPERR_LOCK (-5013) /* LockErr */
@ -50,7 +50,7 @@
#define AFPERR_RANGEOVR (-5021) /* range overlap */
#define AFPERR_SESSCLOS (-5022) /* session closed */
#define AFPERR_NOTAUTH (-5023) /* user not authenticated */
#define AFPERR_NOOP (-5024) /* command not supported */
#define AFPERR_NOOP (-5024) /* command not supported */
#define AFPERR_BADTYPE (-5025) /* object is the wrong type */
#define AFPERR_NFILE (-5026) /* too many files open */
#define AFPERR_SHUTDOWN (-5027) /* server is going down */
@ -75,6 +75,7 @@
#define AFPERR_PWDCHNG (-5045) /* password needs to be changed */
#define AFPERR_PWDPOLCY (-5046) /* password fails policy check */
#define AFPERR_USRLOGIN (-5047) /* user already logged on */
/* also disk quota exceeded? */
extern const value_string asp_error_vals[];
extern const value_string afp_server_addr_type_vals[];

View File

@ -198,17 +198,17 @@ static gint ett_zip_network_list = -1;
#define ASPFUNC_ATTN 8
#define ASP_HDRSIZ 4
#define ASPERR_OK 0x0000
#define ASPERR_BADVERS 0xfbd6
#define ASPERR_BUFSMALL 0xfbd5
#define ASPERR_NOSESS 0xfbd4
#define ASPERR_NOSERV 0xfbd3
#define ASPERR_PARM 0xfbd2
#define ASPERR_SERVBUSY 0xfbd1
#define ASPERR_SESSCLOS 0xfbd0
#define ASPERR_SIZERR 0xfbcf
#define ASPERR_TOOMANY 0xfbce
#define ASPERR_NOACK 0xfbcd
#define ASPERR_OK 0
#define ASPERR_BADVERS (-1066)
#define ASPERR_BUFSMALL (-1067)
#define ASPERR_NOSESS (-1068)
#define ASPERR_NOSERV (-1069)
#define ASPERR_PARM (-1070)
#define ASPERR_SERVBUSY (-1071)
#define ASPERR_SESSCLOS (-1072)
#define ASPERR_SIZERR (-1073)
#define ASPERR_TOOMANY (-1074)
#define ASPERR_NOACK (-1075)
static int proto_asp = -1;
static int hf_asp_func = -1;
@ -482,6 +482,8 @@ static const value_string asp_func_vals[] = {
const value_string asp_error_vals[] = {
{AFP_OK , "success"},
{ASPERR_NOSESS , "no more sessions available"},
{ASPERR_SESSCLOS , "session closed (ASP)" },
{AFPERR_ACCESS , "permission denied" },
{AFPERR_AUTHCONT , "logincont" },
{AFPERR_BADUAM , "uam doesn't exist" },