nwconn: implement AFP scan file information
All checks were successful
Source release / source-package (push) Successful in 52s
All checks were successful
Source release / source-package (push) Successful in 52s
Wire NCP 0x23/0x11 AFP 2.0 Scan File Information to a conservative read-only directory scan. The WebSDK documents NWAFPScanFileInformation as taking a volume number, AFP base entry id, last-seen AFP id, search mask, request mask, path string, and file-info buffer. The call scans a directory relative to the AFP base and returns AFP file information for the next matching entry, updating the last-seen id for the caller's next iteration. Reuse the existing AFP file information formatter and libatalk/stat-derived entry-id path. For now, support path-backed scans only: resolve the supplied SYS:-style path through the mars_nwe path machinery, enumerate one child directory entry after the supplied last-seen id, and return a last-seen id plus an AFP file-info record. Entry-id-only scans, persistent CNID lookup, and full AFP search-mask semantics remain future work. Add a Linux afp_scan_info_smoke helper using ncpfs/libncp so the new endpoint can be exercised without an AppleTalk client. This implements the documented read-only scan path needed for directory browsing smoke tests, while keeping write-side AFP and persistent Mac namespace semantics unchanged.
This commit is contained in:
@@ -25,3 +25,7 @@ target_link_libraries(afp_entry_id_smoke ${NCPFS_LIBRARY})
|
||||
add_executable(afp_file_info_smoke afp_file_info_smoke.c)
|
||||
target_include_directories(afp_file_info_smoke PRIVATE ${NCPFS_INCLUDE_DIR})
|
||||
target_link_libraries(afp_file_info_smoke ${NCPFS_LIBRARY})
|
||||
|
||||
add_executable(afp_scan_info_smoke afp_scan_info_smoke.c)
|
||||
target_include_directories(afp_scan_info_smoke PRIVATE ${NCPFS_INCLUDE_DIR})
|
||||
target_link_libraries(afp_scan_info_smoke ${NCPFS_LIBRARY})
|
||||
|
||||
266
tests/linux/afp_scan_info_smoke.c
Normal file
266
tests/linux/afp_scan_info_smoke.c
Normal file
@@ -0,0 +1,266 @@
|
||||
/*
|
||||
* Linux smoke test for NetWare AFP 2.0 Scan File Information.
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <ncp/nwcalls.h>
|
||||
#include <ncp/ncplib.h>
|
||||
#include <ncp/kernel/ncp.h>
|
||||
|
||||
#ifndef NCPC_SUBFUNCTION
|
||||
#define NCPC_SUBFUNCTION 0x10000
|
||||
#endif
|
||||
#ifndef NCPC_SFN
|
||||
#define NCPC_SFN(FN, SFN) ((FN) | ((SFN) << 8) | NCPC_SUBFUNCTION)
|
||||
#endif
|
||||
|
||||
#define AFP20_SCAN_FILE_INFORMATION 0x11
|
||||
#define NWE_INVALID_NAMESPACE 0xbf
|
||||
#define NWE_INVALID_PATH 0x9c
|
||||
#define NWE_NO_FILES_FOUND 0xff
|
||||
#define AFP_SCAN_REPLY_LEN 124
|
||||
#define AFP_GET_ALL 0xffff
|
||||
#define AFP_SEARCH_ALL 0xffff
|
||||
|
||||
static void usage(const char *prog)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"Usage: %s [--allow-invalid-namespace] [--allow-invalid-path] [--allow-empty] "
|
||||
"[--volume N] [--entry-id ID] [--last-seen ID] [--search-mask MASK] "
|
||||
"[--request-mask MASK] [ncpfs options] PATH\n"
|
||||
"\n"
|
||||
"ncpfs options are parsed by ncp_initialize(), for example:\n"
|
||||
" -S SERVER -U USER -P PASSWORD -n\n"
|
||||
"\n"
|
||||
"Examples:\n"
|
||||
" %s -S MARS -U SUPERVISOR -P secret SYS:PUBLIC\n"
|
||||
" %s --allow-empty -S MARS -U SUPERVISOR -P secret SYS:EMPTYDIR\n",
|
||||
prog, prog, prog);
|
||||
}
|
||||
|
||||
static int parse_u32(const char *text, uint32_t *value)
|
||||
{
|
||||
char *end = NULL;
|
||||
unsigned long v;
|
||||
|
||||
errno = 0;
|
||||
v = strtoul(text, &end, 0);
|
||||
if (errno || !end || *end || v > 0xffffffffUL)
|
||||
return -1;
|
||||
*value = (uint32_t)v;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static uint16_t be16_to_cpu(const uint8_t p[2])
|
||||
{
|
||||
return ((uint16_t)p[0] << 8) | p[1];
|
||||
}
|
||||
|
||||
static uint32_t be32_to_cpu(const uint8_t p[4])
|
||||
{
|
||||
return ((uint32_t)p[0] << 24) |
|
||||
((uint32_t)p[1] << 16) |
|
||||
((uint32_t)p[2] << 8) |
|
||||
p[3];
|
||||
}
|
||||
|
||||
static void cpu_to_be16(uint16_t v, uint8_t p[2])
|
||||
{
|
||||
p[0] = (uint8_t)(v >> 8);
|
||||
p[1] = (uint8_t)v;
|
||||
}
|
||||
|
||||
static void cpu_to_be32(uint32_t v, uint8_t p[4])
|
||||
{
|
||||
p[0] = (uint8_t)(v >> 24);
|
||||
p[1] = (uint8_t)(v >> 16);
|
||||
p[2] = (uint8_t)(v >> 8);
|
||||
p[3] = (uint8_t)v;
|
||||
}
|
||||
|
||||
static void copy_fixed_string(char *dst, size_t dstlen,
|
||||
const uint8_t *src, size_t srclen)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (!dstlen)
|
||||
return;
|
||||
for (i = 0; i + 1 < dstlen && i < srclen && src[i]; i++)
|
||||
dst[i] = (char)src[i];
|
||||
dst[i] = '\0';
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
NWCONN_HANDLE conn;
|
||||
NW_FRAGMENT reply;
|
||||
long init_err = 0;
|
||||
const char *path = NULL;
|
||||
int allow_invalid_namespace = 0;
|
||||
int allow_invalid_path = 0;
|
||||
int allow_empty = 0;
|
||||
uint32_t volume_number = 0;
|
||||
uint32_t entry_id = 0;
|
||||
uint32_t last_seen_id = 0;
|
||||
uint32_t search_mask = AFP_SEARCH_ALL;
|
||||
uint32_t request_mask = AFP_GET_ALL;
|
||||
int i;
|
||||
size_t path_len;
|
||||
uint8_t request[1 + 4 + 4 + 2 + 2 + 1 + 255];
|
||||
uint8_t reply_buf[AFP_SCAN_REPLY_LEN];
|
||||
char long_name[33];
|
||||
char short_name[13];
|
||||
NWCCODE err;
|
||||
|
||||
if (NWCallsInit(NULL, NULL)) {
|
||||
fprintf(stderr, "NWCallsInit failed\n");
|
||||
return 2;
|
||||
}
|
||||
|
||||
conn = ncp_initialize(&argc, argv, 1, &init_err);
|
||||
if (!conn) {
|
||||
fprintf(stderr, "ncp_initialize/login failed: %ld\n", init_err);
|
||||
usage(argv[0]);
|
||||
return 2;
|
||||
}
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (!strcmp(argv[i], "--allow-invalid-namespace")) {
|
||||
allow_invalid_namespace = 1;
|
||||
} else if (!strcmp(argv[i], "--allow-invalid-path")) {
|
||||
allow_invalid_path = 1;
|
||||
} else if (!strcmp(argv[i], "--allow-empty")) {
|
||||
allow_empty = 1;
|
||||
} else if (!strcmp(argv[i], "--volume")) {
|
||||
if (++i >= argc || parse_u32(argv[i], &volume_number) || volume_number > 255) {
|
||||
fprintf(stderr, "invalid --volume value\n");
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
} else if (!strcmp(argv[i], "--entry-id")) {
|
||||
if (++i >= argc || parse_u32(argv[i], &entry_id)) {
|
||||
fprintf(stderr, "invalid --entry-id value\n");
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
} else if (!strcmp(argv[i], "--last-seen")) {
|
||||
if (++i >= argc || parse_u32(argv[i], &last_seen_id)) {
|
||||
fprintf(stderr, "invalid --last-seen value\n");
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
} else if (!strcmp(argv[i], "--search-mask")) {
|
||||
if (++i >= argc || parse_u32(argv[i], &search_mask) || search_mask > 0xffff) {
|
||||
fprintf(stderr, "invalid --search-mask value\n");
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
} else if (!strcmp(argv[i], "--request-mask")) {
|
||||
if (++i >= argc || parse_u32(argv[i], &request_mask) || request_mask > 0xffff) {
|
||||
fprintf(stderr, "invalid --request-mask value\n");
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
} else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
|
||||
usage(argv[0]);
|
||||
ncp_close(conn);
|
||||
return 0;
|
||||
} else if (!path) {
|
||||
path = argv[i];
|
||||
} else {
|
||||
fprintf(stderr, "unexpected argument: %s\n", argv[i]);
|
||||
usage(argv[0]);
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
if (!path) {
|
||||
fprintf(stderr, "missing PATH\n");
|
||||
usage(argv[0]);
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
|
||||
path_len = strlen(path);
|
||||
if (path_len > 255) {
|
||||
fprintf(stderr, "PATH is too long for AFP Scan File Information: %zu\n", path_len);
|
||||
ncp_close(conn);
|
||||
return 2;
|
||||
}
|
||||
|
||||
memset(request, 0, sizeof(request));
|
||||
request[0] = (uint8_t)volume_number;
|
||||
cpu_to_be32(entry_id, request + 1);
|
||||
cpu_to_be32(last_seen_id, request + 5);
|
||||
cpu_to_be16((uint16_t)search_mask, request + 9);
|
||||
cpu_to_be16((uint16_t)request_mask, request + 11);
|
||||
request[13] = (uint8_t)path_len;
|
||||
memcpy(request + 14, path, path_len);
|
||||
|
||||
memset(reply_buf, 0, sizeof(reply_buf));
|
||||
reply.fragAddr.rw = reply_buf;
|
||||
reply.fragSize = sizeof(reply_buf);
|
||||
|
||||
err = NWRequestSimple(conn,
|
||||
NCPC_SFN(0x23, AFP20_SCAN_FILE_INFORMATION),
|
||||
request,
|
||||
14 + path_len,
|
||||
&reply);
|
||||
if (err == NWE_INVALID_NAMESPACE && allow_invalid_namespace) {
|
||||
printf("AFP Scan File Information returned invalid namespace as expected for path=%s\n", path);
|
||||
ncp_close(conn);
|
||||
return 0;
|
||||
}
|
||||
if (err == NWE_INVALID_PATH && allow_invalid_path) {
|
||||
printf("AFP Scan File Information returned invalid path as expected for path=%s\n", path);
|
||||
ncp_close(conn);
|
||||
return 0;
|
||||
}
|
||||
if (err == NWE_NO_FILES_FOUND && allow_empty) {
|
||||
printf("AFP Scan File Information returned no files as expected for path=%s last_seen=0x%08x\n",
|
||||
path, last_seen_id);
|
||||
ncp_close(conn);
|
||||
return 0;
|
||||
}
|
||||
if (err) {
|
||||
fprintf(stderr,
|
||||
"AFP Scan File Information failed: completion=0x%02x (%u) path=%s last_seen=0x%08x\n",
|
||||
(unsigned int)err & 0xff, (unsigned int)err, path, last_seen_id);
|
||||
ncp_close(conn);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (reply.fragSize < AFP_SCAN_REPLY_LEN) {
|
||||
fprintf(stderr, "short AFP scan reply: %zu bytes\n", reply.fragSize);
|
||||
ncp_close(conn);
|
||||
return 1;
|
||||
}
|
||||
|
||||
copy_fixed_string(long_name, sizeof(long_name), reply_buf + 4 + 64, 32);
|
||||
copy_fixed_string(short_name, sizeof(short_name), reply_buf + 4 + 100, 12);
|
||||
|
||||
printf("AFP Scan File Info path=%s last_seen=0x%08x next_last_seen=0x%08x "
|
||||
"entry_id=0x%08x parent_id=0x%08x attrs=0x%04x data_len=%u "
|
||||
"resource_len=%u offspring=%u long_name=%s short_name=%s rights=0x%04x\n",
|
||||
path,
|
||||
last_seen_id,
|
||||
be32_to_cpu(reply_buf + 0),
|
||||
be32_to_cpu(reply_buf + 4),
|
||||
be32_to_cpu(reply_buf + 8),
|
||||
be16_to_cpu(reply_buf + 12),
|
||||
be32_to_cpu(reply_buf + 14),
|
||||
be32_to_cpu(reply_buf + 18),
|
||||
be16_to_cpu(reply_buf + 22),
|
||||
long_name,
|
||||
short_name,
|
||||
be16_to_cpu(reply_buf + 4 + 112));
|
||||
|
||||
ncp_close(conn);
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user