scmno****@osdn*****
scmno****@osdn*****
2017年 11月 2日 (木) 20:37:28 JST
Tera TermRevision: 6966
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6966
Author: doda
Date: 2017-11-02 20:37:28 +0900 (Thu, 02 Nov 2017)
Log Message:
-----------
コード整理。動作には影響しないはず。
・改行位置変更
・空行削除
・不用なコメントを削除
別の場所で #define している実際の値をコメントに書いても、
コメントと実際の動作の剥離を招くだけなので。
・不用な条件分岐を削除
分岐してもやっている事は同じだったので。
・else 節しかない if の条件を反転
Modified Paths:
--------------
trunk/ttssh2/ttxssh/pkt.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================
--- trunk/ttssh2/ttxssh/pkt.c 2017-10-27 09:45:10 UTC (rev 6965)
+++ trunk/ttssh2/ttxssh/pkt.c 2017-11-02 11:37:28 UTC (rev 6966)
@@ -36,11 +36,6 @@
#include "util.h"
#include "pkt.h"
-//#define READAMOUNT 60000
-// 60000 -> 65536 \x82֊g\x92\xA3\x81BSSH2\x82ł\xCDwindow\x90\xA7\x8C\xE4\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߁ASSH2\x82\xCCwindow size\x82\xC6
-// \x8D\x87\x82킹\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B(2004.10.17 yutaka)
-//#define READAMOUNT 65536
-// 65536 -> 131072 \x82֊g\x92\xA3\x81B(2007.10.29 maya)
#define READAMOUNT CHAN_SES_WINDOW_DEFAULT
void PKT_init(PTInstVar pvar)
@@ -67,31 +62,26 @@
pvar->pkt_state.datastart = 0;
}
- buf_ensure_size(&pvar->pkt_state.buf, &pvar->pkt_state.buflen,
- up_to_amount);
+ buf_ensure_size(&pvar->pkt_state.buf, &pvar->pkt_state.buflen, up_to_amount);
_ASSERT(pvar->pkt_state.buf != NULL);
amount_read = (pvar->Precv) (pvar->socket,
- pvar->pkt_state.buf +
- pvar->pkt_state.datalen,
+ pvar->pkt_state.buf + pvar->pkt_state.datalen,
up_to_amount - pvar->pkt_state.datalen,
0);
if (amount_read > 0) {
/* Update seen_newline if necessary */
- if (!pvar->pkt_state.seen_server_ID
- && !pvar->pkt_state.seen_newline) {
+ if (!pvar->pkt_state.seen_server_ID && !pvar->pkt_state.seen_newline) {
int i;
for (i = 0; i < amount_read; i++) {
- if (pvar->pkt_state.buf[pvar->pkt_state.datalen + i] ==
- '\n') {
+ if (pvar->pkt_state.buf[pvar->pkt_state.datalen + i] == '\n') {
pvar->pkt_state.seen_newline = 1;
}
}
}
-
pvar->pkt_state.datalen += amount_read;
}
@@ -115,12 +105,10 @@
pvar->pkt_state.datastart = 0;
}
- buf_ensure_size(&pvar->pkt_state.buf, &pvar->pkt_state.buflen,
- up_to_amount);
+ buf_ensure_size(&pvar->pkt_state.buf, &pvar->pkt_state.buflen, up_to_amount);
for (i = 0 ; i < (int)up_to_amount ; i++) {
- amount_read = (pvar->Precv) (pvar->socket,
- &buf[i], 1, 0);
+ amount_read = (pvar->Precv) (pvar->socket, &buf[i], 1, 0);
if (amount_read != 1) {
return 0; // error
}
@@ -160,16 +148,13 @@
buflen -= grabbed;
} else if (!pvar->pkt_state.seen_server_ID &&
- (pvar->pkt_state.seen_newline
- || pvar->pkt_state.datalen >= 255)) {
+ (pvar->pkt_state.seen_newline || pvar->pkt_state.datalen >= 255)) {
/* We're looking for the initial ID string and either we've seen the
terminating newline, or we've exceeded the limit at which we should see
a newline. */
unsigned int i;
- for (i = 0;
- pvar->pkt_state.buf[i] != '\n'
- && i < pvar->pkt_state.datalen; i++) {
+ for (i = 0; pvar->pkt_state.buf[i] != '\n' && i < pvar->pkt_state.datalen; i++) {
}
if (pvar->pkt_state.buf[i] == '\n') {
i++;
@@ -179,33 +164,25 @@
if (SSH_handle_server_ID(pvar, pvar->pkt_state.buf, i)) {
pvar->pkt_state.seen_server_ID = 1;
- if (SSHv1(pvar)) {
-
- } else { // for SSH2(yutaka)
+ if (SSHv2(pvar)) {
// send Key Exchange Init
SSH2_send_kexinit(pvar);
}
-
} else {
// reset flag to re-read server ID (2008.1.24 yutaka)
pvar->pkt_state.seen_newline = 0;
-
}
pvar->pkt_state.datastart += i;
pvar->pkt_state.datalen -= i;
- } else if (pvar->pkt_state.seen_server_ID
- && pvar->pkt_state.datalen >=
- (unsigned int) SSH_get_min_packet_size(pvar)) {
- char *data =
- pvar->pkt_state.buf + pvar->pkt_state.datastart;
+ } else if (pvar->pkt_state.seen_server_ID &&
+ pvar->pkt_state.datalen >= (unsigned int) SSH_get_min_packet_size(pvar)) {
+ char *data = pvar->pkt_state.buf + pvar->pkt_state.datastart;
uint32 padding;
uint32 pktsize;
uint32 total_packet_size;
- //debug_print(10, data, pvar->pkt_state.datalen);
-
// \x88Í\x86\x89\xBB\x83p\x83P\x83b\x83g\x82̈ꕔ\x82\x86\x89\xBB\x82\xB7\x82\xE9\x81B
if (!pvar->pkt_state.predecrypted_packet) {
SSH_predecrpyt_packet(pvar, data);
@@ -242,8 +219,7 @@
"Oversized packet received from server; connection will close.");
notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
} else {
- int amount_read =
- recv_data(pvar, max(total_packet_size, READAMOUNT));
+ int amount_read = recv_data(pvar, max(total_packet_size, READAMOUNT));
if (amount_read == SOCKET_ERROR) {
if (amount_in_buf == 0) {
@@ -257,21 +233,12 @@
}
}
}
-
-
} else {
- // \x83p\x83P\x83b\x83g\x82̎\xF3\x90M\x81i\x8Dő\xE560KB\x81j
+ // \x83p\x83P\x83b\x83g\x82̎\xF3\x90M
int amount_read;
- if (pvar->pkt_state.seen_server_ID == 0) {
- //amount_read = recv_line_data(pvar);
- amount_read = recv_data(pvar, READAMOUNT);
+ amount_read = recv_data(pvar, READAMOUNT);
- } else {
- amount_read = recv_data(pvar, READAMOUNT);
-
- }
-
if (amount_read == SOCKET_ERROR) {
if (amount_in_buf == 0) {
return SOCKET_ERROR;
@@ -289,8 +256,7 @@
}
if (SSH_is_any_payload(pvar)) {
- PostMessage(pvar->NotificationWindow, WM_USER_COMMNOTIFY,
- pvar->socket, MAKELPARAM(FD_READ, 0));
+ PostMessage(pvar->NotificationWindow, WM_USER_COMMNOTIFY, pvar->socket, MAKELPARAM(FD_READ, 0));
}
return amount_in_buf;