Merge branch 'dev' into jeremi
# Conflicts: # pkg/utils/FileReceiver.go
This commit is contained in:
@@ -58,14 +58,14 @@ func (client ClientMulticast) Run() {
|
||||
return
|
||||
}
|
||||
|
||||
cmd, correct := client.repository.ExecuteWriter(writers.HelloRulePrefix, client.domain, fmt.Sprintf("%d", client.port))
|
||||
if !correct {
|
||||
println("[ClientMulticast] Hello rule isn't correct (" + cmd + ")")
|
||||
writerResult := client.repository.ExecuteWriter(writers.HelloRulePrefix, client.domain, fmt.Sprintf("%d", client.port))
|
||||
if writerResult == nil {
|
||||
println("[ClientMulticast] Hello rule isn't correct")
|
||||
return
|
||||
}
|
||||
|
||||
for {
|
||||
_, _ = con.Write([]byte(cmd))
|
||||
_, _ = con.Write([]byte(writerResult.Cmd))
|
||||
time.Sleep(time.Second * client.second)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,9 +36,22 @@ func (server ServerUnicast) Run() {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
result := server.ReqManager.Execute(line, reader)
|
||||
println("[RESPONSE] : ", result)
|
||||
_, _ = con.Write(append([]byte(result), '\n')) // TODO : ATTENTION laisser les \n
|
||||
response := server.ReqManager.Execute(line, reader)
|
||||
|
||||
if response == nil {
|
||||
break
|
||||
} else {
|
||||
println("[RESPONSE] : ", response.Cmd)
|
||||
_, _ = con.Write([]byte(response.Cmd)) // TODO : ATTENTION laisser les \n
|
||||
if response.Write != nil {
|
||||
response.Write(bufio.NewWriter(con))
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
con.Close()
|
||||
}
|
||||
|
||||
listen.Close()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user