version 1.1, 2011/10/04 22:37:46
|
version 1.1.1.1.2.1, 2011/10/10 09:11:48
|
Line 27 SetRemoteWinz(int h, u_short id, struct ether_addr *ea
|
Line 27 SetRemoteWinz(int h, u_short id, struct ether_addr *ea
|
pos[1] = htons(ws.ws_col); |
pos[1] = htons(ws.ws_col); |
pos[2] = htons(ws.ws_xpixel); |
pos[2] = htons(ws.ws_xpixel); |
pos[3] = htons(ws.ws_ypixel); |
pos[3] = htons(ws.ws_ypixel); |
if (pktSend(h, id, ANSH_FLG_WINZ, buf, sizeof ws, ea) == -1) | if (pktSend(h, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, ea) == -1) |
return -1; |
return -1; |
|
|
return 0; |
return 0; |
Line 41 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
Line 41 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
struct timeval tv = { 10, 0 }; |
struct timeval tv = { 10, 0 }; |
struct termios otio; |
struct termios otio; |
int rlen, ret = 0; |
int rlen, ret = 0; |
char flg; | char flg, nl = 0; |
u_char *buf; | u_char *buf, *str; |
|
|
FTRACE(3); |
FTRACE(3); |
|
|
Line 62 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
Line 62 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
FD_ZERO(&rfd); |
FD_ZERO(&rfd); |
FD_SET(h, &rfd); |
FD_SET(h, &rfd); |
FD_SET(STDIN_FILENO, &rfd); |
FD_SET(STDIN_FILENO, &rfd); |
if (select(h + 1, &rfd, NULL, NULL, &tv) < 1) { | if (select(h + 1, &rfd, NULL, NULL, (Timeout ? &tv : NULL)) < 1) { |
ret = -1; |
ret = -1; |
break; |
break; |
} |
} |
Line 74 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
Line 74 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
ret = -1; |
ret = -1; |
break; |
break; |
} |
} |
rlen = pktSend(h, id, ANSH_FLG_CPOUT, buf, rlen, ea); | |
| /* local command handling */ |
| if (rlen) { |
| /* execute local command */ |
| if (nl == 2) { |
| switch (*buf) { |
| case '.': |
| Kill++; |
| printf("\n"); |
| VERB(1) LOG("Exit from client\n"); |
| continue; |
| case '~': |
| default: |
| nl ^= nl; |
| /* send buffer, unknown command */ |
| break; |
| } |
| } |
| /* skip buffer and wait for local command */ |
| if (nl == 1 && *buf == '~') { |
| nl++; |
| continue; |
| } |
| /* send buffer if detect NL */ |
| if (*buf == 0xa || *buf == 0xd) |
| nl = 1; |
| else |
| nl ^= nl; |
| } else |
| nl ^= nl; |
| |
| if (Crypted) { |
| str = cryptBuffer(buf, rlen, Crypted); |
| if (str) { |
| memcpy(buf, str, rlen); |
| free(str); |
| } |
| } |
| |
| rlen = pktSend(h, id, ANSH_FLG_CPOUT, Crypted, buf, rlen, ea); |
if (rlen == ANSH_FLG_ERR) { |
if (rlen == ANSH_FLG_ERR) { |
ret = -1; |
ret = -1; |
break; |
break; |
Line 82 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
Line 121 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
} else { |
} else { |
rlen = len; |
rlen = len; |
memset(buf, 0, rlen); |
memset(buf, 0, rlen); |
flg = pktRecv(h, buf, &rlen, ð); | flg = pktRecv(h, &Crypted, buf, &rlen, ð); |
if (flg == ANSH_FLG_ERR) { |
if (flg == ANSH_FLG_ERR) { |
ret = -1; |
ret = -1; |
break; |
break; |
Line 97 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
Line 136 ConnectL2(int h, u_short id, struct ether_addr *ea, in
|
} |
} |
if (flg != ANSH_FLG_OK) |
if (flg != ANSH_FLG_OK) |
continue; |
continue; |
|
|
|
if (Crypted) { |
|
str = cryptBuffer(buf, rlen, Crypted); |
|
if (str) { |
|
memcpy(buf, str, rlen); |
|
free(str); |
|
} |
|
} |
|
|
rlen = write(STDOUT_FILENO, buf, rlen); |
rlen = write(STDOUT_FILENO, buf, rlen); |
if (rlen == -1) { |
if (rlen == -1) { |
printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno)); |
printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno)); |