EKHO-13 | justfile

created justfile, added service file

Makefile

@@ -1,12 +0,0 @@
-all: client server
-
-re: clean client server
-
-clean:
-	rm client.o server.o
-
-client:
-	go build -o client.o client.go
-
-server:
-	go build -o server.o server.go

client.go

@@ -339,7 +339,7 @@ func main() {
     flag.BoolVar( &add, "a", false, "add quote to list" )
     flag.BoolVar( &remove, "r", false, "remove quote from list" )
     flag.BoolVar( &list, "l", false, "print quote list" )
-    flag.StringVar( &dest, "ip", ":1300", "ip:port of server" )
+    flag.StringVar( &dest, "ip", "earth-1.net:1300", "ip:port of server" )
     flag.IntVar( &tsize, "s", 256, "transmission size ( bytes )" )
     flag.Parse()    // process flags
 

ekho.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Ekho MOTD Server
+After=network.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=5
+User=
+ExecStart=/usr/local/bin/server
+WorkingDirectory=/home/
+
+[Install]
+WantedBy=multi-user.target

justfile

@@ -0,0 +1,58 @@
+# delete server bin
+[private]
+server_clean:
+    rm server
+
+# delete client bin
+[private]
+client_clean:
+    rm client
+
+# delete binaries
+clean: server_clean client_clean
+
+# build server bin
+server:
+    go build server.go
+
+# build client bin
+client:
+    go build client.go
+
+# build both bins
+build: client server
+
+# delete binaries and make them again
+rebuild: clean build
+
+# install server
+ins_server:
+    #!/usr/bin/bash
+    echo "enter port of server or leave blank to use default (1300)"
+    read PORT
+    if [[ $PORT -ne "" ]]; then
+        sed -i -e "s/1300/$PORT/" server.go
+    fi
+    echo "go build server.go"
+    go build server.go
+    USER=($(users))
+    sed -i -e "s/^User=/User=${USER[0]}/" ekho.service
+    sed -i -e "s/^WorkingDirectory=.*/WorkingDirectory=\/home\/${USER[0]}\//" ekho.service
+    echo "sudo mv server /usr/local/bin/server"
+    sudo mv server /usr/local/bin/server
+    echo "sudo mv ekho.service /etc/systemd/system/"
+    sudo mv ekho.service /etc/systemd/system/
+
+# install client
+ins_client:
+    #!/usr/bin/bash
+    echo "enter ip and port of server, 'aaa.bbb.ccc.ddd:port"
+    read IP_PORT
+    sed -i -e "s/:1300/$IP_PORT/" client.go
+    echo "go build -o ekho client.go"
+    go build -o ekho client.go
+    sed -i -e "s/$IP_PORT/:1300/" client.go
+    echo "sudo mv ekho /usr/local/bin/"
+    sudo mv ekho /usr/local/bin/
+    echo "add 'ekho' to shell config (config.fish, .bashrc, etc)"
+

list.q

@@ -1 +1,9 @@
+@user:
+shmuley
+floglin
+@all:
+blingo
+no but like actually blingo shmingo
+i would prefer not to
+@default:
 thank you for using ekho

server.go

@@ -1,14 +1,17 @@
 // =============================================================================
 // Auth: alex
 // File: server.go
-// Revn: 01-09-2025  5.0
+// Revn: 05-12-2026  2.1.2
 // Func: host MOTD connection
 //
-// TODO: remove ioutil import
-//       add more /codes/ to handle
-//       add flags, like specify port
+// TODO: 
+//       add user-specific prints
 //       write usage and errors to logfile
+//       remove ioutil import
 //       send logfile to client on request
+//       add color printing to qfile
+//       add flags?
+//       add more /codes/ to handle
 // =============================================================================
 // CHANGE LOG
 // -----------------------------------------------------------------------------
@@ -31,7 +34,7 @@
 //             fixed bug in /r2/ where removing quote at final
 //              position would break
 //             removed deadcode from /r2/, unused "quit" bool?
-//*10-17-2023: fixed bug where quotes are read from and saved to two
+//#10-17-2023: fixed bug where quotes are read from and saved to two
 //              different files
 //             removed implicit newline at end of qfile to stop ghost
 //              line bug in /la/
@@ -43,7 +46,11 @@
 //             commented
 //*06-14-2024: byte count-based PWFT rewrite
 //*06-17-2024: catch keyboard interrupts with os/signal and syscall
-//*01-09-2025: copied lr/la PWFT updates into r1/r2
+//#01-09-2025: copied lr/la PWFT updates into r1/r2
+//*04-28-2026: removed implicit newline at end of qfile to stop ghost
+//              line bug in /la/ AGAIN
+// 05-11-2026: updated fread() to handle users in qfile
+// 05-12-2026: added v and vv input flags
 //
 // =============================================================================
 
@@ -114,10 +121,15 @@ func fread() string {
     // bugs where a blank item was introduced into qlist and calling
     // /la/ would produce a blank line on the client side that didn't
     // really exist
-    //qfile = qfile[:len( qfile ) - 1]
+    qfile = qfile[:len( qfile ) - 1]
     // cast bytes to string, split string over newline into array
-    qlist = strings.Split( string( qfile ), "\n" )
-    // deal with the trailing
+    //qlist = strings.Split( string( qfile ), "\n" )
+    profiles := strings.Split( string( qfile ), "@" )
+    for _, p := range profiles {
+        quotes := strings.Split( p, ":" )
+        qlist[quotes[0]] = strings.Split( quotes[1], "\n" )
+    }
+
     return string( qfile )      // return file as string
 }
 
@@ -143,6 +155,17 @@ func handle( conn net.Conn ) {
     n, err := conn.Read( buffer[:] )
     checkN( err, conn ) // make sure read worked
 
+    // message anatomy
+    // command@number[@user]
+    //        @       @             delimiter
+    // command                      command, like list request or quote request
+    //         number               sequence or quote number
+    //                 user         quote username if applicable, default if not give
+    // add request message anatomy
+    // command@quote[@user]
+    //         quote                quote to be added
+    //                user          quote username, default if not given
+
     // cast message to string, take first n bytes, split over @
     command := strings.Split( string( buffer[:n] ), "@" )
 
@@ -156,9 +179,20 @@ func handle( conn net.Conn ) {
             // concat and send
             resp = "sa@" + num      // size answer
         case "qr":      // /qr/, quote request
+            // see if user was sent
+            subcommands := strings.Split( command[1], ":" )
+
+            // keep track of name, or default if need be
+            var name string
+            if len( subcommands ) == 1 {
+                name = "default"
+            } else {
+                name = subcommands[1]
+            }
+
             // convert message argument to string to make sure it's a
             // valid number
-            num, nerr := strconv.Atoi( command[1] )
+            num, nerr := strconv.Atoi( subcommands[0] )
             // nerr will not be nil if comm[1] is not a number
             if nerr != nil {
                 // formulate an error message
@@ -166,7 +200,7 @@ func handle( conn net.Conn ) {
                 resp = "ba@qr@!"    // bad answer
             } else {        // comm[1] was a number, but...
                 switch {    // how do we know it's a valid number
-                    case num > len( qlist ):
+                    case num > len( qlist[name] ):
                         // bad answer in quote request
                         resp = "ba@qr@>"
                         // why bad? num is >
@@ -176,7 +210,7 @@ func handle( conn net.Conn ) {
                         // why bad? num is -
                     default:
                         // good num, get quote, send off
-                        resp = "qa@" + qlist[num]   // quote answer
+                        resp = "qa@" + qlist[name][num]   // quote answer
                 }
             }
         case "lr":      // /lr/, list request
@@ -218,7 +252,7 @@ func handle( conn net.Conn ) {
             }
         case "ar":      // /ar/, add request
             // append new quote to list
-            qlist = append( qlist, command[1] )
+            qlist["f"] = append( qlist["f"], command[1] )
             // also append new quote to file variable
             qfile = qfile + "\n" + command[1]
             writeFile( qfile )
@@ -285,14 +319,14 @@ func handle( conn net.Conn ) {
                     default:
                         // replace the quote at that position with
                         // final quote
-                        qlist[num] = qlist[len( qlist ) - 1]
+                        qlist["f"][num] = qlist["f"][len( qlist ) - 1]
                         // remove second copy of quote
-                        qlist = qlist[:len( qlist ) - 1]
+                        qlist["f"] = qlist["f"][:len( qlist ) - 1]
                         // O(1) remove from list at any position
                         // must entirely recreate quote string
                         var f string = ""   // init empty string
                         // iterate over list, disregard index
-                        for _, v := range qlist {
+                        for _, v := range qlist["f"] {
                             // add next quote to file and separate
                             // quotes with newline
                             f = f + v + "\n"
@@ -332,10 +366,11 @@ func handle( conn net.Conn ) {
 
 
 // globals
-var qlist []string      // list of quotes
+//var qlist []string      // list of quotes
+var qlist = make( map[string][]string )
 var qfile string        // file object
 var tsize int           // size of transmission buffer
-
+var VERS string         // version
 
 // main, create port and wait for connection
 func main() {
@@ -345,12 +380,32 @@ func main() {
     // set interrupt and terminate signals to notify channel
     signal.Notify( sigs, syscall.SIGINT, syscall.SIGTERM )
 
+    // flag vars
+    var v  bool     // simple version
+    var vv bool     // verbose version
+
     // flag for default transmission size
     flag.IntVar(  &tsize, "s",  256,   "transmission size ( bytes )" )
+    flag.BoolVar( &v,     "v",  false, "display version and exit" )
+    flag.BoolVar( &vv,    "vv", false, "display version and about info and exit" )
     flag.Parse()
 
-    qfile = fread() // read quote file, init ( global ) list of quotes
+    // FIXME get better versioning method
+    VERS = "2.1.2"
 
+    if vv {         // display info and exit
+        fmt.Println( "ekho server v" + VERS )
+        fmt.Println( "ekho is named after Echo the Oread" )
+        fmt.Println( "in Greek mythology, Echo was cursed by Hera to only be able to say the last words spoken to her" )
+        fmt.Println( "i found this to be quite fitting for a MOTD server" )
+        return
+    } else if v {   // display info and exit
+        fmt.Println( VERS )
+        return
+    }
+
+
+    qfile = fread() // read quote file, init ( global ) list of quotes
     service := ":1300"  // create service on ip and port
 
     // resolve ip address and port