mirror of
https://github.com/switchbrew/switch-tools.git
synced 2025-07-04 02:52:14 +02:00
Compare commits
No commits in common. "master" and "v1.7.1" have entirely different histories.
@ -2,7 +2,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.61)
|
||||
AC_INIT([switch-tools],[1.13.1],[https://github.com/switchbrew/switch-tools/issues])
|
||||
AC_INIT([switch-tools],[1.7.1],[https://github.com/switchbrew/switch-tools/issues])
|
||||
AC_CONFIG_SRCDIR([src/build_pfs0.c])
|
||||
|
||||
AM_INIT_AUTOMAKE([subdir-objects])
|
||||
@ -31,7 +31,7 @@ NET_LIBS=""
|
||||
case "$host" in
|
||||
*-*-mingw*)
|
||||
NET_LIBS="-lws2_32"
|
||||
CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO -D_WIN32_WINNT=0x0600"
|
||||
CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
124
src/elf2kip.c
124
src/elf2kip.c
@ -9,6 +9,11 @@
|
||||
#include "blz.h"
|
||||
#include "elf64.h"
|
||||
|
||||
typedef uint64_t u64;
|
||||
typedef uint32_t u32;
|
||||
typedef uint16_t u16;
|
||||
typedef uint8_t u8;
|
||||
|
||||
typedef struct {
|
||||
u32 DstOff;
|
||||
u32 DecompSz;
|
||||
@ -19,8 +24,8 @@ typedef struct {
|
||||
typedef struct {
|
||||
u8 Magic[4];
|
||||
u8 Name[0xC];
|
||||
u64 ProgramId;
|
||||
u32 Version;
|
||||
u64 TitleId;
|
||||
u32 ProcessCategory;
|
||||
u8 MainThreadPriority;
|
||||
u8 DefaultCpuId;
|
||||
u8 Unk;
|
||||
@ -185,32 +190,6 @@ int cJSON_GetU64FromObjectValue(const cJSON *config, u64 *out) {
|
||||
}
|
||||
}
|
||||
|
||||
int cJSON_GetU32(const cJSON *obj, const char *field, u32 *out) {
|
||||
const cJSON *config = cJSON_GetObjectItemCaseSensitive(obj, field);
|
||||
if (cJSON_IsString(config) && (config->valuestring != NULL)) {
|
||||
char *endptr = NULL;
|
||||
*out = strtoul(config->valuestring, &endptr, 16);
|
||||
if (config->valuestring == endptr) {
|
||||
fprintf(stderr, "Failed to get %s (empty string)\n", field);
|
||||
return 0;
|
||||
} else if (errno == ERANGE) {
|
||||
fprintf(stderr, "Failed to get %s (value out of range)\n", field);
|
||||
return 0;
|
||||
} else if (errno == EINVAL) {
|
||||
fprintf(stderr, "Failed to get %s (not base16 string)\n", field);
|
||||
return 0;
|
||||
} else if (errno) {
|
||||
fprintf(stderr, "Failed to get %s (unknown error)\n", field);
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "Failed to get %s (field not present).\n", field);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
const cJSON *capability = NULL;
|
||||
const cJSON *capabilities = NULL;
|
||||
@ -235,8 +214,8 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
|
||||
/* Parse program_id (or deprecated title_id). */
|
||||
if (!cJSON_GetU64(npdm_json, "program_id", &kip_hdr->ProgramId) && !cJSON_GetU64(npdm_json, "title_id", &kip_hdr->ProgramId)) {
|
||||
/* Parse title_id. */
|
||||
if (!cJSON_GetU64(npdm_json, "title_id", &kip_hdr->TitleId)) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
@ -252,17 +231,6 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
}
|
||||
}
|
||||
|
||||
/* Parse immortality. */
|
||||
/* This field is optional, and defaults to true (set before this function is called). */
|
||||
int immortal = 1;
|
||||
if (cJSON_GetBooleanOptional(npdm_json, "immortal", &immortal)) {
|
||||
if (immortal) {
|
||||
kip_hdr->Flags |= 0x40;
|
||||
} else {
|
||||
kip_hdr->Flags &= ~0x40;
|
||||
}
|
||||
}
|
||||
|
||||
/* Parse main_thread_stack_size. */
|
||||
u64 stack_size = 0;
|
||||
if (!cJSON_GetU64(npdm_json, "main_thread_stack_size", &stack_size)) {
|
||||
@ -285,8 +253,9 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
if (!cJSON_GetU32(npdm_json, "version", &kip_hdr->Version) && !cJSON_GetU32(npdm_json, "process_category", &kip_hdr->Version)) { // optional
|
||||
kip_hdr->Version = 1;
|
||||
if (!cJSON_GetU8(npdm_json, "process_category", (u8 *)&kip_hdr->ProcessCategory)) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
|
||||
/* Parse capabilities. */
|
||||
@ -341,17 +310,13 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
|
||||
u8 real_highest_prio = (lowest_prio < highest_prio) ? lowest_prio : highest_prio;
|
||||
u8 real_lowest_prio = (lowest_prio > highest_prio) ? lowest_prio : highest_prio;
|
||||
|
||||
desc = highest_cpu;
|
||||
desc <<= 8;
|
||||
desc |= lowest_cpu;
|
||||
desc <<= 6;
|
||||
desc |= (real_highest_prio & 0x3F);
|
||||
desc |= (lowest_prio & 0x3F);
|
||||
desc <<= 6;
|
||||
desc |= (real_lowest_prio & 0x3F);
|
||||
desc |= (highest_prio & 0x3F);
|
||||
kip_hdr->Capabilities[cur_cap++] = (u32)((desc << 4) | (0x0007));
|
||||
} else if (!strcmp(type_str, "syscalls")) {
|
||||
if (!cJSON_IsObject(value)) {
|
||||
@ -360,7 +325,7 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
u32 num_descriptors;
|
||||
u32 descriptors[8] = {0}; /* alignup(0xC0/0x18); */
|
||||
u32 descriptors[6] = {0}; /* alignup(0x80/0x18); */
|
||||
char field_name[8] = {0};
|
||||
const cJSON *cur_syscall = NULL;
|
||||
u64 syscall_value = 0;
|
||||
@ -373,14 +338,14 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
|
||||
if (syscall_value >= 0xC0) {
|
||||
fprintf(stderr, "Error: All syscall entries must be numbers in [0, 0xBF]\n");
|
||||
if (syscall_value >= 0x80) {
|
||||
fprintf(stderr, "Error: All syscall entries must be numbers in [0, 0x7F]\n");
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
descriptors[syscall_value / 0x18] |= (1UL << (syscall_value % 0x18));
|
||||
}
|
||||
for (unsigned int i = 0; i < 8; i++) {
|
||||
for (unsigned int i = 0; i < 6; i++) {
|
||||
if (descriptors[i]) {
|
||||
if (cur_cap + 1 > 0x20) {
|
||||
fprintf(stderr, "Error: Too many capabilities!\n");
|
||||
@ -417,8 +382,7 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
desc |= is_ro << 24;
|
||||
kip_hdr->Capabilities[cur_cap++] = (u32)((desc << 7) | (0x003F));
|
||||
|
||||
desc = (u32)((map_size >> 12) & 0x000FFFFFULL);
|
||||
desc |= (u32)(((map_address >> 36) & 0xFULL) << 20);
|
||||
desc = (u32)((map_size >> 12) & 0x00FFFFFFULL);
|
||||
is_io ^= 1;
|
||||
desc |= is_io << 24;
|
||||
kip_hdr->Capabilities[cur_cap++] = (u32)((desc << 7) | (0x003F));
|
||||
@ -435,47 +399,6 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
}
|
||||
desc = (u32)((page_address >> 12) & 0x00FFFFFFULL);
|
||||
kip_hdr->Capabilities[cur_cap++] = (u32)((desc << 8) | (0x007F));
|
||||
} else if (!strcmp(type_str, "map_region")) {
|
||||
if (cur_cap + 1 > 0x20) {
|
||||
fprintf(stderr, "Error: Too many capabilities!\n");
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
if (!cJSON_IsArray(value)) {
|
||||
fprintf(stderr, "Map Region capability value must be array!\n");
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
u8 regions[3] = {0};
|
||||
int is_ro[3] = {0};
|
||||
const cJSON *cur_region = NULL;
|
||||
int index = 0;
|
||||
cJSON_ArrayForEach(cur_region, value) {
|
||||
if (index >= 3) {
|
||||
fprintf(stderr, "Too many region descriptors!\n");
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
if (!cJSON_IsObject(cur_region)) {
|
||||
fprintf(stderr, "Region descriptor value must be object!\n");
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
|
||||
if (!cJSON_GetU8(cur_region, "region_type", ®ions[index]) ||
|
||||
!cJSON_GetBoolean(cur_region, "is_ro", &is_ro[index])) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
u32 capability = 0x3FF;
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
capability |= ((regions[i] & 0x3F) | ((is_ro[i] & 1) << 6)) << (11 + 7 * i);
|
||||
}
|
||||
kip_hdr->Capabilities[cur_cap++] = capability;
|
||||
} else if (!strcmp(type_str, "irq_pair")) {
|
||||
if (cur_cap + 1 > 0x20) {
|
||||
fprintf(stderr, "Error: Too many capabilities!\n");
|
||||
@ -554,7 +477,6 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
}
|
||||
int allow_debug = 0;
|
||||
int force_debug = 0;
|
||||
int force_debug_prod = 0;
|
||||
if (!cJSON_GetBoolean(value, "allow_debug", &allow_debug)) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
@ -563,11 +485,7 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
if (!cJSON_GetBoolean(value, "force_debug_prod", &force_debug_prod)) {
|
||||
status = 0;
|
||||
goto PARSE_CAPS_END;
|
||||
}
|
||||
desc = (allow_debug & 1) | ((force_debug_prod & 1) << 1) | ((force_debug & 1) << 2);
|
||||
desc = (allow_debug & 1) | ((force_debug & 1) << 1);
|
||||
kip_hdr->Capabilities[cur_cap++] = (u32)((desc << 17) | (0xFFFF));
|
||||
} else {
|
||||
fprintf(stderr, "Error: unknown capability %s\n", type_str);
|
||||
@ -594,7 +512,7 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
KipHeader kip_hdr = {0};
|
||||
memcpy(kip_hdr.Magic, "KIP1", 4);
|
||||
kip_hdr.Flags = 0x7F;
|
||||
kip_hdr.Flags = 0x3F;
|
||||
|
||||
if (sizeof(KipHeader) != 0x100) {
|
||||
fprintf(stderr, "Bad compile environment!\n");
|
||||
|
||||
@ -8,6 +8,10 @@
|
||||
#include "elf64.h"
|
||||
#include "romfs.h"
|
||||
|
||||
typedef uint64_t u64;
|
||||
typedef uint32_t u32;
|
||||
typedef uint8_t u8;
|
||||
|
||||
typedef struct {
|
||||
u32 FileOff;
|
||||
u32 Size;
|
||||
@ -21,9 +25,9 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
u8 Magic[4];
|
||||
u32 version;
|
||||
u32 Unk1;
|
||||
u32 size;
|
||||
u32 flags;
|
||||
u32 Unk2;
|
||||
NsoSegment Segments[3];
|
||||
u32 bssSize;
|
||||
u32 Unk3;
|
||||
@ -78,7 +82,6 @@ int main(int argc, char* argv[]) {
|
||||
fprintf(stderr, "--nacp=<control.nacp> Embeds control.nacp into the output file.\n");
|
||||
fprintf(stderr, "--romfs=<image> Embeds RomFS into the output file.\n");
|
||||
fprintf(stderr, "--romfsdir=<directory> Builds and embeds RomFS into the output file.\n");
|
||||
fprintf(stderr, "--alignedheader Sets the \"AlignedHeader\" flag in the output file.\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@ -103,13 +106,11 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
int argi;
|
||||
char* icon_path = NULL, *nacp_path = NULL, *romfs_path = NULL, *romfs_dir_path = NULL;
|
||||
u32 aligned_header = 0;
|
||||
for (argi=3; argi<argc; argi++) {
|
||||
if (strncmp(argv[argi], "--icon=", 7)==0) icon_path = &argv[argi][7];
|
||||
if (strncmp(argv[argi], "--nacp=", 7)==0) nacp_path = &argv[argi][7];
|
||||
if (strncmp(argv[argi], "--romfs=", 8)==0) romfs_path = &argv[argi][8];
|
||||
if (strncmp(argv[argi], "--romfsdir=", 11)==0) romfs_dir_path = &argv[argi][11];
|
||||
if (strncmp(argv[argi], "--alignedheader", 15)==0) aligned_header = 1;
|
||||
}
|
||||
|
||||
if (romfs_dir_path != NULL && romfs_path != NULL) {
|
||||
@ -212,9 +213,6 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
nro_hdr.size = file_off;
|
||||
|
||||
nro_hdr.version = 0;
|
||||
nro_hdr.flags = (aligned_header << 0);
|
||||
|
||||
// TODO check retvals
|
||||
|
||||
for (i=0; i<3; i++)
|
||||
|
||||
148
src/npdmtool.c
148
src/npdmtool.c
@ -45,7 +45,7 @@ typedef struct {
|
||||
typedef struct {
|
||||
u32 Magic;
|
||||
u8 _0x4[0xC];
|
||||
u64 ProgramId;
|
||||
u64 TitleId;
|
||||
u64 _0x18;
|
||||
u32 FahOffset;
|
||||
u32 FahSize;
|
||||
@ -63,8 +63,8 @@ typedef struct {
|
||||
u32 Size;
|
||||
u32 _0x208;
|
||||
u32 Flags;
|
||||
u64 ProgramIdRangeMin;
|
||||
u64 ProgramIdRangeMax;
|
||||
u64 TitleIdRangeMin;
|
||||
u64 TitleIdRangeMax;
|
||||
u32 FacOffset;
|
||||
u32 FacSize;
|
||||
u32 SacOffset;
|
||||
@ -76,7 +76,7 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
u32 Magic;
|
||||
u32 SignatureKeyGeneration;
|
||||
u32 _0x4;
|
||||
u32 _0x8;
|
||||
u8 MmuFlags;
|
||||
u8 _0xD;
|
||||
@ -84,7 +84,7 @@ typedef struct {
|
||||
u8 DefaultCpuId;
|
||||
u32 _0x10;
|
||||
u32 SystemResourceSize;
|
||||
u32 Version;
|
||||
u32 ProcessCategory;
|
||||
u32 MainThreadStackSize;
|
||||
char Name[0x10];
|
||||
char ProductCode[0x10];
|
||||
@ -345,11 +345,10 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
|
||||
cJSON_GetU32(npdm_json, "system_resource_size", &header.SystemResourceSize); // optional
|
||||
|
||||
/* Get version (deprecated name "process_category"). */
|
||||
if (!cJSON_GetU32(npdm_json, "version", &header.Version) && !cJSON_GetU32(npdm_json, "process_category", &header.Version)) { // optional
|
||||
header.Version = 0;
|
||||
if (!cJSON_GetU8(npdm_json, "process_category", (u8 *)&header.ProcessCategory)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
if (!cJSON_GetU8(npdm_json, "address_space_type", (u8 *)&header.MmuFlags)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
@ -363,33 +362,6 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
}
|
||||
header.MmuFlags |= is_64_bit;
|
||||
|
||||
int optimize_memory_allocation; // optional
|
||||
if (cJSON_GetBoolean(npdm_json, "optimize_memory_allocation", &optimize_memory_allocation)) {
|
||||
header.MmuFlags |= ((optimize_memory_allocation & 1) << 4);
|
||||
}
|
||||
|
||||
int disable_device_address_space_merge; // optional
|
||||
if (cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) {
|
||||
header.MmuFlags |= ((disable_device_address_space_merge & 1) << 5);
|
||||
}
|
||||
|
||||
int enable_alias_region_extra_size; // optional
|
||||
if (cJSON_GetBoolean(npdm_json, "enable_alias_region_extra_size", &enable_alias_region_extra_size)) {
|
||||
header.MmuFlags |= ((enable_alias_region_extra_size & 1) << 6);
|
||||
}
|
||||
|
||||
int prevent_code_reads; // optional
|
||||
if (cJSON_GetBoolean(npdm_json, "prevent_code_reads", &prevent_code_reads)) {
|
||||
header.MmuFlags |= ((prevent_code_reads & 1) << 7);
|
||||
}
|
||||
|
||||
u8 signature_key_generation; // optional
|
||||
if (cJSON_GetU8(npdm_json, "signature_key_generation", &signature_key_generation)) {
|
||||
header.SignatureKeyGeneration = signature_key_generation;
|
||||
} else {
|
||||
header.SignatureKeyGeneration = 0;
|
||||
}
|
||||
|
||||
/* ACID. */
|
||||
memset(acid->Signature, 0, sizeof(acid->Signature));
|
||||
memset(acid->Modulus, 0, sizeof(acid->Modulus));
|
||||
@ -407,19 +379,19 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
}
|
||||
acid->Flags |= (pool_partition & 3) << 2;
|
||||
|
||||
if (!cJSON_GetU64(npdm_json, "program_id_range_min", &acid->ProgramIdRangeMin) && !cJSON_GetU64(npdm_json, "title_id_range_min", &acid->ProgramIdRangeMin)) {
|
||||
if (!cJSON_GetU64(npdm_json, "title_id_range_min", &acid->TitleIdRangeMin)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
if (!cJSON_GetU64(npdm_json, "program_id_range_max", &acid->ProgramIdRangeMax) && !cJSON_GetU64(npdm_json, "title_id_range_max", &acid->ProgramIdRangeMax)) {
|
||||
if (!cJSON_GetU64(npdm_json, "title_id_range_max", &acid->TitleIdRangeMax)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
/* ACI0. */
|
||||
aci0->Magic = MAGIC_ACI0; /* "ACI0" */
|
||||
/* Parse program_id (or deprecated title_id). */
|
||||
if (!cJSON_GetU64(npdm_json, "program_id", &aci0->ProgramId) && !cJSON_GetU64(npdm_json, "title_id", &aci0->ProgramId)) {
|
||||
/* Parse title_id. */
|
||||
if (!cJSON_GetU64(npdm_json, "title_id", &aci0->TitleId)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
@ -481,33 +453,18 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
sdois = cJSON_GetObjectItemCaseSensitive(fsaccess, "save_data_owner_ids");
|
||||
if (cJSON_IsArray(sdois)) {
|
||||
u32 *count = (u32 *)((u8 *)fah + fah->SdoiOffset);
|
||||
u64 *id = (u64 *)((u8 *)count + sizeof(u32));
|
||||
cJSON_ArrayForEach(sdoi, sdois) {
|
||||
if (!cJSON_IsObject(sdoi)) {
|
||||
if (!cJSON_GetU64FromObjectValue(sdoi, id)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
++id;
|
||||
++(*count);
|
||||
}
|
||||
|
||||
u8 *accessibility = (u8 *)count + sizeof(u32);
|
||||
u64 *id = (u64 *)(accessibility + (((*count) + 3ULL) & ~3ULL));
|
||||
|
||||
cJSON_ArrayForEach(sdoi, sdois) {
|
||||
if (!cJSON_GetU8(sdoi, "accessibility", accessibility)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
if (!cJSON_GetU64(sdoi, "id", id)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
++accessibility;
|
||||
++id;
|
||||
}
|
||||
|
||||
if (*count > 0) {
|
||||
fah->SdoiSize = sizeof(u32) + sizeof(u8) * ((((*count) + 3ULL) & ~3ULL)) + sizeof(u64) * (*count);
|
||||
fah->SdoiSize = sizeof(u32) + sizeof(u64) * (*count);
|
||||
}
|
||||
}
|
||||
|
||||
@ -656,17 +613,13 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
u8 real_highest_prio = (lowest_prio < highest_prio) ? lowest_prio : highest_prio;
|
||||
u8 real_lowest_prio = (lowest_prio > highest_prio) ? lowest_prio : highest_prio;
|
||||
|
||||
desc = highest_cpu;
|
||||
desc <<= 8;
|
||||
desc |= lowest_cpu;
|
||||
desc <<= 6;
|
||||
desc |= (real_highest_prio & 0x3F);
|
||||
desc |= (lowest_prio & 0x3F);
|
||||
desc <<= 6;
|
||||
desc |= (real_lowest_prio & 0x3F);
|
||||
desc |= (highest_prio & 0x3F);
|
||||
caps[cur_cap++] = (u32)((desc << 4) | (0x0007));
|
||||
} else if (!strcmp(type_str, "syscalls")) {
|
||||
if (!cJSON_IsObject(value)) {
|
||||
@ -675,7 +628,7 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
u32 num_descriptors;
|
||||
u32 descriptors[8] = {0}; /* alignup(0xC0/0x18); */
|
||||
u32 descriptors[6] = {0}; /* alignup(0x80/0x18); */
|
||||
char field_name[8] = {0};
|
||||
const cJSON *cur_syscall = NULL;
|
||||
u64 syscall_value = 0;
|
||||
@ -688,14 +641,14 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
if (syscall_value >= 0xC0) {
|
||||
fprintf(stderr, "Error: All syscall entries must be numbers in [0, 0xBF]\n");
|
||||
if (syscall_value >= 0x80) {
|
||||
fprintf(stderr, "Error: All syscall entries must be numbers in [0, 0x7F]\n");
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
descriptors[syscall_value / 0x18] |= (1UL << (syscall_value % 0x18));
|
||||
}
|
||||
for (unsigned int i = 0; i < 8; i++) {
|
||||
for (unsigned int i = 0; i < 6; i++) {
|
||||
if (descriptors[i]) {
|
||||
desc = descriptors[i] | (i << 24);
|
||||
caps[cur_cap++] = (u32)((desc << 5) | (0x000F));
|
||||
@ -722,8 +675,7 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
desc |= is_ro << 24;
|
||||
caps[cur_cap++] = (u32)((desc << 7) | (0x003F));
|
||||
|
||||
desc = (u32)((map_size >> 12) & 0x000FFFFFULL);
|
||||
desc |= (u32)(((map_address >> 36) & 0xFULL) << 20);
|
||||
desc = (u32)((map_size >> 12) & 0x00FFFFFFULL);
|
||||
is_io ^= 1;
|
||||
desc |= is_io << 24;
|
||||
caps[cur_cap++] = (u32)((desc << 7) | (0x003F));
|
||||
@ -735,47 +687,6 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
}
|
||||
desc = (u32)((page_address >> 12) & 0x00FFFFFFULL);
|
||||
caps[cur_cap++] = (u32)((desc << 8) | (0x007F));
|
||||
} else if (!strcmp(type_str, "map_region")) {
|
||||
if (cur_cap + 1 > 0x20) {
|
||||
fprintf(stderr, "Error: Too many capabilities!\n");
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
if (!cJSON_IsArray(value)) {
|
||||
fprintf(stderr, "Map Region capability value must be array!\n");
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
u8 regions[3] = {0};
|
||||
int is_ro[3] = {0};
|
||||
const cJSON *cur_region = NULL;
|
||||
int index = 0;
|
||||
cJSON_ArrayForEach(cur_region, value) {
|
||||
if (index >= 3) {
|
||||
fprintf(stderr, "Too many region descriptors!\n");
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
if (!cJSON_IsObject(cur_region)) {
|
||||
fprintf(stderr, "Region descriptor value must be object!\n");
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
if (!cJSON_GetU8(cur_region, "region_type", ®ions[index]) ||
|
||||
!cJSON_GetBoolean(cur_region, "is_ro", &is_ro[index])) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
u32 capability = 0x3FF;
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
capability |= ((regions[i] & 0x3F) | ((is_ro[i] & 1) << 6)) << (11 + 7 * i);
|
||||
}
|
||||
caps[cur_cap++] = capability;
|
||||
} else if (!strcmp(type_str, "irq_pair")) {
|
||||
if (!cJSON_IsArray(value) || cJSON_GetArraySize(value) != 2) {
|
||||
fprintf(stderr, "Error: IRQ Pairs must have size 2 array value.\n");
|
||||
@ -829,16 +740,15 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) {
|
||||
}
|
||||
int allow_debug = 0;
|
||||
int force_debug = 0;
|
||||
int force_debug_prod = 0;
|
||||
cJSON_GetBoolean(value, "allow_debug", &allow_debug);
|
||||
cJSON_GetBoolean(value, "force_debug", &force_debug);
|
||||
cJSON_GetBoolean(value, "force_debug_prod", &force_debug_prod);
|
||||
if ( allow_debug + force_debug + force_debug_prod > 1 ) {
|
||||
fprintf(stderr, "Only one of allow_debug, force_debug, or force_debug_prod can be set!\n");
|
||||
if (!cJSON_GetBoolean(value, "allow_debug", &allow_debug)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
desc = (allow_debug & 1) | ((force_debug_prod & 1) << 1) | ((force_debug & 1) << 2);
|
||||
if (!cJSON_GetBoolean(value, "force_debug", &force_debug)) {
|
||||
status = 0;
|
||||
goto NPDM_BUILD_END;
|
||||
}
|
||||
desc = (allow_debug & 1) | ((force_debug & 1) << 1);
|
||||
caps[cur_cap++] = (u32)((desc << 17) | (0xFFFF));
|
||||
}
|
||||
}
|
||||
|
||||
374
src/nxlink.c
374
src/nxlink.c
@ -14,21 +14,11 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#include <poll.h>
|
||||
#define closesocket close
|
||||
#else
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
typedef int socklen_t;
|
||||
typedef uint32_t in_addr_t;
|
||||
#define SHUT_RD SD_RECEIVE
|
||||
#define SHUT_WR SD_SEND
|
||||
#define SHUT_RDWR SD_BOTH
|
||||
#ifdef EWOULDBLOCK
|
||||
#undef EWOULDBLOCK
|
||||
#endif
|
||||
#define EWOULDBLOCK WSAEWOULDBLOCK
|
||||
#define poll WSAPoll
|
||||
#endif
|
||||
|
||||
#include <zlib.h>
|
||||
@ -40,19 +30,22 @@ typedef uint32_t in_addr_t;
|
||||
#define NETLOADER_CLIENT_PORT 28771
|
||||
|
||||
|
||||
static char cmdbuf[3072];
|
||||
static uint32_t cmdlen=0;
|
||||
char cmdbuf[3072];
|
||||
uint32_t cmdlen=0;
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static void shutdownSocket(int socket, int flags) {
|
||||
void shutdownSocket(int socket) {
|
||||
//---------------------------------------------------------------------------------
|
||||
if (flags)
|
||||
shutdown(socket, flags);
|
||||
#ifdef __WIN32__
|
||||
shutdown (socket, SD_SEND);
|
||||
closesocket (socket);
|
||||
#else
|
||||
close(socket);
|
||||
#endif
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int setSocketNonblocking(int sock) {
|
||||
static int set_socket_nonblocking(int sock) {
|
||||
//---------------------------------------------------------------------------------
|
||||
|
||||
#ifndef __WIN32__
|
||||
@ -63,72 +56,74 @@ static int setSocketNonblocking(int sock) {
|
||||
int rc = fcntl(sock, F_SETFL, flags | O_NONBLOCK);
|
||||
|
||||
if(rc != 0) return -1;
|
||||
|
||||
#else
|
||||
u_long iMode = 1; // non-blocking
|
||||
|
||||
int rc = ioctlsocket(sock, FIONBIO, &iMode);
|
||||
|
||||
if (rc != NO_ERROR) return -1;
|
||||
u_long opt = 1;
|
||||
ioctlsocket(sock, FIONBIO, &opt);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int socketError(const char *msg) {
|
||||
//---------------------------------------------------------------------------------
|
||||
void socket_error(const char *msg) {
|
||||
#ifndef _WIN32
|
||||
int ret = errno;
|
||||
if (ret == EAGAIN)
|
||||
ret = EWOULDBLOCK;
|
||||
perror(msg);
|
||||
#else
|
||||
int ret = WSAGetLastError();
|
||||
wchar_t *s = NULL;
|
||||
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||
NULL, ret,
|
||||
NULL, WSAGetLastError(),
|
||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||
(LPWSTR)&s, 0, NULL);
|
||||
fprintf(stderr, "%S\n", s);
|
||||
LocalFree(s);
|
||||
if (ret == WSAEWOULDBLOCK)
|
||||
ret = EWOULDBLOCK;
|
||||
#endif
|
||||
}
|
||||
|
||||
return ret;
|
||||
/*---------------------------------------------------------------------------------
|
||||
Subtract the `struct timeval' values Y from X,
|
||||
storing the result in RESULT.
|
||||
Return 1 if the difference is negative, otherwise 0.
|
||||
|
||||
From http://www.gnu.org/software/libtool/manual/libc/Elapsed-Time.html
|
||||
---------------------------------------------------------------------------------*/
|
||||
int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y) {
|
||||
//---------------------------------------------------------------------------------
|
||||
struct timeval tmp;
|
||||
tmp.tv_sec = y->tv_sec;
|
||||
tmp.tv_usec = y->tv_usec;
|
||||
|
||||
/* Perform the carry for the later subtraction by updating y. */
|
||||
if (x->tv_usec < tmp.tv_usec) {
|
||||
int nsec = (tmp.tv_usec - x->tv_usec) / 1000000 + 1;
|
||||
tmp.tv_usec -= 1000000 * nsec;
|
||||
tmp.tv_sec += nsec;
|
||||
}
|
||||
|
||||
if (x->tv_usec - tmp.tv_usec > 1000000) {
|
||||
int nsec = (x->tv_usec - tmp.tv_usec) / 1000000;
|
||||
tmp.tv_usec += 1000000 * nsec;
|
||||
tmp.tv_sec -= nsec;
|
||||
}
|
||||
|
||||
/* Compute the time remaining to wait.
|
||||
tv_usec is certainly positive. */
|
||||
result->tv_sec = x->tv_sec - tmp.tv_sec;
|
||||
result->tv_usec = x->tv_usec - tmp.tv_usec;
|
||||
|
||||
/* Return 1 if result is negative. */
|
||||
return x->tv_sec < tmp.tv_sec;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
int pollSocket(int fd, int events, int timeout) {
|
||||
void timeval_add (struct timeval *result, struct timeval *x, struct timeval *y) {
|
||||
//---------------------------------------------------------------------------------
|
||||
#ifndef __WIN32__
|
||||
struct pollfd pfd;
|
||||
#else
|
||||
WSAPOLLFD pfd;
|
||||
#endif
|
||||
result->tv_sec = x->tv_sec + y->tv_sec;
|
||||
result->tv_usec = x->tv_usec + y->tv_usec;
|
||||
|
||||
pfd.fd = fd;
|
||||
pfd.events = events;
|
||||
pfd.revents = 0;
|
||||
|
||||
int ret = poll(&pfd, 1, timeout);
|
||||
if (ret < 0) {
|
||||
socketError("poll");
|
||||
return -1;
|
||||
if ( result->tv_usec > 1000000) {
|
||||
result->tv_sec += result->tv_usec / 1000000;
|
||||
result->tv_usec = result->tv_usec % 1000000;
|
||||
}
|
||||
|
||||
if (ret == 0)
|
||||
return -1;
|
||||
|
||||
if (!(pfd.revents & events)) {
|
||||
int err = 0;
|
||||
int len = sizeof(err);
|
||||
getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&err, &len);
|
||||
fprintf(stderr, "socket error 0x%x on poll\n", err);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
@ -142,7 +137,7 @@ static struct in_addr findSwitch(int retries) {
|
||||
char mess[] = "nxboot";
|
||||
|
||||
int broadcastSock = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
if (broadcastSock < 0) socketError("create send socket");
|
||||
if(broadcastSock < 0) socket_error("create send socket");
|
||||
|
||||
int optval = 1, len;
|
||||
setsockopt(broadcastSock, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval));
|
||||
@ -159,16 +154,25 @@ static struct in_addr findSwitch(int retries) {
|
||||
|
||||
int recvSock = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
|
||||
if (recvSock < 0) socketError("create receive socket");
|
||||
if (recvSock < 0) socket_error("create receive socket");
|
||||
|
||||
if (bind(recvSock, (struct sockaddr*) &rs, sizeof(rs)) < 0) socketError("bind receive socket");
|
||||
setSocketNonblocking(recvSock);
|
||||
if(bind(recvSock, (struct sockaddr*) &rs, sizeof(rs)) < 0) socket_error("bind receive socket");
|
||||
set_socket_nonblocking(recvSock);
|
||||
|
||||
while (retries) {
|
||||
if (sendto(broadcastSock, mess, strlen(mess), 0, (struct sockaddr *)&s, sizeof(s)) < 0)
|
||||
socketError("sendto");
|
||||
struct timeval wanted, now, result;
|
||||
|
||||
if (pollSocket(recvSock, POLLIN, 150) == 0) {
|
||||
gettimeofday(&wanted, NULL);
|
||||
|
||||
int timeout = retries;
|
||||
while(timeout) {
|
||||
gettimeofday(&now, NULL);
|
||||
if ( timeval_subtract(&result,&wanted,&now)) {
|
||||
if(sendto(broadcastSock, mess, strlen(mess), 0, (struct sockaddr *)&s, sizeof(s)) < 0) socket_error("sendto");
|
||||
result.tv_sec=0;
|
||||
result.tv_usec=150000;
|
||||
timeval_add(&wanted,&now,&result);
|
||||
timeout--;
|
||||
}
|
||||
socklen_t socklen = sizeof(remote);
|
||||
len = recvfrom(recvSock,recvbuf,sizeof(recvbuf),0,(struct sockaddr *)&remote,&socklen);
|
||||
if ( len != -1) {
|
||||
@ -177,71 +181,75 @@ static struct in_addr findSwitch(int retries) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
--retries;
|
||||
}
|
||||
|
||||
if (retries == 0)
|
||||
remote.sin_addr.s_addr = INADDR_NONE;
|
||||
|
||||
shutdownSocket(broadcastSock, 0);
|
||||
shutdownSocket(recvSock, SHUT_RD);
|
||||
|
||||
if (timeout == 0) remote.sin_addr.s_addr = INADDR_NONE;
|
||||
shutdownSocket(broadcastSock);
|
||||
shutdownSocket(recvSock);
|
||||
return remote.sin_addr;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int sendData(int sock, int sendsize, void *buffer) {
|
||||
int sendData(int sock, int sendsize, void *buffer) {
|
||||
//---------------------------------------------------------------------------------
|
||||
char *buf = (char*)buffer;
|
||||
while(sendsize) {
|
||||
if (pollSocket(sock, POLLOUT, -1))
|
||||
return 1;
|
||||
|
||||
int len = send(sock, buf, sendsize, 0);
|
||||
if (len == 0)
|
||||
return 1;
|
||||
|
||||
if (len == -1) {
|
||||
if (socketError("send") != EWOULDBLOCK)
|
||||
return 1;
|
||||
} else {
|
||||
if (len == 0) break;
|
||||
if (len != -1) {
|
||||
sendsize -= len;
|
||||
buf += len;
|
||||
} else {
|
||||
#ifdef _WIN32
|
||||
int errcode = WSAGetLastError();
|
||||
if (errcode != WSAEWOULDBLOCK) {
|
||||
socket_error("sendData");
|
||||
break;
|
||||
}
|
||||
#else
|
||||
if ( errno != EWOULDBLOCK && errno != EAGAIN) {
|
||||
socket_error("sendData");
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
return sendsize != 0;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int recvData(int sock, void *buffer, int size, int flags) {
|
||||
int recvData(int sock, void *buffer, int size, int flags) {
|
||||
//---------------------------------------------------------------------------------
|
||||
int len, sizeleft = size;
|
||||
char *buf = (char*)buffer;
|
||||
while (sizeleft) {
|
||||
if (pollSocket(sock, POLLIN, -1))
|
||||
return 0;
|
||||
|
||||
len = recv(sock,buf,sizeleft,flags);
|
||||
if (len == 0)
|
||||
return 0;
|
||||
|
||||
if (len == -1) {
|
||||
if (socketError("recv") != EWOULDBLOCK)
|
||||
return 0;
|
||||
} else {
|
||||
if (len == 0) {
|
||||
size = 0;
|
||||
break;
|
||||
}
|
||||
if (len != -1) {
|
||||
sizeleft -=len;
|
||||
buf +=len;
|
||||
} else {
|
||||
#ifdef _WIN32
|
||||
int errcode = WSAGetLastError();
|
||||
if (errcode != WSAEWOULDBLOCK) {
|
||||
printf("recvdata error %d\n",errcode);
|
||||
break;
|
||||
}
|
||||
#else
|
||||
if ( errno != EWOULDBLOCK && errno != EAGAIN) {
|
||||
socket_error("recvdata");
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int sendInt32LE(int socket, uint32_t size) {
|
||||
int sendInt32LE(int socket, uint32_t size) {
|
||||
//---------------------------------------------------------------------------------
|
||||
unsigned char lenbuf[4];
|
||||
lenbuf[0] = size & 0xff;
|
||||
@ -253,7 +261,7 @@ static int sendInt32LE(int socket, uint32_t size) {
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int recvInt32LE(int socket, int32_t *data) {
|
||||
int recvInt32LE(int socket, int32_t *data) {
|
||||
//---------------------------------------------------------------------------------
|
||||
unsigned char intbuf[4];
|
||||
int len = recvData(socket,intbuf,4,0);
|
||||
@ -264,13 +272,14 @@ static int recvInt32LE(int socket, int32_t *data) {
|
||||
}
|
||||
|
||||
return -1;
|
||||
|
||||
}
|
||||
|
||||
static unsigned char in[ZLIB_CHUNK];
|
||||
static unsigned char out[ZLIB_CHUNK];
|
||||
unsigned char in[ZLIB_CHUNK];
|
||||
unsigned char out[ZLIB_CHUNK];
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh) {
|
||||
int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh) {
|
||||
//---------------------------------------------------------------------------------
|
||||
|
||||
int retval = 0;
|
||||
@ -288,7 +297,7 @@ static int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh)
|
||||
|
||||
int sock = socket(AF_INET,SOCK_STREAM,0);
|
||||
if (sock < 0) {
|
||||
socketError("create connection socket");
|
||||
socket_error("create connection socket");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -412,12 +421,12 @@ static int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh)
|
||||
}
|
||||
|
||||
error:
|
||||
shutdownSocket(sock, SHUT_WR);
|
||||
shutdownSocket(sock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static void showHelp() {
|
||||
void showHelp() {
|
||||
//---------------------------------------------------------------------------------
|
||||
puts("Usage: nxlink [options] nrofile\n");
|
||||
puts("--help, -h Display this information");
|
||||
@ -431,7 +440,7 @@ static void showHelp() {
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
static int addExtraArgs(int len, char *buf, char *extra_args) {
|
||||
int add_extra_args(int len, char *buf, char *extra_args) {
|
||||
//---------------------------------------------------------------------------------
|
||||
|
||||
if (NULL==extra_args) return len;
|
||||
@ -476,12 +485,6 @@ static int addExtraArgs(int len, char *buf, char *extra_args) {
|
||||
|
||||
#define NRO_ARGS 1000
|
||||
|
||||
#ifdef __WIN32__
|
||||
static void win32_socket_cleanup(void) {
|
||||
WSACleanup();
|
||||
}
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
int main(int argc, char **argv) {
|
||||
//---------------------------------------------------------------------------------
|
||||
@ -495,7 +498,7 @@ int main(int argc, char **argv) {
|
||||
|
||||
if (argc < 2) {
|
||||
showHelp();
|
||||
return EXIT_FAILURE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
while(1) {
|
||||
@ -540,7 +543,7 @@ int main(int argc, char **argv) {
|
||||
break;
|
||||
case 'h':
|
||||
showHelp();
|
||||
return EXIT_FAILURE;
|
||||
return 1;
|
||||
case NRO_ARGS:
|
||||
extra_args=optarg;
|
||||
break;
|
||||
@ -551,7 +554,7 @@ int main(int argc, char **argv) {
|
||||
char *filename = argv[optind++];
|
||||
if (filename== NULL) {
|
||||
showHelp();
|
||||
return EXIT_FAILURE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
memset(cmdbuf, '\0', sizeof(cmdbuf));
|
||||
@ -559,7 +562,7 @@ int main(int argc, char **argv) {
|
||||
FILE *fh = fopen(filename,"rb");
|
||||
if (fh == NULL) {
|
||||
fprintf(stderr,"Failed to open %s\n",filename);
|
||||
return EXIT_FAILURE;
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
@ -601,7 +604,7 @@ int main(int argc, char **argv) {
|
||||
cmdlen+= len + 1;
|
||||
}
|
||||
|
||||
cmdlen = addExtraArgs(cmdlen, &cmdbuf[4], extra_args);
|
||||
cmdlen = add_extra_args(cmdlen, &cmdbuf[4], extra_args);
|
||||
|
||||
cmdbuf[0] = cmdlen & 0xff;
|
||||
cmdbuf[1] = (cmdlen>>8) & 0xff;
|
||||
@ -612,9 +615,8 @@ int main(int argc, char **argv) {
|
||||
WSADATA wsa_data;
|
||||
if (WSAStartup (MAKEWORD(2,2), &wsa_data)) {
|
||||
printf ("WSAStartup failed\n");
|
||||
return EXIT_FAILURE;
|
||||
return 1;
|
||||
}
|
||||
atexit(&win32_socket_cleanup);
|
||||
#endif
|
||||
|
||||
struct in_addr nxaddr;
|
||||
@ -625,7 +627,7 @@ int main(int argc, char **argv) {
|
||||
|
||||
if (nxaddr.s_addr == INADDR_NONE) {
|
||||
printf("No response from Switch!\n");
|
||||
return EXIT_FAILURE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
} else {
|
||||
@ -638,19 +640,14 @@ int main(int argc, char **argv) {
|
||||
|
||||
if (nxaddr.s_addr == INADDR_NONE) {
|
||||
fprintf(stderr,"Invalid address\n");
|
||||
return EXIT_FAILURE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int res = sendNROFile(nxaddr.s_addr,finalpath,filesize,fh);
|
||||
|
||||
fclose(fh);
|
||||
|
||||
if (res != 0)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
if (!server)
|
||||
return EXIT_SUCCESS;
|
||||
|
||||
if ( res == 0 && server) {
|
||||
printf("starting server\n");
|
||||
|
||||
struct sockaddr_in serv_addr;
|
||||
@ -661,74 +658,97 @@ int main(int argc, char **argv) {
|
||||
serv_addr.sin_port = htons(NETLOADER_CLIENT_PORT);
|
||||
|
||||
int listenfd = socket(AF_INET, SOCK_STREAM, 0);
|
||||
int rc;
|
||||
|
||||
if(listenfd < 0) {
|
||||
socketError("socket");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
socket_error("socket");
|
||||
} else {
|
||||
|
||||
rc = bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr));
|
||||
|
||||
int rc = bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr));
|
||||
if(rc != 0) {
|
||||
socketError("bind listen socket");
|
||||
shutdownSocket(listenfd, 0);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
rc = setSocketNonblocking(listenfd);
|
||||
if (rc == -1) {
|
||||
socketError("listen fcntl");
|
||||
shutdownSocket(listenfd, 0);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
socket_error("bind listen socket");
|
||||
} else {
|
||||
if (set_socket_nonblocking(listenfd) == -1) {
|
||||
socket_error("listen fcntl");
|
||||
|
||||
} else {
|
||||
rc = listen(listenfd, 10);
|
||||
if (rc != 0) {
|
||||
socketError("listen");
|
||||
shutdownSocket(listenfd, 0);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if(rc != 0) {
|
||||
socket_error("listen");
|
||||
} else {
|
||||
printf("server active ...\n");
|
||||
|
||||
int datafd = -1;
|
||||
|
||||
while( listenfd != -1 || datafd != -1) {
|
||||
struct sockaddr_in sa_remote;
|
||||
|
||||
if (pollSocket(listenfd >= 0 ? listenfd : datafd, POLLIN, -1))
|
||||
break;
|
||||
|
||||
if (listenfd >= 0) {
|
||||
if(listenfd >= 0 && datafd < 0) {
|
||||
socklen_t addrlen = sizeof(sa_remote);
|
||||
datafd = accept(listenfd, (struct sockaddr*)&sa_remote, &addrlen);
|
||||
|
||||
if (datafd < 0 && socketError("accept") != EWOULDBLOCK)
|
||||
break;
|
||||
|
||||
if (datafd >= 0) {
|
||||
shutdownSocket(listenfd, 0);
|
||||
if(datafd < 0) {
|
||||
#ifdef _WIN32
|
||||
int errcode = WSAGetLastError();
|
||||
if (errcode != WSAEWOULDBLOCK) {
|
||||
socket_error("accept");
|
||||
listenfd = -1;
|
||||
}
|
||||
#else
|
||||
if ( errno != EWOULDBLOCK && errno != EAGAIN) {
|
||||
socket_error("accept");
|
||||
listenfd = -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
} else {
|
||||
shutdownSocket(listenfd);
|
||||
listenfd = -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(datafd >= 0) {
|
||||
char recvbuf[256];
|
||||
int len = recv(datafd, recvbuf, sizeof(recvbuf), 0);
|
||||
int len = recv(datafd,recvbuf,256,0);
|
||||
|
||||
if (len == 0 || (len < 0 && socketError("recv") != EWOULDBLOCK)) {
|
||||
shutdownSocket(datafd, 0);
|
||||
if (len > 0 ) {
|
||||
recvbuf[len] = 0;
|
||||
printf("%s", recvbuf);
|
||||
} else {
|
||||
|
||||
if (len == -1) {
|
||||
#ifdef _WIN32
|
||||
int errcode = WSAGetLastError();
|
||||
if (errcode != WSAEWOULDBLOCK) {
|
||||
socket_error("recvdata");
|
||||
len = 0;
|
||||
}
|
||||
#else
|
||||
if ( errno != EWOULDBLOCK && errno != EAGAIN) {
|
||||
perror("recvdata");
|
||||
len = 0;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
if (len ==0 ) {
|
||||
shutdownSocket(datafd);
|
||||
datafd = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (len > 0)
|
||||
fwrite(recvbuf, 1, len, stdout);
|
||||
}
|
||||
}
|
||||
|
||||
if (listenfd >= 0)
|
||||
shutdownSocket(listenfd, 0);
|
||||
if (datafd >= 0)
|
||||
shutdownSocket(datafd, SHUT_RD);
|
||||
|
||||
}
|
||||
}
|
||||
printf("exiting ... \n");
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __WIN32__
|
||||
WSACleanup ();
|
||||
#endif
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
20
src/romfs.c
20
src/romfs.c
@ -410,7 +410,9 @@ size_t build_romfs_into_file(filepath_t *in_dirpath, FILE *f_out, off_t base_off
|
||||
cur_entry->name_size = name_size;
|
||||
memcpy(cur_entry->name, cur_dir->cur_path.char_path + 1, name_size);
|
||||
|
||||
romfs_dirent_ctx_t *temp = cur_dir;
|
||||
cur_dir = cur_dir->next;
|
||||
free(temp);
|
||||
}
|
||||
|
||||
header.header_size = le_dword(sizeof(header));
|
||||
@ -472,27 +474,11 @@ size_t build_romfs_into_file(filepath_t *in_dirpath, FILE *f_out, off_t base_off
|
||||
|
||||
os_fclose(f_in);
|
||||
|
||||
cur_file = cur_file->next;
|
||||
}
|
||||
free(buffer);
|
||||
|
||||
/* Free all files. */
|
||||
cur_file = romfs_ctx.files;
|
||||
while (cur_file != NULL) {
|
||||
romfs_fent_ctx_t *temp = cur_file;
|
||||
cur_file = cur_file->next;
|
||||
free(temp);
|
||||
}
|
||||
romfs_ctx.files = NULL;
|
||||
|
||||
/* Free all directories. */
|
||||
cur_dir = root_ctx;
|
||||
while (cur_dir != NULL) {
|
||||
romfs_dirent_ctx_t *temp = cur_dir;
|
||||
cur_dir = cur_dir->next;
|
||||
free(temp);
|
||||
}
|
||||
root_ctx = NULL;
|
||||
free(buffer);
|
||||
|
||||
fseeko64(f_out, base_offset + dir_hash_table_ofs, SEEK_SET);
|
||||
if (fwrite(dir_hash_table, 1, romfs_ctx.dir_hash_table_size, f_out) != romfs_ctx.dir_hash_table_size) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user