Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
6fefd5d3
Commit
6fefd5d3
authored
Apr 28, 2015
by
Daniel Campora
Browse files
cc3200: Move telnet_process_credential with the other private functions.
Just for consistency.
parent
6bbbb1ab
Changes
1
Hide whitespace changes
Inline
Side-by-side
cc3200/telnet/telnet.c
View file @
6fefd5d3
...
...
@@ -128,6 +128,7 @@ static void telnet_send_and_proceed (void *data, _i16 Len, telnet_connected_subs
static
telnet_result_t
telnet_send_non_blocking
(
void
*
data
,
_i16
Len
);
static
telnet_result_t
telnet_recv_text_non_blocking
(
void
*
buff
,
_i16
Maxlen
,
_i16
*
rxLen
);
static
void
telnet_process
(
void
);
static
int
telnet_process_credential
(
char
*
credential
,
_i16
rxLen
);
static
void
telnet_parse_input
(
uint8_t
*
str
,
int16_t
*
len
);
static
bool
telnet_send_with_retries
(
int16_t
sd
,
const
void
*
pBuf
,
int16_t
len
);
static
void
telnet_reset
(
void
);
...
...
@@ -142,28 +143,6 @@ void telnet_init (void) {
telnet_data
.
state
=
E_TELNET_STE_DISABLED
;
}
static
int
telnet_process_credential
(
char
*
credential
,
_i16
rxLen
)
{
telnet_data
.
rxWindex
+=
rxLen
;
if
(
telnet_data
.
rxWindex
>=
SERVERS_USER_PASS_LEN_MAX
)
{
telnet_data
.
rxWindex
=
SERVERS_USER_PASS_LEN_MAX
;
}
uint8_t
*
p
=
telnet_data
.
rxBuffer
+
SERVERS_USER_PASS_LEN_MAX
;
// if a '\r' is found, or the length exceeds the max username length
if
((
p
=
memchr
(
telnet_data
.
rxBuffer
,
'\r'
,
telnet_data
.
rxWindex
))
||
(
telnet_data
.
rxWindex
>=
SERVERS_USER_PASS_LEN_MAX
))
{
uint8_t
len
=
p
-
telnet_data
.
rxBuffer
;
telnet_data
.
rxWindex
=
0
;
if
((
len
>
0
)
&&
(
memcmp
(
credential
,
telnet_data
.
rxBuffer
,
MAX
(
len
,
strlen
(
credential
)))
==
0
))
{
return
1
;
}
return
-
1
;
}
return
0
;
}
void
telnet_run
(
void
)
{
_i16
rxLen
;
switch
(
telnet_data
.
state
)
{
...
...
@@ -451,6 +430,26 @@ static void telnet_process (void) {
}
}
static
int
telnet_process_credential
(
char
*
credential
,
_i16
rxLen
)
{
telnet_data
.
rxWindex
+=
rxLen
;
if
(
telnet_data
.
rxWindex
>=
SERVERS_USER_PASS_LEN_MAX
)
{
telnet_data
.
rxWindex
=
SERVERS_USER_PASS_LEN_MAX
;
}
uint8_t
*
p
=
telnet_data
.
rxBuffer
+
SERVERS_USER_PASS_LEN_MAX
;
// if a '\r' is found, or the length exceeds the max username length
if
((
p
=
memchr
(
telnet_data
.
rxBuffer
,
'\r'
,
telnet_data
.
rxWindex
))
||
(
telnet_data
.
rxWindex
>=
SERVERS_USER_PASS_LEN_MAX
))
{
uint8_t
len
=
p
-
telnet_data
.
rxBuffer
;
telnet_data
.
rxWindex
=
0
;
if
((
len
>
0
)
&&
(
memcmp
(
credential
,
telnet_data
.
rxBuffer
,
MAX
(
len
,
strlen
(
credential
)))
==
0
))
{
return
1
;
}
return
-
1
;
}
return
0
;
}
static
void
telnet_parse_input
(
uint8_t
*
str
,
int16_t
*
len
)
{
int16_t
b_len
=
*
len
;
uint8_t
*
b_str
=
str
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment