From 28d452f5b0992f3f46f3549db73561420e745fca Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Wed, 27 Jan 2021 21:26:06 +0000 Subject: [PATCH] New upstream version 2.13 --- CHANGES.3 | 30 +++++++++++ Makefile.in | 2 +- cmdparse.c | 4 +- command.c | 17 +++++-- configure | 4 +- jnos20k.diff | 130 ----------------------------------------------- man/flexd.conf.5 | 5 ++ node.h | 4 +- system.c | 10 ++-- 9 files changed, 61 insertions(+), 145 deletions(-) delete mode 100644 jnos20k.diff diff --git a/CHANGES.3 b/CHANGES.3 index e2b9e5f..08e8253 100644 --- a/CHANGES.3 +++ b/CHANGES.3 @@ -435,6 +435,36 @@ screens. I did this after noticing some other node softwares go to the extreme in showing stats that most end users would never understand nor even care about. This also saves a lot of bandwidth! +17/01/2020 v2.13 + +Changed the external command text to inform the end user that the escape +sequence (CTRL-T typically) is disabled while an external command is run. +I've been wanting to do this for a while to preserve integrity for the +user. This required an edit in cmdparse.c + +Edited node.h to reflect this version. + +Cleaned up the status command. Prior *any* single character would print the +long status report. Now either "l" OR "L" will be accepted. If another +character is pressed an error will display: +n1uro-15@n1uro.ampr.org:/uronode6: st s +Usage: status l OR status L + +** IMPORTANT ** +-= IF YOU DO NOT READ THIS YOU WILL APPEAR BROKEN =- +To be more compliant with downstreams I moved the files in /var/ax25/ +to now be looked for in /var/lib/ax25 which appears to be the new file +system ruleset by the linux gods. I did NOT make this up. I would *strongly* +urge you to copy over your current /var/ax25/node/* files after running +"make upgrade" unless you wish to start with a fresh system of sorts. +Your config files in etc/ax25 won't be moved or touched and the man +pages will remain where they are. Your help files, perhaps your ROSE +directory (if you use rose.hlp like I do), and user logs will be reset. +Users will be all considered new again so to prevent this from occurring +I would move those files over. + +73 - Enjoy. + ----------- Note on SystemD -------- In uronode.socket, you'll notice the line: ListenStream=0.0.0.0:3694 diff --git a/Makefile.in b/Makefile.in index a549299..2456c59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,7 +68,7 @@ installman: install -m 644 -p man/axdigi.8 $(MAN_DIR)/man8 install -m 644 -p man/flexd.8 $(MAN_DIR)/man8 -upgrade: installman installhelp +upgrade: installbin installman installhelp install -b -m 600 -p etc/uronode.announce $(ETC_DIR) install -m 755 -p uronode $(SBIN_DIR) install -m 755 -p nodeusers $(SBIN_DIR) diff --git a/cmdparse.c b/cmdparse.c index 4660bf3..722971a 100644 --- a/cmdparse.c +++ b/cmdparse.c @@ -244,9 +244,9 @@ int cmdparse(struct cmd *list, char *cmdline) axio_printf(NodeIo, "%s} ", NodeId); } if (check_perms(PERM_ANSI, 0L) != -1) { - axio_printf(NodeIo,"\e[01;32mExecuting command...\e[0m\n"); + axio_printf(NodeIo,"\e[01;32mExecuting command. Escape is disabled until command is done.\e[0m\n"); } else { - axio_puts("Executing command... \n", NodeIo); + axio_puts("Executing command. Escape is disabled until command is done. \n", NodeIo); } return extcmd(cmdp, argv); } diff --git a/command.c b/command.c index 7d5c4be..8e97154 100644 --- a/command.c +++ b/command.c @@ -801,7 +801,7 @@ int do_status(int argc, char **argv) if (check_perms(PERM_ANSI, 0L) != -1) { axio_printf(NodeIo, "\e[01;37m"); } - node_msg("Status report:"); + node_msg("Short Status report:"); if (check_perms(PERM_ANSI, 0L) != -1) { axio_printf(NodeIo, "\e[0;m"); } @@ -829,7 +829,7 @@ int do_status(int argc, char **argv) return 0; } /* "Status L" */ - if (argc == 2) { + if ((*argv[1] == 'L') || (*argv[1] == 'l')) { if (User.ul_type == AF_NETROM) { axio_printf(NodeIo,"%s} ", NodeId); } @@ -939,12 +939,21 @@ int do_status(int argc, char **argv) axio_printf(NodeIo,"NET/ROM: %-10d %-10d %-10d",nn,n,r); #endif #endif +} + else { + if (User.ul_type == AF_NETROM) { + axio_printf(NodeIo, "%s} ", NodeId); + } + if (check_perms(PERM_ANSI, 0L) != -1) { + axio_printf(NodeIo, "\e[01;37m"); + } + axio_printf(NodeIo, "Usage: status l OR status L"); + } if (User.ul_type == AF_NETROM) { node_msg(""); } - } return 0; -} +} int do_version(int argc, char **argv) { diff --git a/configure b/configure index 923f672..573f6df 100755 --- a/configure +++ b/configure @@ -26,7 +26,7 @@ make distclean > make.debug [ "$LIB_DIR" ] || LIB_DIR=/usr/local/lib [ "$DATA_DIR" ] || DATA_DIR=/usr/local/share [ "$MAN_DIR" ] || MAN_DIR=/usr/local/share/man -[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/ax25 +[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/lib/ax25 echo "Welcome to the configuration utility for URONode. This configure script" echo "will very simply and easily guide you into installling URONode with as" @@ -62,7 +62,7 @@ if [ -e "$MAKE" ] then echo -n "saw $MAKE... " _sleep 1 - echo "MAKE found! Congratulations!!" + echo "MAKE found!" else echo "make not found!" echo " " diff --git a/jnos20k.diff b/jnos20k.diff deleted file mode 100644 index 5f999c8..0000000 --- a/jnos20k.diff +++ /dev/null @@ -1,130 +0,0 @@ -Common subdirectories: jnos/backup and jnos2/backup -Common subdirectories: jnos/installerv2.1 and jnos2/installerv2.1 -Common subdirectories: jnos/j2pwmgr and jnos2/j2pwmgr -Common subdirectories: jnos/k6fsh and jnos2/k6fsh -diff -u jnos/mailbox.c jnos2/mailbox.c ---- jnos/mailbox.c 2016-07-03 10:04:21.000000000 -0400 -+++ jnos2/mailbox.c 2016-09-13 22:45:14.293150509 -0400 -@@ -1646,7 +1646,7 @@ - - /* Now say goodbye */ - if(!(m->privs & IS_EXPERT)) -- tprintf("\nThank you %s, for calling %s JNOS.\n", -+ tprintf("%s, thank you for calling %s. Come back soon.\nRemember to keep packet alive!\n", - #ifdef USERLOG - m->username ? m->username : m->name, - #else -diff -u jnos/makefile jnos2/makefile ---- jnos/makefile 2015-12-08 12:37:21.000000000 -0500 -+++ jnos2/makefile 2016-09-14 18:18:30.268383703 -0400 -@@ -198,7 +198,8 @@ - echo "YOU MUST EDIT scanjmsg.c TO SPECIFY WHERE scanjmsg.dat IS LOCATED" - - clean: -- $(RM) *.[oa] -+# Oops, forgot to remove possible existing binaries too! - N1URO -+ $(RM) *.[oa] jnos jnospwmgr jnosinstaller j2pwmgr/j2pwrtns.o - - clients.a: $(CLIENTS) - $(RM) clients.a -diff -u jnos/mboxcmd.c jnos2/mboxcmd.c ---- jnos/mboxcmd.c 2016-07-03 10:04:26.000000000 -0400 -+++ jnos2/mboxcmd.c 2016-09-13 22:45:14.293150509 -0400 -@@ -478,7 +478,7 @@ - #ifdef NETROM - if(Nr_iface != NULLIF) { /* Use netrom call, and alias (if exists) */ - if(*Myalias != '\0') -- sprintf(Mbnrid,"%s:%s ",pax25(tmp,Myalias), -+ sprintf(Mbnrid,"%s:%s} ",pax25(tmp,Myalias), - pax25(tmp2,Nr_iface->hwaddr)); - else - sprintf(Mbnrid,"%s ",pax25(tmp,Nr_iface->hwaddr)); -@@ -486,7 +486,7 @@ - } - /* Use Mycall, and alias (if exists) */ - if(*Myalias != '\0') -- sprintf(Mbnrid,"%s:%s ",pax25(tmp,Myalias),pax25(tmp2,Mycall)); -+ sprintf(Mbnrid,"%s:%s} ",pax25(tmp,Myalias),pax25(tmp2,Mycall)); - else - #endif - #ifdef AX25 -diff -u jnos/misc.c jnos2/misc.c ---- jnos/misc.c 2007-04-12 14:08:19.000000000 -0400 -+++ jnos2/misc.c 2016-09-13 22:45:14.293150509 -0400 -@@ -14,6 +14,8 @@ - n = strlen(s); - if(!strncmp(s,"convers",n)) - p = IPPORT_CONVERS; -+ else if(!strncmp(s,"node",n)) -+ p = IPPORT_NODE; /* URONode port - N1URO */ - else if(!strncmp(s,"telnet",n)) - p = IPPORT_TELNET; - else if(!strncmp(s,"ttylink",n)) -diff -u jnos/netuser.c jnos2/netuser.c ---- jnos/netuser.c 2007-04-12 14:08:19.000000000 -0400 -+++ jnos2/netuser.c 2016-09-13 22:45:14.293150509 -0400 -@@ -164,9 +164,12 @@ - case 1234: /* Pulled out of the air */ - sprintf(port,"remote"); - break; -- case 3600: -+ case 3600: /* Convers server port */ - sprintf(port,"convers"); - break; -+ case 3694: /* URONode inbound tcp port - N1URO*/ -+ sprintf(port,"node"); -+ break; - default: - sprintf(port,"%u",s->port); - break; -diff -u jnos/nrcmd.c jnos2/nrcmd.c ---- jnos/nrcmd.c 2012-03-20 12:30:29.000000000 -0400 -+++ jnos2/nrcmd.c 2016-09-13 22:45:14.293150509 -0400 -@@ -498,7 +498,7 @@ - * ALSO change the size of the STRSIZE define above !!! - */ - sprintf(&temp[k],"%-16s %s %3d %3d %-8s %-9s %c %-5u",buf, -- rp->flags & G8BPQ_NODEMASK ? "(BPQ)" : " ", -+ rp->flags & G8BPQ_NODEMASK ? " " : " ", - bp->quality,bp->obsocnt, - np->iface->name, - pax25(neighbor,np->call), -@@ -631,7 +631,7 @@ - #endif - ,buf,pax25(destbuf,rp->call) - #ifdef G8BPQ -- ,rp->flags & G8BPQ_NODEMASK ? "(BPQ)" : " " -+ ,rp->flags & G8BPQ_NODEMASK ? " " : " " - #endif - ); - } else -@@ -648,7 +648,7 @@ - #endif - #ifdef G8BPQ - if (npp && (npp->flags & G8BPQ_NODEMASK)) -- tprintf ("(BPQ)"); -+ tprintf (" "); - else - #endif - -@@ -793,7 +793,7 @@ - #endif - #ifdef G8BPQ - if (rp && (rp->flags & G8BPQ_NODEMASK)) -- tprintf ("(BPQ)"); -+ tprintf (" "); - else - #endif - -Common subdirectories: jnos/old_inp_code and jnos2/old_inp_code -diff -u jnos/socket.h jnos2/socket.h ---- jnos/socket.h 2016-06-26 13:27:07.000000000 -0400 -+++ jnos2/socket.h 2016-09-14 10:20:04.532733148 -0400 -@@ -56,6 +56,7 @@ - #define IPPORT_RSYSOP 1513 /* Remote sysop login (totally arbitrary #) */ - #define IPPORT_CONVERS 3600 /* Converse */ - #define IPPORT_XCONVERS 3601 /* LZW Convers */ -+#define IPPORT_NODE 3694 /* URONode telnet port - N1URO*/ - #define IPPORT_CALLDB 1235 /* Pulled out of the air GRACILIS */ - #define IPPORT_TRACE 1236 /* Pulled out of the air - WG7J */ - #define IPPORT_TERM 5000 /* Serial interface server port */ diff --git a/man/flexd.conf.5 b/man/flexd.conf.5 index 60c50cb..9d9d9df 100644 --- a/man/flexd.conf.5 +++ b/man/flexd.conf.5 @@ -37,6 +37,10 @@ PollInterval