version 1.3, 2011/03/16 17:24:03
|
version 1.4, 2011/05/29 22:49:25
|
Line 5
|
Line 5
|
* $Author$ |
* $Author$ |
* $Id$ |
* $Id$ |
* |
* |
*************************************************************************/ | ************************************************************************** |
| The ELWIX and AITNET software is distributed under the following |
| terms: |
| |
| All of the documentation and software included in the ELWIX and AITNET |
| Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
| |
| Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| by Michael Pounov <misho@elwix.org>. All rights reserved. |
| |
| Redistribution and use in source and binary forms, with or without |
| modification, are permitted provided that the following conditions |
| are met: |
| 1. Redistributions of source code must retain the above copyright |
| notice, this list of conditions and the following disclaimer. |
| 2. Redistributions in binary form must reproduce the above copyright |
| notice, this list of conditions and the following disclaimer in the |
| documentation and/or other materials provided with the distribution. |
| 3. All advertising materials mentioning features or use of this software |
| must display the following acknowledgement: |
| This product includes software developed by Michael Pounov <misho@elwix.org> |
| ELWIX - Embedded LightWeight unIX and its contributors. |
| 4. Neither the name of AITNET nor the names of its contributors |
| may be used to endorse or promote products derived from this software |
| without specific prior written permission. |
| |
| THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND |
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
| OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
| LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| SUCH DAMAGE. |
| */ |
#include "global.h" |
#include "global.h" |
#include "cli.h" |
#include "cli.h" |
|
|
Line 1276 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
Line 1313 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
|
|
exit(ret); |
exit(ret); |
default: |
default: |
telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); | cli_telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE); |
telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); | cli_telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO); |
telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0); | cli_telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0); |
telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0); | cli_telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0); |
telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE); | cli_telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE); |
if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) { | if ((ret = cli_telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) |
cli_Errno = telnet_GetErrno(); | |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); | |
return -1; |
return -1; |
} else | else |
flg = 0; |
flg = 0; |
|
|
while (42) { |
while (42) { |
Line 1307 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
Line 1342 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
|
|
if (FD_ISSET(sock, &fds)) { |
if (FD_ISSET(sock, &fds)) { |
memset(buf, 0, BUFSIZ); |
memset(buf, 0, BUFSIZ); |
if ((ret = telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) { | if ((ret = cli_telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) { |
if (a) |
if (a) |
free(a); |
free(a); |
|
|
Line 1316 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
Line 1351 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
// EOF |
// EOF |
if (-3 == ret) |
if (-3 == ret) |
shutdown(sock, SHUT_RD); |
shutdown(sock, SHUT_RD); |
else { |
|
cli_Errno = telnet_GetErrno(); |
|
strlcpy(cli_Error, telnet_GetError(), STRSIZ); |
|
} |
|
break; |
break; |
} |
} |
attrlen = 0; |
attrlen = 0; |
if (1 == flg && alen) { |
if (1 == flg && alen) { |
telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA); | cli_telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA); |
telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO); | cli_telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO); |
} |
} |
if (2 == flg && alen) { |
if (2 == flg && alen) { |
telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO); | cli_telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO); |
telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, | cli_telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, |
LFLOW_OFF, NULL, 0); |
LFLOW_OFF, NULL, 0); |
telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, | cli_telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, |
LFLOW_RESTART_XON, NULL, 0); |
LFLOW_RESTART_XON, NULL, 0); |
telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE); | cli_telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE); |
} |
} |
if (a) |
if (a) |
free(a); |
free(a); |
Line 1351 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
Line 1382 cliNetLoop(linebuffer_t * __restrict buffer, const cha
|
break; |
break; |
} |
} |
|
|
if ((ret = telnetSend(sock, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) { | if ((ret = cli_telnetSend(sock, Attr, pty == s ? 0 : attrlen, |
cli_Errno = telnet_GetErrno(); | buf, ret, 0)) == -1) |
strlcpy(cli_Error, telnet_GetError(), STRSIZ); | |
break; |
break; |
} else | else |
flg++; |
flg++; |
} |
} |
} |
} |
Line 1394 cliLoop(linebuffer_t * __restrict buffer, const char *
|
Line 1424 cliLoop(linebuffer_t * __restrict buffer, const char *
|
} else |
} else |
cli_addHistory(buffer, NULL); |
cli_addHistory(buffer, NULL); |
// clear whitespaces |
// clear whitespaces |
for (s = line; isspace(*s); s++); | for (s = line; isspace((int) *s); s++); |
if (*s) { |
if (*s) { |
for (t = s + strlen(s) - 1; t > s && isspace(*t); t--); | for (t = s + strlen(s) - 1; t > s && isspace((int) *t); t--); |
*++t = 0; |
*++t = 0; |
} |
} |
|
|