projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dont smash aoview_monitor_parse input buffer
[fw/altos]
/
aoview
/
aoview_monitor.c
diff --git
a/aoview/aoview_monitor.c
b/aoview/aoview_monitor.c
index d01ca77160993bcd154b683f3ebb9fc1faa40530..5810be5b91fb006117ac57f048421685a1a86930 100644
(file)
--- a/
aoview/aoview_monitor.c
+++ b/
aoview/aoview_monitor.c
@@
-31,7
+31,6
@@
aoview_monitor_disconnect(void)
aoview_serial_close(monitor_serial);
monitor_serial = NULL;
}
aoview_serial_close(monitor_serial);
monitor_serial = NULL;
}
- aoview_table_clear();
aoview_log_new();
}
aoview_log_new();
}
@@
-66,16
+65,20
@@
aoview_parse_pos(double *target, char *source)
*target = r;
}
*target = r;
}
-static void
-aoview_monitor_parse(char *line)
+static struct aostate state;
+
+gboolean
+aoview_monitor_parse(const char *input_line)
{
char *saveptr;
char *words[64];
int nword;
{
char *saveptr;
char *words[64];
int nword;
-
struct aostate stat
e;
+
char line_buf[8192], *lin
e;
- if (aoview_log_get_serial())
- aoview_log_printf ("%s\n", line);
+ /* avoid smashing our input parameter */
+ strncpy (line_buf, input_line, sizeof (line_buf)-1);
+ line_buf[sizeof(line_buf) - 1] = '\0';
+ line = line_buf;
for (nword = 0; nword < 64; nword++) {
words[nword] = strtok_r(line, " \t\n", &saveptr);
line = NULL;
for (nword = 0; nword < 64; nword++) {
words[nword] = strtok_r(line, " \t\n", &saveptr);
line = NULL;
@@
-83,12
+86,11
@@
aoview_monitor_parse(char *line)
break;
}
if (nword < 36)
break;
}
if (nword < 36)
- return;
+ return
FALSE
;
if (strcmp(words[0], "CALL") != 0)
if (strcmp(words[0], "CALL") != 0)
- return;
+ return
FALSE
;
aoview_parse_string(state.callsign, sizeof (state.callsign), words[1]);
aoview_parse_int(&state.serial, words[3]);
aoview_parse_string(state.callsign, sizeof (state.callsign), words[1]);
aoview_parse_int(&state.serial, words[3]);
- aoview_log_set_serial(state.serial);
aoview_parse_int(&state.rssi, words[5]);
aoview_parse_string(state.state, sizeof (state.state), words[9]);
aoview_parse_int(&state.rssi, words[5]);
aoview_parse_string(state.state, sizeof (state.state), words[9]);
@@
-133,6
+135,13
@@
aoview_monitor_parse(char *line)
state.v_error = 0;
}
aoview_state_notify(&state);
state.v_error = 0;
}
aoview_state_notify(&state);
+ return TRUE;
+}
+
+void
+aoview_monitor_reset(void)
+{
+ memset(&state, '\0', sizeof (state));
}
static void
}
static void
@@
-155,8
+164,13
@@
aoview_monitor_callback(gpointer user_data,
continue;
if (c == '\n') {
monitor_line[monitor_pos] = '\0';
continue;
if (c == '\n') {
monitor_line[monitor_pos] = '\0';
- if (monitor_pos)
- aoview_monitor_parse(monitor_line);
+ if (monitor_pos) {
+ if (aoview_monitor_parse(monitor_line)) {
+ aoview_log_set_serial(state.serial);
+ if (aoview_log_get_serial())
+ aoview_log_printf ("%s\n", monitor_line);
+ }
+ }
monitor_pos = 0;
} else if (monitor_pos < MONITOR_LEN)
monitor_line[monitor_pos++] = c;
monitor_pos = 0;
} else if (monitor_pos < MONITOR_LEN)
monitor_line[monitor_pos++] = c;
@@
-171,6
+185,8
@@
aoview_monitor_connect(char *tty)
monitor_serial = aoview_serial_open(tty);
if (!monitor_serial)
return FALSE;
monitor_serial = aoview_serial_open(tty);
if (!monitor_serial)
return FALSE;
+ aoview_table_clear();
+ aoview_monitor_reset();
aoview_serial_set_callback(monitor_serial,
aoview_monitor_callback,
monitor_serial,
aoview_serial_set_callback(monitor_serial,
aoview_monitor_callback,
monitor_serial,