Browse Source

Added a handling for interrupt signal

main
Unbewohnte 3 years ago
parent
commit
1aa968d93e
  1. 2
      main.go
  2. 23
      receiver/receiver.go
  3. 32
      sender/sender.go

2
main.go

@ -58,6 +58,7 @@ func main() {
// 3) send info about the file -> 4) if accepted - upload file
sender := sender.NewSender(*PORT, *SHAREDFILE)
sender.WaitForConnection()
sender.HandleInterrupt()
sender.MainLoop()
} else {
@ -65,6 +66,7 @@ func main() {
// 4) accept or refuse -> 5) download|don`t_download file
receiver := receiver.NewReceiver(*DOWNLOADSFOLDER)
receiver.Connect(fmt.Sprintf("%s:%d", *SENDERADDR, *PORT))
receiver.HandleInterrupt()
receiver.MainLoop()
}
}

23
receiver/receiver.go

@ -4,6 +4,7 @@ import (
"fmt"
"net"
"os"
"os/signal"
"path/filepath"
"strconv"
"strings"
@ -21,9 +22,9 @@ type Receiver struct {
IncomingPackets chan protocol.Packet
FileToDownload *file
EncryptionKey []byte
ReadyToReceive bool
Stopped bool
TransferInfo *transferInfo
ReadyToReceive bool // waiting for a new packet
Stopped bool // controlls the mainloop
}
// Creates a new client with default fields
@ -58,19 +59,29 @@ func NewReceiver(downloadsFolder string) *Receiver {
}
}
// Closes the connection
func (r *Receiver) Disconnect() {
r.Connection.Close()
// When the interrupt signal is sent - exit cleanly
func (r *Receiver) HandleInterrupt() {
signalChan := make(chan os.Signal, 1)
signal.Notify(signalChan, os.Interrupt)
go func() {
<-signalChan
r.Stop()
}()
}
// Closes the connection, warns the sender and exits the mainloop
func (r *Receiver) Stop() {
if r.Connection != nil {
disconnectionPacket := protocol.Packet{
Header: protocol.HeaderDisconnecting,
}
protocol.SendEncryptedPacket(r.Connection, disconnectionPacket, r.EncryptionKey)
r.Connection.Close()
}
r.Stopped = true
r.Disconnect()
}
// Connects to a given address over tcp. Sets a connection to a corresponding field in receiver

32
sender/sender.go

@ -4,6 +4,7 @@ import (
"fmt"
"net"
"os"
"os/signal"
"strconv"
"time"
@ -21,9 +22,9 @@ type Sender struct {
IncomingPackets chan protocol.Packet
EncryptionKey []byte
TransferInfo *transferInfo
TransferAllowed bool
ReceiverIsReady bool
Stopped bool
TransferAllowed bool // the receiver had agreed to receive a file
ReceiverIsReady bool // receiver is waiting for a new packet
Stopped bool // controlls the mainloop
}
// Creates a new sender with default|necessary fields
@ -41,8 +42,10 @@ func NewSender(port int, filepath string) *Sender {
remoteIP, err := GetRemoteIP()
if err != nil {
panic(err)
// don`t panic if couldn`t get remote IP
remoteIP = ""
}
localIP, err := GetLocalIP()
if err != nil {
panic(err)
@ -70,8 +73,20 @@ func NewSender(port int, filepath string) *Sender {
}
}
// When the interrupt signal is sent - exit cleanly
func (s *Sender) HandleInterrupt() {
signalChan := make(chan os.Signal, 1)
signal.Notify(signalChan, os.Interrupt)
go func() {
<-signalChan
s.Stop()
}()
}
// Closes the connection, warns about it the receiver and exits the mainloop
func (s *Sender) Stop() {
if s.Connection != nil {
disconnectionPacket := protocol.Packet{
Header: protocol.HeaderDisconnecting,
}
@ -80,13 +95,10 @@ func (s *Sender) Stop() {
panic(fmt.Sprintf("could not send a disconnection packet: %s", err))
}
s.Stopped = true
s.Disconnect()
}
// Closes current connection
func (s *Sender) Disconnect() {
s.Connection.Close()
}
s.Stopped = true
}
// Accepts one connection

Loading…
Cancel
Save