* we write to it, we will fail. Subsequent write operations will
* succeed. Shudder!
*/
-int telnet_write(struct connection *connection, const void *data, int len)
+static int telnet_write(struct connection *connection, const void *data,
+ int len)
{
struct telnet_connection *t_con = connection->priv;
if (t_con->closed)
return ERROR_SERVER_REMOTE_CLOSED;
}
-int telnet_prompt(struct connection *connection)
+static int telnet_prompt(struct connection *connection)
{
struct telnet_connection *t_con = connection->priv;
- telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
return telnet_write(connection, t_con->prompt, strlen(t_con->prompt));
}
-int telnet_outputline(struct connection *connection, const char *line)
+static int telnet_outputline(struct connection *connection, const char *line)
{
int len;
return ERROR_OK;
}
-int telnet_output(struct command_context *cmd_ctx, const char* line)
+static int telnet_output(struct command_context *cmd_ctx, const char* line)
{
struct connection *connection = cmd_ctx->output_handler_priv;
return telnet_outputline(connection, line);
}
-void telnet_log_callback(void *priv, const char *file, unsigned line,
+static void telnet_log_callback(void *priv, const char *file, unsigned line,
const char *function, const char *string)
{
struct connection *connection = priv;
}
/* clear the command line */
- telnet_write(connection, "\r", 1);
+ for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
+ telnet_write(connection, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", i > 16 ? 16 : i);
for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
telnet_write(connection, " ", i > 16 ? 16 : i);
- telnet_write(connection, "\r", 1);
+ for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
+ telnet_write(connection, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", i > 16 ? 16 : i);
/* output the message */
telnet_outputline(connection, string);
telnet_write(connection, "\b", 1);
}
-int telnet_new_connection(struct connection *connection)
+static int telnet_new_connection(struct connection *connection)
{
struct telnet_connection *telnet_connection = malloc(sizeof(struct telnet_connection));
struct telnet_service *telnet_service = connection->service->priv;
telnet_write(connection, "\r\n", 2);
}
+ telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
telnet_prompt(connection);
/* initialize history */
return ERROR_OK;
}
-void telnet_clear_line(struct connection *connection, struct telnet_connection *t_con)
+static void telnet_clear_line(struct connection *connection,
+ struct telnet_connection *t_con)
{
/* move to end of line */
if (t_con->line_cursor < t_con->line_size)
t_con->line_cursor = 0;
}
-int telnet_input(struct connection *connection)
+static int telnet_input(struct connection *connection)
{
int bytes_read;
unsigned char buffer[TELNET_BUFFER_SIZE];
if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
return ERROR_SERVER_REMOTE_CLOSED;
+ telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */
retval = telnet_prompt(connection);
if (retval == ERROR_SERVER_REMOTE_CLOSED)
return ERROR_SERVER_REMOTE_CLOSED;
return ERROR_OK;
}
-int telnet_connection_closed(struct connection *connection)
+static int telnet_connection_closed(struct connection *connection)
{
struct telnet_connection *t_con = connection->priv;
int i;
return ERROR_OK;
}
-int telnet_set_prompt(struct connection *connection, char *prompt)
-{
- struct telnet_connection *t_con = connection->priv;
-
- if (t_con->prompt != NULL)
- free(t_con->prompt);
-
- t_con->prompt = strdup(prompt);
-
- return ERROR_OK;
-}
-
int telnet_init(char *banner)
{
struct telnet_service *telnet_service = malloc(sizeof(struct telnet_service));
static const struct command_registration telnet_command_handlers[] = {
{
.name = "exit",
- .handler = &handle_exit_command,
+ .handler = handle_exit_command,
.mode = COMMAND_EXEC,
.help = "exit telnet session",
},
{
.name = "telnet_port",
- .handler = &handle_telnet_port_command,
+ .handler = handle_telnet_port_command,
.mode = COMMAND_ANY,
- .help = "port on which to listen "
- "for incoming telnet connections",
- .usage = "<port>",
+ .help = "Specify port on which to listen "
+ "for incoming telnet connections. "
+ "No arguments reports telnet port; zero disables.",
+ .usage = "[port_num]",
},
COMMAND_REGISTRATION_DONE
};