Skip to content
Snippets Groups Projects
Commit a424681a authored by Jake Taylor's avatar Jake Taylor :lips:
Browse files

Merge branch 'hotfix/ConnIntegrationFix' into 'release'

Remove disconnect flag

See merge request !311
parents 969fd774 2c60bcd1
No related branches found
No related tags found
2 merge requests!510Release,!311Remove disconnect flag
...@@ -147,7 +147,6 @@ func secureConnServer(forceLegacy bool, statePass []byte, statePath, regCode str ...@@ -147,7 +147,6 @@ func secureConnServer(forceLegacy bool, statePass []byte, statePath, regCode str
case conn := <-connChan: case conn := <-connChan:
// Perform functionality shared by client & server // Perform functionality shared by client & server
miscConnectionFunctions(connectServer.User, conn) miscConnectionFunctions(connectServer.User, conn)
case <-connectionTimeout.C: case <-connectionTimeout.C:
connectionTimeout.Stop() connectionTimeout.Stop()
jww.FATAL.Panicf("[CONN] Failed to establish connection within " + jww.FATAL.Panicf("[CONN] Failed to establish connection within " +
...@@ -375,6 +374,15 @@ func secureConnClient(forceLegacy bool, statePass []byte, statePath, regCode str ...@@ -375,6 +374,15 @@ func secureConnClient(forceLegacy bool, statePass []byte, statePath, regCode str
miscConnectionFunctions(user, conn) miscConnectionFunctions(user, conn)
// Close the connection
if err = conn.Close(); err != nil {
jww.FATAL.Panicf("Failed to disconnect with %s: %v",
conn.GetPartner().PartnerId(), err)
}
jww.INFO.Printf("[CONN] Disconnected from %s",
conn.GetPartner().PartnerId())
fmt.Println("Disconnected from partner")
} }
// Insecure (unauthenticated) connection client path // Insecure (unauthenticated) connection client path
...@@ -450,6 +458,16 @@ func insecureConnClient(forceLegacy bool, statePass []byte, statePath, regCode s ...@@ -450,6 +458,16 @@ func insecureConnClient(forceLegacy bool, statePass []byte, statePath, regCode s
jww.INFO.Printf("[CONN] Established connection with %s", handler.GetPartner().PartnerId()) jww.INFO.Printf("[CONN] Established connection with %s", handler.GetPartner().PartnerId())
miscConnectionFunctions(user, handler) miscConnectionFunctions(user, handler)
// Close the connection
if err = handler.Close(); err != nil {
jww.FATAL.Panicf("Failed to disconnect with %s: %v",
handler.GetPartner().PartnerId(), err)
}
jww.INFO.Printf("[CONN] Disconnected from %s",
handler.GetPartner().PartnerId())
fmt.Println("Disconnected from partner")
} }
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
...@@ -488,17 +506,6 @@ func miscConnectionFunctions(user *xxdk.E2e, conn connect.Connection) { ...@@ -488,17 +506,6 @@ func miscConnectionFunctions(user *xxdk.E2e, conn connect.Connection) {
} }
} }
// Disconnect from connection partner--------------------------------------------
if viper.GetBool(connectionDisconnectFlag) {
// Close the connection
if err := conn.Close(); err != nil {
jww.FATAL.Panicf("Failed to disconnect with %s: %v",
conn.GetPartner().PartnerId(), err)
}
jww.INFO.Printf("[CONN] Disconnected from %s",
conn.GetPartner().PartnerId())
fmt.Println("Disconnected from partner")
}
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
...@@ -556,13 +563,6 @@ func init() { ...@@ -556,13 +563,6 @@ func init() {
"long-running.") "long-running.")
bindFlagHelper(connectionServerTimeoutFlag, connectionCmd) bindFlagHelper(connectionServerTimeoutFlag, connectionCmd)
connectionCmd.Flags().Bool(connectionDisconnectFlag, false,
"This flag is available to both server and client. "+
"This uses a contact object from a file specified by --destfile."+
"This will close the connection with the given contact "+
"if it exists.")
bindFlagHelper(connectionDisconnectFlag, connectionCmd)
connectionCmd.Flags().Bool(connectionAuthenticatedFlag, false, connectionCmd.Flags().Bool(connectionAuthenticatedFlag, false,
"This flag is available to both server and client. "+ "This flag is available to both server and client. "+
"This flag operates as a switch for the authenticated code-path. "+ "This flag operates as a switch for the authenticated code-path. "+
......
...@@ -98,7 +98,6 @@ const ( ...@@ -98,7 +98,6 @@ const (
connectionFlag = "connect" connectionFlag = "connect"
connectionStartServerFlag = "startServer" connectionStartServerFlag = "startServer"
connectionServerTimeoutFlag = "serverTimeout" connectionServerTimeoutFlag = "serverTimeout"
connectionDisconnectFlag = "disconnect"
connectionAuthenticatedFlag = "authenticated" connectionAuthenticatedFlag = "authenticated"
connectionEphemeralFlag = "ephemeral" connectionEphemeralFlag = "ephemeral"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment