octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SSH2: openChannel -> open_channel 

makes openChannel snake case like close_channel already is. this is
not a BC break as openChannel is protected
This commit is contained in:
terrafrost 2024-02-26 07:52:24 -06:00
parent c2fb513616
commit 792314e851
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Net/SFTP.php
View File

@ -547,7 +547,7 @@ class SFTP extends SSH2
*/ */
private function partial_init_sftp_connection() private function partial_init_sftp_connection()
{ {
$response = $this->openChannel(self::CHANNEL, true); $response = $this->open_channel(self::CHANNEL, true);
if ($response === true && $this->isTimeout()) { if ($response === true && $this->isTimeout()) {
return false; return false;
} }

12
phpseclib/Net/SSH2.php
View File

@ -2840,7 +2840,7 @@ class SSH2
// throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.'); // throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
//} //}
$this->openChannel(self::CHANNEL_EXEC); $this->open_channel(self::CHANNEL_EXEC);
if ($this->request_pty === true) { if ($this->request_pty === true) {
$terminal_modes = pack('C', NET_SSH2_TTY_OP_END); $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
@ -2937,7 +2937,7 @@ class SSH2
* @param bool $skip_extended * @param bool $skip_extended
* @return bool * @return bool
*/ */
protected function openChannel($channel, $skip_extended = false) protected function open_channel($channel, $skip_extended = false)
{ {
if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) { if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) {
throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again'); throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again');
@ -2994,7 +2994,7 @@ class SSH2
throw new InsufficientSetupException('Operation disallowed prior to login()'); throw new InsufficientSetupException('Operation disallowed prior to login()');
} }
$this->openChannel(self::CHANNEL_SHELL); $this->open_channel(self::CHANNEL_SHELL);
$terminal_modes = pack('C', NET_SSH2_TTY_OP_END); $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
$packet = Strings::packSSH2( $packet = Strings::packSSH2(
@ -3242,7 +3242,7 @@ class SSH2
*/ */
public function startSubsystem($subsystem) public function startSubsystem($subsystem)
{ {
$this->openChannel(self::CHANNEL_SUBSYSTEM); $this->open_channel(self::CHANNEL_SUBSYSTEM);
$packet = Strings::packSSH2( $packet = Strings::packSSH2(
'CNsCs', 'CNsCs',
@ -3369,7 +3369,7 @@ class SSH2
if ($level == 1) { if ($level == 1) {
$this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0)); $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
} else { } else {
$this->openChannel(self::CHANNEL_KEEP_ALIVE); $this->open_channel(self::CHANNEL_KEEP_ALIVE);
$this->close_channel(self::CHANNEL_KEEP_ALIVE); $this->close_channel(self::CHANNEL_KEEP_ALIVE);
} }
return true; return true;
@ -3448,7 +3448,7 @@ class SSH2
} }
try { try {
$this->openChannel(self::CHANNEL_KEEP_ALIVE); $this->open_channel(self::CHANNEL_KEEP_ALIVE);
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
return $this->reconnect(); return $this->reconnect();
} }