aoview_serial_close(monitor_serial);
monitor_serial = NULL;
}
- aoview_table_clear();
aoview_log_new();
}
*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;
- struct aostate state;
+ char line_buf[8192], *line;
- 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;
break;
}
if (nword < 36)
- return;
+ return FALSE;
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_log_set_serial(state.serial);
aoview_parse_int(&state.rssi, words[5]);
aoview_parse_string(state.state, sizeof (state.state), words[9]);
state.v_error = 0;
}
aoview_state_notify(&state);
+ return TRUE;
+}
+
+void
+aoview_monitor_reset(void)
+{
+ memset(&state, '\0', sizeof (state));
}
static void
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_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,