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

Limit the number of continues read attempts

This commit is contained in:
Marcel Holtmann 2010-01-28 12:41:31 +01:00
parent 406988b94e
commit 839988cfa3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gatchat/gatchat.c
View File

@ -78,6 +78,7 @@ struct _GAtChat {
gpointer user_disconnect_data; /* user disconnect data */ gpointer user_disconnect_data; /* user disconnect data */
struct ring_buffer *buf; /* Current read buffer */ struct ring_buffer *buf; /* Current read buffer */
guint read_so_far; /* Number of bytes processed */ guint read_so_far; /* Number of bytes processed */
guint max_read_attempts; /* max number of read attempts */
GAtDebugFunc debugf; /* debugging output function */ GAtDebugFunc debugf; /* debugging output function */
gpointer debug_data; /* Data to pass to debug func */ gpointer debug_data; /* Data to pass to debug func */
char *pdu_notify; /* Unsolicited Resp w/ PDU */ char *pdu_notify; /* Unsolicited Resp w/ PDU */
@ -694,6 +695,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
gsize rbytes; gsize rbytes;
gsize toread; gsize toread;
gsize total_read = 0; gsize total_read = 0;
guint read_count = 0;
if (cond & G_IO_NVAL) if (cond & G_IO_NVAL)
return FALSE; return FALSE;
@ -702,8 +704,10 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
do { do {
toread = ring_buffer_avail_no_wrap(chat->buf); toread = ring_buffer_avail_no_wrap(chat->buf);
if (toread == 0) if (toread == 0) {
err = G_IO_ERROR_NONE;
break; break;
}
rbytes = 0; rbytes = 0;
buf = ring_buffer_write_ptr(chat->buf); buf = ring_buffer_write_ptr(chat->buf);
@ -712,12 +716,15 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
g_at_util_debug_chat(TRUE, (char *)buf, rbytes, g_at_util_debug_chat(TRUE, (char *)buf, rbytes,
chat->debugf, chat->debug_data); chat->debugf, chat->debug_data);
read_count++;
total_read += rbytes; total_read += rbytes;
if (rbytes > 0) if (rbytes > 0)
ring_buffer_write_advance(chat->buf, rbytes); ring_buffer_write_advance(chat->buf, rbytes);
} while (err == G_IO_ERROR_NONE && rbytes > 0); } while (err == G_IO_ERROR_NONE && rbytes > 0 &&
read_count < chat->max_read_attempts);
if (total_read > 0) if (total_read > 0)
new_bytes(chat); new_bytes(chat);
@ -902,6 +909,8 @@ GAtChat *g_at_chat_new(GIOChannel *channel, GAtSyntax *syntax)
chat->next_notify_id = 1; chat->next_notify_id = 1;
chat->debugf = NULL; chat->debugf = NULL;
chat->max_read_attempts = 1;
chat->buf = ring_buffer_new(4096); chat->buf = ring_buffer_new(4096);
if (!chat->buf) if (!chat->buf)