We now have an MOTD and prompt on netrom, and mheard is reenabled

This commit is contained in:
Dave Hibberd 2023-08-04 22:34:55 +01:00
parent 0c9efe6e2f
commit c5b5804776
3 changed files with 23 additions and 8 deletions

View File

@ -1,18 +1,23 @@
--- a/node.c --- a/node.c
+++ b/node.c +++ b/node.c
@@ -301,6 +301,7 @@ @@ -301,6 +301,11 @@
node_log(LOGLVL_LOGIN, "%s @ %s logged in", User.call, User.ul_name); node_log(LOGLVL_LOGIN, "%s @ %s logged in", User.call, User.ul_name);
#ifdef HAVEMOTD #ifdef HAVEMOTD
if (User.ul_type == AF_NETROM) { if (User.ul_type == AF_NETROM) {
+ axio_printf(NodeIo, "Fit like eh day Netrommie. \n"); + node_msg("%s - Welcome to %s", VERSION, NodeId);
+ if ((fp = fopen(HAVEMOTD, "r")) != NULL) {
+ while (fgets(buf, 256, fp) != NULL) axio_puts(buf,NodeIo);
+ axio_puts ("\n",NodeIo);
+ }
/* axio_printf(NodeIo, "%s} Welcome.\n", NodeId); */ /* axio_printf(NodeIo, "%s} Welcome.\n", NodeId); */
} else } else
if ((User.ul_type == AF_INET) || (User.ul_type == AF_INET6)) { if ((User.ul_type == AF_INET) || (User.ul_type == AF_INET6)) {
@@ -362,6 +363,7 @@ @@ -365,6 +370,8 @@
else if ((User.ul_type != AF_NETROM) && (User.ul_type != AF_ROSE)) {
node_prompt();
} else if ((User.ul_type == AF_NETROM) || (User.ul_type == AF_ROSE)) {
+ node_prompt();
axio_printf(NodeIo,"\n"); axio_printf(NodeIo,"\n");
} }
} }
+ } else {
+ node_prompt();
}
if (check_perms(PERM_ANSI, 0L) != -1) {
/* Not needed from what I see so far. */

View File

@ -16,3 +16,13 @@ Last-Update: 2018-02-10
_sleep() _sleep()
{ {
[ "$NON_INTERACTIVE" = 1 ] || sleep "$@" [ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
@@ -122,6 +116,9 @@
if [ $? -ne 1 ]
then
HAVEAX25="#define HAVE_AX25 1"
+ #These have been moved out of tcp-ip so I have an MOTD when I don't build telnet in
+ HAVEMOTD="#define HAVEMOTD"
+ MOTDPATH='"/etc/ax25/uronode.motd"'
fi
#
# echo -n "Include support for the FlexNet protocol ? [Y/n]: "; read answer

2
debian/rules vendored
View File

@ -9,7 +9,7 @@ export NON_INTERACTIVE=1
# Remove things we aren't using in oarc. mheard is a bug awaiting a fix. # Remove things we aren't using in oarc. mheard is a bug awaiting a fix.
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- --without-flexnet --without-tcpip --without-rose --without-autorouter --without-mheard dh_auto_configure -- --without-flexnet --without-tcpip --without-rose --without-autorouter
# Collapse upstream changes file into single file # Collapse upstream changes file into single file