summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDaniel Campora <daniel@wipy.io>2015-04-28 19:07:10 +0200
committerDaniel Campora <daniel@wipy.io>2015-04-29 00:03:54 +0200
commit6fefd5d3308cbe86b81ffb280ffbf945b14c973a (patch)
treef588fd0ca702f55202416fb7a2353ad3afa97612
parent6bbbb1ab41a5319b0558b2f0131b3f746f0cb5b9 (diff)
downloadmicropython-6fefd5d3308cbe86b81ffb280ffbf945b14c973a.tar.gz
micropython-6fefd5d3308cbe86b81ffb280ffbf945b14c973a.zip
cc3200: Move telnet_process_credential with the other private functions.
Just for consistency.
-rw-r--r--cc3200/telnet/telnet.c43
1 files changed, 21 insertions, 22 deletions
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
index f6d93f8d78..440bf9b2cb 100644
--- a/cc3200/telnet/telnet.c
+++ b/cc3200/telnet/telnet.c
@@ -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;