added frontend

Author: donni-h

go.mod

@@ -5,7 +5,13 @@ go 1.19
 require go.bug.st/serial v1.5.0
 
 require (
+	github.com/c-bata/go-prompt v0.2.6 // indirect
 	github.com/creack/goselect v0.1.2 // indirect
+	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/mattn/go-tty v0.0.3 // indirect
+	github.com/pkg/term v1.2.0-beta.2 // indirect
 	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,10 +1,34 @@
+github.com/c-bata/go-prompt v0.2.6 h1:POP+nrHE+DfLYx370bedwNhsqmpCUynWPxuHi0C5vZI=
+github.com/c-bata/go-prompt v0.2.6/go.mod h1:/LMAke8wD2FsNu9EXNdHxNLbd9MedkPnCdfpU9wwHfY=
 github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
 github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-tty v0.0.3 h1:5OfyWorkyO7xP52Mq7tB36ajHDG5OHrmBGIS/DtakQI=
+github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvrWyR0=
+github.com/pkg/term v1.2.0-beta.2 h1:L3y/h2jkuBVFdWiJvNfYfKmzcCnILw7mJWm2JQuMppw=
+github.com/pkg/term v1.2.0-beta.2/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 go.bug.st/serial v1.5.0 h1:ThuUkHpOEmCVXxGEfpoExjQCS2WBVV4ZcUKVYInM9T4=
 go.bug.st/serial v1.5.0/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

main.go

@@ -3,46 +3,14 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"io"
+	"go.bug.st/serial"
 	"log"
 	"lora-project/protocol/messages"
+	"lora-project/protocol/routing"
 	"lora-project/serial_handlers"
-	"math/rand"
 	"os"
-	"time"
-
-	"go.bug.st/serial"
 )
 
-var commands = []string{
-	"AT",
-	"AT+SEND=3",
-	"AT+SEND=A",
-	"jasdjkjasjdjkasd",
-}
-
-func write(port serial.Port) {
-	rnd := rand.Intn(len(commands))
-	lineSep := "\r\n"
-	msg := []byte(fmt.Sprintf("%s%s", commands[rnd], lineSep))
-	n, err := port.Write(msg)
-	if err != nil {
-		fmt.Println("Error writing to serial port: ", err)
-		return
-	}
-	fmt.Printf("Sent %v bytes: '%q'\n", n, msg)
-	if rnd == 1 {
-		reader := bufio.NewReader(os.Stdin)
-		fmt.Print("enter text: ")
-		buf := make([]byte, 3)
-		_, _ = io.ReadFull(reader, buf)
-		fmt.Printf("AT,SENDING%q\n", lineSep)
-		_, _ = port.Write(buf)
-		fmt.Printf("AT,SENDED%q\n", lineSep)
-	}
-	time.Sleep(time.Second)
-}
-
 func main() {
 	/*	rand.Seed(time.Now().UnixNano())
 		app := &cli.App{
@@ -81,28 +49,57 @@ func main() {
 			write(port)
 		}*/
 
-	var addr messages.Address
-	addr.UnmarshalText([]byte{'4', '7', '6', '1'})
 	mode := &serial.Mode{
 		BaudRate: 115200,
 	}
 
 	port, err := serial.Open("/home/hannes/dev/ttyS20", mode)
-	defer port.Close()
+	defer func(port serial.Port) {
+		err := port.Close()
+		if err != nil {
+
+		}
+	}(port)
 	if err != nil {
 		log.Fatal(err)
 	}
 	handler := serial_handlers.NewATHandler(port)
+	aodv := routing.NewAODV(handler)
+	aodv.Run()
+
+	go func() {
+		for data := range aodv.IncomingDataQueue {
+			fmt.Printf("Received message: %s from %s\n", string(data.Payload), data.OriginatorAddress.String())
+		}
+	}()
+
+	scanner := bufio.NewScanner(os.Stdin)
 	for {
-		select {
-		case err = <-handler.ErrorChan:
-			fmt.Println(err)
+		fmt.Print("Enter destination address: ")
+		scanned := scanner.Scan()
+		if !scanned {
+			fmt.Println("Failed to scan address!")
+			return
+		}
 
-		case <-time.After(time.Second * 10):
-			fmt.Println("bop.")
-		case msg := <-handler.MessageChan:
-			fmt.Printf("%+v\n", msg)
+		destination := scanner.Text()
+		var address messages.Address
+		if address.UnmarshalText([]byte(destination)) != nil {
+			fmt.Println("Invalid address..")
+			continue
 		}
-	}
 
+		fmt.Print("Enter message: ")
+		scanned = scanner.Scan()
+
+		if !scanned {
+			fmt.Println("Failed to scan message!")
+			return
+		}
+
+		message := scanner.Text()
+
+		aodv.SendData(message, address)
+
+	}
 }

protocol/routing/aodv.go

@@ -13,7 +13,7 @@ type AODV struct {
 	rreqID            uint16
 	seqNum            int16
 	currentAddress    messages.Address
-	incomingDataQueue chan messages.Message
+	IncomingDataQueue chan messages.Data
 	broadcastAddress  messages.Address
 	dataQueue         *DataQueue
 }
@@ -36,14 +36,15 @@ func NewAODV(atHandler *serial_handlers.ATHandler) *AODV {
 		rreqID:            0,
 		seqNum:            0,
 		currentAddress:    addr,
-		incomingDataQueue: make(chan messages.Message, 10),
+		IncomingDataQueue: make(chan messages.Data, 10),
 		broadcastAddress:  broadcast,
 		dataQueue:         NewDataQueue(),
 	}
 }
 func (a *AODV) Run() {
 	go a.processIncomingMessages()
 	go a.helloRoutine()
+	a.StartExpirationWorker()
 }
 
 func (a *AODV) processIncomingMessages() {

protocol/routing/aodv_data.go

@@ -5,7 +5,7 @@ import (
 	"lora-project/protocol/messages"
 )
 
-func (a *AODV) sendData(payload string, destination messages.Address) {
+func (a *AODV) SendData(payload string, destination messages.Address) {
 	a.seqNum++
 	data := &messages.Data{
 		DestinationAddress: destination,
@@ -50,7 +50,7 @@ func (a *AODV) handleData(data *messages.Data) {
 		a.seqNum = data.DataSequenceNumber
 	}
 	if data.DestinationAddress == a.currentAddress {
-		a.incomingDataQueue <- data
+		a.IncomingDataQueue <- *data
 		return
 	}