mika/switch-tools
1
0
Fork 0
mirror of https://github.com/switchbrew/switch-tools.git synced 2025-06-29 00:42:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge ac7a769252 into 22756068dd

Browse Source
This commit is contained in:
noahc3 2024-10-23 22:03:54 +01:00 committed by GitHub
commit daab12e73a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nxlink.c
View File

@ -270,7 +270,7 @@ static unsigned char in[ZLIB_CHUNK];
static unsigned char out[ZLIB_CHUNK]; static unsigned char out[ZLIB_CHUNK];
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
static int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh) { static int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh, int port) {
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
int retval = 0; int retval = 0;
@ -295,7 +295,7 @@ static int sendNROFile(in_addr_t nxaddr, char *name, size_t filesize, FILE *fh)
struct sockaddr_in s; struct sockaddr_in s;
memset(&s, '\0', sizeof(struct sockaddr_in)); memset(&s, '\0', sizeof(struct sockaddr_in));
s.sin_family = AF_INET; s.sin_family = AF_INET;
s.sin_port = htons(NETLOADER_SERVER_PORT); s.sin_port = htons(port);
s.sin_addr.s_addr = nxaddr; s.sin_addr.s_addr = nxaddr;
if (connect(sock,(struct sockaddr *)&s,sizeof(s)) < 0) { if (connect(sock,(struct sockaddr *)&s,sizeof(s)) < 0) {
@ -422,6 +422,7 @@ static void showHelp() {
puts("Usage: nxlink [options] nrofile\n"); puts("Usage: nxlink [options] nrofile\n");
puts("--help, -h Display this information"); puts("--help, -h Display this information");
puts("--address, -a Hostname or IPv4 address of Switch"); puts("--address, -a Hostname or IPv4 address of Switch");
puts("--port, -z Port of Switch netloader server");
puts("--retries, -r number of times to ping before giving up"); puts("--retries, -r number of times to ping before giving up");
puts("--path , -p set upload path for file"); puts("--path , -p set upload path for file");
puts("--args args to send to nro"); puts("--args args to send to nro");
@ -488,6 +489,7 @@ int main(int argc, char **argv) {
char *address = NULL; char *address = NULL;
char *basepath = NULL; char *basepath = NULL;
char *finalpath = NULL; char *finalpath = NULL;
char *port = NULL;
char *endarg = NULL; char *endarg = NULL;
char *extra_args = NULL; char *extra_args = NULL;
int retries = 10; int retries = 10;
@ -503,6 +505,7 @@ int main(int argc, char **argv) {
{"address", required_argument, 0, 'a'}, {"address", required_argument, 0, 'a'},
{"retries", required_argument, 0, 'r'}, {"retries", required_argument, 0, 'r'},
{"path", required_argument, 0, 'p'}, {"path", required_argument, 0, 'p'},
{"port", required_argument, 0, 'z'},
{"args", required_argument, 0, NRO_ARGS}, {"args", required_argument, 0, NRO_ARGS},
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
{"server", no_argument, &server, 1 }, {"server", no_argument, &server, 1 },
@ -512,17 +515,19 @@ int main(int argc, char **argv) {
/* getopt_long stores the option index here. */ /* getopt_long stores the option index here. */
int option_index = 0, c; int option_index = 0, c;
c = getopt_long (argc, argv, "a:r:hp:s", long_options, &option_index); c = getopt_long (argc, argv, "a:z:r:hp:s", long_options, &option_index);
/* Detect the end of the options. */ /* Detect the end of the options. */
if (c == -1) if (c == -1)
break; break;
switch(c) { switch(c) {
case 'a': case 'a':
address = optarg; address = optarg;
break; break;
case 'z':
port = optarg;
break;
case 'r': case 'r':
errno = 0; errno = 0;
retries = strtoul(optarg, &endarg, 0); retries = strtoul(optarg, &endarg, 0);
@ -641,7 +646,12 @@ int main(int argc, char **argv) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
int res = sendNROFile(nxaddr.s_addr,finalpath,filesize,fh); int srvPort = NETLOADER_SERVER_PORT;
if (port != NULL) {
srvPort = atoi(port);
}
int res = sendNROFile(nxaddr.s_addr,finalpath,filesize,fh,srvPort);
fclose(fh); fclose(fh);