xan/patty
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make examples take callsign as local/remote address

Browse source
This commit is contained in:
XANTRONIX Development 2020-07-10 22:32:09 -04:00 • committed by XANTRONIX Industrial
parent 566f302a1f
commit d4e7933e6b
4 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/ax25dump.c
View file

@ -23,7 +23,7 @@ static void usage(int argc, char **argv, const char *message, ...) {
va_end(args); va_end(args);
} }
fprintf(stderr, "usage: %s /var/run/patty/patty.sock\n", argv[0]); fprintf(stderr, "usage: %s /var/run/patty/patty.sock localcall\n", argv[0]);
exit(1); exit(1);
} }
@ -43,11 +43,15 @@ int main(int argc, char **argv) {
patty_kiss_tnc *raw; patty_kiss_tnc *raw;
if (argc != 2) { if (argc < 2) {
usage(argc, argv, "No patty socket provided"); usage(argc, argv, "No patty socket provided");
} else if (argc < 3) {
usage(argc, argv, "No local callsign provided");
} else if (argc > 3) {
usage(argc, argv, "Too many arguments provided");
} }
patty_ax25_pton("KZ3ROX", 0, &peer); patty_ax25_pton(argv[2], 0, &peer);
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
fprintf(stderr, "%s: %s: %s: %s\n", fprintf(stderr, "%s: %s: %s: %s\n",

10
examples/connect.c
View file

@ -22,7 +22,7 @@ static void usage(int argc, char **argv, const char *message, ...) {
va_end(args); va_end(args);
} }
fprintf(stderr, "usage: %s /var/run/patty/patty.sock\n", argv[0]); fprintf(stderr, "usage: %s /var/run/patty/patty.sock remotecall\n", argv[0]);
exit(1); exit(1);
} }
@ -40,11 +40,15 @@ int main(int argc, char **argv) {
uint8_t buf[4096]; uint8_t buf[4096];
ssize_t readlen; ssize_t readlen;
if (argc != 2) { if (argc < 2) {
usage(argc, argv, "No patty socket provided"); usage(argc, argv, "No patty socket provided");
} else if (argc < 3) {
usage(argc, argv, "No remote callsign provided");
} else if (argc > 3) {
usage(argc, argv, "Too many arguments provided");
} }
patty_ax25_pton("KZ3ROX", 0, &peer); patty_ax25_pton(argv[2], 0, &peer);
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
fprintf(stderr, "%s: %s: %s: %s\n", fprintf(stderr, "%s: %s: %s: %s\n",

10
examples/listen.c
View file

@ -25,7 +25,7 @@ static void usage(int argc, char **argv, const char *message, ...) {
va_end(args); va_end(args);
} }
fprintf(stderr, "usage: %s /var/run/patty/patty.sock\n", argv[0]); fprintf(stderr, "usage: %s /var/run/patty/patty.sock localcall\n", argv[0]);
exit(1); exit(1);
} }
@ -43,11 +43,15 @@ int main(int argc, char **argv) {
char path[PATTY_AX25_SOCK_PATH_SIZE]; char path[PATTY_AX25_SOCK_PATH_SIZE];
if (argc != 2) { if (argc < 2) {
usage(argc, argv, "No patty socket provided"); usage(argc, argv, "No patty socket provided");
} else if (argc < 3) {
usage(argc, argv, "No local callsign provided");
} else if (argc > 3) {
usage(argc, argv, "Too many arguments provided");
} }
patty_ax25_pton("KZ3ROX", 0, &addr); patty_ax25_pton(argv[2], 0, &addr);
if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
fprintf(stderr, "%s: %s: %s: %s\n", fprintf(stderr, "%s: %s: %s: %s\n",

12
examples/server.c
View file

@ -22,7 +22,7 @@ static void usage(int argc, char **argv, const char *message, ...) {
va_end(args); va_end(args);
} }
fprintf(stderr, "usage: %s /dev/ttyXX|kiss.cap [path.sock]\n", argv[0]); fprintf(stderr, "usage: %s /dev/ttyXX|kiss.cap [path.sock] callsign\n", argv[0]);
exit(1); exit(1);
} }
@ -38,7 +38,11 @@ int main(int argc, char **argv) {
if (argc < 2) { if (argc < 2) {
usage(argc, argv, "No TNC device or KISS dump file provided"); usage(argc, argv, "No TNC device or KISS dump file provided");
} else if (argc > 3) { } else if (argc < 3) {
usage(argc, argv, "No socket path provided");
} else if (argc < 4) {
usage(argc, argv, "No station callsign provided");
} else if (argc > 4) {
usage(argc, argv, "Too many arguments provided"); usage(argc, argv, "Too many arguments provided");
} }
@ -81,9 +85,9 @@ int main(int argc, char **argv) {
errno = 0; errno = 0;
patty_ax25_pton("KZ3ROX", 0, &info.addr); patty_ax25_pton(argv[3], 0, &info.addr);
if ((server = patty_ax25_server_new(argc == 3? argv[2]: PATTY_AX25_SERVER_PATH)) == NULL) { if ((server = patty_ax25_server_new(argc >= 3? argv[2]: PATTY_AX25_SERVER_PATH)) == NULL) {
goto error_server_new; goto error_server_new;
} }