romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 21:03:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

tftpd: prefix TFTP protocol error E* constants with TFTP_

Browse source 
To avoid mistaking them for `errno` error codes.

Closes #16666
This commit is contained in:
Viktor Szakats 2025-03-07 18:24:43 +01:00
parent 51c9238c76
commit ab2cf88dad
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/server/tftp.h
View file

@ -51,13 +51,13 @@ struct tftphdr {
#define th_code th_block #define th_code th_block
#define th_msg th_data #define th_msg th_data
#define EUNDEF 0 #define TFTP_EUNDEF 0
#define ENOTFOUND 1 #define TFTP_ENOTFOUND 1
#define EACCESS 2 #define TFTP_EACCESS 2
#define ENOSPACE 3 #define TFTP_ENOSPACE 3
#define EBADOP 4 #define TFTP_EBADOP 4
#define EBADID 5 #define TFTP_EBADID 5
#define EEXISTS 6 #define TFTP_EEXISTS 6
#define ENOUSER 7 #define TFTP_ENOUSER 7
#endif /* HEADER_CURL_SERVER_TFTP_H */ #endif /* HEADER_CURL_SERVER_TFTP_H */

34
tests/server/tftpd.c
View file

@ -157,15 +157,15 @@ struct bf {
*****************************************************************************/ *****************************************************************************/
static struct errmsg errmsgs[] = { static struct errmsg errmsgs[] = {
{ EUNDEF, "Undefined error code" }, { TFTP_EUNDEF, "Undefined error code" },
{ ENOTFOUND, "File not found" }, { TFTP_ENOTFOUND, "File not found" },
{ EACCESS, "Access violation" }, { TFTP_EACCESS, "Access violation" },
{ ENOSPACE, "Disk full or allocation exceeded" }, { TFTP_ENOSPACE, "Disk full or allocation exceeded" },
{ EBADOP, "Illegal TFTP operation" }, { TFTP_EBADOP, "Illegal TFTP operation" },
{ EBADID, "Unknown transfer ID" }, { TFTP_EBADID, "Unknown transfer ID" },
{ EEXISTS, "File already exists" }, { TFTP_EEXISTS, "File already exists" },
{ ENOUSER, "No such user" }, { TFTP_ENOUSER, "No such user" },
{ -1, 0 } { -1, 0 }
}; };
static const struct formats formata[] = { static const struct formats formata[] = {
@ -941,7 +941,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size)
} while(1); } while(1);
if(*cp || !mode) { if(*cp || !mode) {
nak(EBADOP); nak(TFTP_EBADOP);
fclose(server); fclose(server);
return 3; return 3;
} }
@ -960,7 +960,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size)
if(strcmp(pf->f_mode, mode) == 0) if(strcmp(pf->f_mode, mode) == 0)
break; break;
if(!pf->f_mode) { if(!pf->f_mode) {
nak(EBADOP); nak(TFTP_EBADOP);
return 2; return 2;
} }
ecode = validate_access(test, filename, tp->th_opcode); ecode = validate_access(test, filename, tp->th_opcode);
@ -1118,7 +1118,7 @@ static int validate_access(struct testcase *test,
int error = errno; int error = errno;
logmsg("fopen() failed with error (%d) %s", error, strerror(error)); logmsg("fopen() failed with error (%d) %s", error, strerror(error));
logmsg("Couldn't open test file for test: %ld", testno); logmsg("Couldn't open test file for test: %ld", testno);
return EACCESS; return TFTP_EACCESS;
} }
else { else {
size_t count; size_t count;
@ -1126,7 +1126,7 @@ static int validate_access(struct testcase *test,
fclose(stream); fclose(stream);
if(error) { if(error) {
logmsg("getpart() failed with error (%d)", error); logmsg("getpart() failed with error (%d)", error);
return EACCESS; return TFTP_EACCESS;
} }
if(test->buffer) { if(test->buffer) {
test->rptr = test->buffer; /* set read pointer */ test->rptr = test->buffer; /* set read pointer */
@ -1134,12 +1134,12 @@ static int validate_access(struct testcase *test,
test->rcount = count; /* set data left to read */ test->rcount = count; /* set data left to read */
} }
else else
return EACCESS; return TFTP_EACCESS;
} }
} }
else { else {
logmsg("no slash found in path"); logmsg("no slash found in path");
return EACCESS; /* failure */ return TFTP_EACCESS; /* failure */
} }
logmsg("file opened and all is good"); logmsg("file opened and all is good");
@ -1295,7 +1295,7 @@ send_ack:
if(size < 0) if(size < 0)
nak(errno + 100); nak(errno + 100);
else else
nak(ENOSPACE); nak(TFTP_ENOSPACE);
goto abort; goto abort;
} }
} while(size == SEGSIZE); } while(size == SEGSIZE);
@ -1352,7 +1352,7 @@ static void nak(int error)
break; break;
if(pe->e_code < 0) { if(pe->e_code < 0) {
pe->e_msg = strerror(error - 100); pe->e_msg = strerror(error - 100);
tp->th_code = EUNDEF; /* set 'undef' errorcode */ tp->th_code = TFTP_EUNDEF; /* set 'undef' errorcode */
} }
length = (int)strlen(pe->e_msg); length = (int)strlen(pe->e_msg);