diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2011-02-28 16:04:21 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2011-02-28 16:13:56 -0600 |
| commit | d3350d6662d1fd9c4100979e4ab2c4637d33ff97 (patch) | |
| tree | 0fb275bf0f524d844d4906446fc4bb8da4a5aad0 /gatchat | |
| parent | 4da1a9318cb48149688dd55135590bd6158eb0fb (diff) | |
| download | ofono-d3350d6662d1fd9c4100979e4ab2c4637d33ff97.tar.bz2 | |
test-server: Make sure to send CONNECT
Before starting the ppp session we should make sure that the CONNECT
response has been sent on the wire.
Diffstat (limited to 'gatchat')
| -rw-r--r-- | gatchat/test-server.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gatchat/test-server.c b/gatchat/test-server.c index 89ac0524..e2776872 100644 --- a/gatchat/test-server.c +++ b/gatchat/test-server.c @@ -159,7 +159,7 @@ static gboolean update_ppp(gpointer user) return FALSE; } -static gboolean setup_ppp(gpointer user) +static void setup_ppp(gpointer user) { GAtServer *server = user; GAtIO *io; @@ -172,7 +172,7 @@ static gboolean setup_ppp(gpointer user) ppp = g_at_ppp_server_new_from_io(io, "192.168.1.1"); if (ppp == NULL) { g_at_server_resume(server); - return FALSE; + return; } g_at_ppp_set_debug(ppp, server_debug, "PPP"); @@ -184,8 +184,6 @@ static gboolean setup_ppp(gpointer user) g_at_ppp_set_disconnect_function(ppp, ppp_disconnect, server); g_idle_add(update_ppp, ppp); - - return FALSE; } static void cgmi_cb(GAtServer *server, GAtServerRequestType type, @@ -553,6 +551,7 @@ error: static void cgdata_cb(GAtServer *server, GAtServerRequestType type, GAtResult *cmd, gpointer user) { + GAtIO *io; if (modem_mode == 0) { g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR); return; @@ -567,7 +566,9 @@ static void cgdata_cb(GAtServer *server, GAtServerRequestType type, break; case G_AT_SERVER_REQUEST_TYPE_SET: g_at_server_send_intermediate(server, "CONNECT"); - g_idle_add(setup_ppp, server); + + io = g_at_server_get_io(server); + g_at_io_set_write_done(io, setup_ppp, server); break; default: g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR); @@ -788,8 +789,10 @@ static void dial_cb(GAtServer *server, GAtServerRequestType type, c = *dial_str; if (c == '*' || c == '#' || c == 'T' || c == 't') { + GAtIO *io = g_at_server_get_io(server); + g_at_server_send_intermediate(server, "CONNECT"); - g_idle_add(setup_ppp, server); + g_at_io_set_write_done(io, setup_ppp, server); } return; |