Skip to content
Snippets Groups Projects
Commit 83659316 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Whitespace cleanup

parent 9db9df4a
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #3488 passed
...@@ -95,7 +95,7 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen) ...@@ -95,7 +95,7 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen)
return(inbuf); /* no length? No interpretation */ return(inbuf); /* no length? No interpretation */
} }
first_int=(BYTE*)memchr(inbuf, TELNET_IAC, inlen); first_int=(BYTE*)memchr(inbuf, TELNET_IAC, inlen);
if(telnet_remote_option[TELNET_BINARY_TX]!=TELNET_WILL) { if(telnet_remote_option[TELNET_BINARY_TX]!=TELNET_WILL) {
first_cr=(BYTE*)memchr(inbuf, '\r', inlen); first_cr=(BYTE*)memchr(inbuf, '\r', inlen);
if(first_cr) { if(first_cr) {
...@@ -104,23 +104,23 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen) ...@@ -104,23 +104,23 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen)
} }
} }
if(telnet_cmdlen==0 && first_int==NULL) { if(telnet_cmdlen==0 && first_int==NULL) {
*outlen=inlen; *outlen=inlen;
return(inbuf); /* no interpretation needed */ return(inbuf); /* no interpretation needed */
} }
if(telnet_cmdlen==0 /* If we haven't returned and telnet_cmdlen==0 then first_int is not NULL */ ) { if(telnet_cmdlen==0 /* If we haven't returned and telnet_cmdlen==0 then first_int is not NULL */ ) {
*outlen=first_int-inbuf; *outlen=first_int-inbuf;
memcpy(outbuf, inbuf, *outlen); memcpy(outbuf, inbuf, *outlen);
} else } else
*outlen=0; *outlen=0;
for(i=*outlen;i<inlen;i++) { for(i=*outlen;i<inlen;i++) {
if(telnet_remote_option[TELNET_BINARY_TX]!=TELNET_WILL) { if(telnet_remote_option[TELNET_BINARY_TX]!=TELNET_WILL) {
if(telnet_cmdlen==1 && telnet_cmd[0]=='\r') { if(telnet_cmdlen==1 && telnet_cmd[0]=='\r') {
outbuf[(*outlen)++]='\r'; outbuf[(*outlen)++]='\r';
if(inbuf[i]!=0 && inbuf[i]!=TELNET_IAC) if(inbuf[i]!=0 && inbuf[i]!=TELNET_IAC)
outbuf[(*outlen)++]=inbuf[i]; outbuf[(*outlen)++]=inbuf[i];
telnet_cmdlen=0; telnet_cmdlen=0;
if(inbuf[i]!=TELNET_IAC) if(inbuf[i]!=TELNET_IAC)
continue; continue;
...@@ -131,12 +131,12 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen) ...@@ -131,12 +131,12 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen)
} }
} }
if(inbuf[i]==TELNET_IAC && telnet_cmdlen==1) { /* escaped 255 */ if(inbuf[i]==TELNET_IAC && telnet_cmdlen==1) { /* escaped 255 */
telnet_cmdlen=0; telnet_cmdlen=0;
outbuf[(*outlen)++]=TELNET_IAC; outbuf[(*outlen)++]=TELNET_IAC;
continue; continue;
} }
if(inbuf[i]==TELNET_IAC || telnet_cmdlen) { if(inbuf[i]==TELNET_IAC || telnet_cmdlen) {
if(telnet_cmdlen<sizeof(telnet_cmd)) if(telnet_cmdlen<sizeof(telnet_cmd))
telnet_cmd[telnet_cmdlen++]=inbuf[i]; telnet_cmd[telnet_cmdlen++]=inbuf[i];
...@@ -163,10 +163,10 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen) ...@@ -163,10 +163,10 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen)
telnet_cmdlen=0; telnet_cmdlen=0;
} }
} }
else if(telnet_cmdlen==2 && inbuf[i]<TELNET_WILL) { else if(telnet_cmdlen==2 && inbuf[i]<TELNET_WILL) {
telnet_cmdlen=0; telnet_cmdlen=0;
} }
else if(telnet_cmdlen>=3) { /* telnet option negotiation */ else if(telnet_cmdlen>=3) { /* telnet option negotiation */
lprintf(LOG_INFO,"RX: %s %s" lprintf(LOG_INFO,"RX: %s %s"
,telnet_cmd_desc(command),telnet_opt_desc(option)); ,telnet_cmd_desc(command),telnet_opt_desc(option));
...@@ -236,4 +236,3 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen) ...@@ -236,4 +236,3 @@ BYTE* telnet_interpret(BYTE* inbuf, size_t inlen, BYTE* outbuf, size_t *outlen)
} }
return(outbuf); return(outbuf);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment