sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Ensure g_timeout_add source can be removed safely

This commit is contained in:
Denis Kenzior 2009-08-07 16:20:59 -05:00
parent ebce9fbd4d
commit 5e4ff5ced9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gatchat/gatchat.c
View File

@ -83,6 +83,7 @@ struct _GAtChat {
char *pdu_notify; /* Unsolicited Resp w/ PDU */
GSList *response_lines; /* char * lines of the response */
char *wakeup; /* command sent to wakeup modem */
gint timeout_source;
gdouble inactivity_time; /* Period of inactivity */
guint wakeup_timeout; /* How long to wait for resp */
GTimer *wakeup_timer; /* Keep track of elapsed time */
@ -719,6 +720,8 @@ static gboolean wakeup_no_response(gpointer user)
GAtChat *chat = user;
struct at_command *cmd = g_queue_peek_head(chat->command_queue);
chat->timeout_source = 0;
/* Sometimes during startup the modem is still in the ready state
* and might acknowledge our 'wakeup' command. In that case don't
* timeout the wrong command
@ -788,8 +791,8 @@ static gboolean can_write_data(GIOChannel *channel, GIOCondition cond,
len = strlen(chat->wakeup);
g_timeout_add(chat->wakeup_timeout, wakeup_no_response,
chat);
chat->timeout_source = g_timeout_add(chat->wakeup_timeout,
wakeup_no_response, chat);
}
towrite = len - chat->cmd_bytes_written;
@ -988,6 +991,11 @@ gboolean g_at_chat_shutdown(GAtChat *chat)
if (chat->channel == NULL)
return FALSE;
if (chat->timeout_source) {
g_source_remove(chat->timeout_source);
chat->timeout_source = 0;
}
chat->disconnecting = TRUE;
if (chat->read_watch)