--- libaitcli/src/telnet.c 2013/01/17 16:04:31 1.3.4.1 +++ libaitcli/src/telnet.c 2017/10/08 23:10:30 1.4.22.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: telnet.c,v 1.3.4.1 2013/01/17 16:04:31 misho Exp $ +* $Id: telnet.c,v 1.4.22.2 2017/10/08 23:10:30 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2017 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -335,7 +335,7 @@ cli_telnetSend(int sock, struct telnetAttrs *attr, int * @datLen = data size set max size in input, output return copy size * return: -1 can`t get option; !=-1 option code */ -inline int +int cli_telnet_Get_SubOpt(struct telnetAttrs *attr, u_char *code, void *data, u_char *datLen) { u_char *pos, len; @@ -372,7 +372,7 @@ cli_telnet_Get_SubOpt(struct telnetAttrs *attr, u_char * @datLen = data size, if 0 not specified * return: -1 can`t set sub-otion; 0 ok */ -inline int +int cli_telnet_Set_SubOpt(struct telnetAttrs *attr, u_char opt, u_char code, void *data, u_char datLen) { u_char len; @@ -408,7 +408,7 @@ cli_telnet_Set_SubOpt(struct telnetAttrs *attr, u_char * @attr = input attribute * return: -1 can`t get command; !=-1 command <<24 return sublen, <<8 return option, <<0 command */ -inline u_int +u_int cli_telnet_GetCmd(struct telnetAttrs *attr) { u_int ret = 0; @@ -436,14 +436,14 @@ cli_telnet_GetCmd(struct telnetAttrs *attr) * * @attr = input attribute * @cmd = command - * @opt = option, if 0xff not specified + * @optz = option, if 0xff not specified * @arg1 = sub-option code, if 0xff not specified * @arg2 = sub-option data, if NULL not specified * @arg3 = sub-option data size, if 0 not specified data * return: -1 can`t set command; !=-1 ok */ -inline int -cli_telnet_SetCmd(struct telnetAttrs *attr, u_char cmd, u_char opt, ...) +int +cli_telnet_SetCmd(struct telnetAttrs *attr, u_char cmd, int optz, ...) { va_list lst; u_char res; @@ -464,10 +464,10 @@ cli_telnet_SetCmd(struct telnetAttrs *attr, u_char cmd cli_SetErr(EINVAL, "Invalid option argument!"); return -1; } else - attr->ta_opt = opt; + attr->ta_opt = (u_char) optz; } if (SB == attr->ta_cmd) { - va_start(lst, opt); + va_start(lst, optz); res = (u_char) va_arg(lst, int); if (0xff != res) { *attr->ta_sub = res;