DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now able to call pppd(8)

Browse Source
This commit is contained in:
Pierre Pronchery 2014-08-28 02:27:46 +02:00
parent 4d0b2efdc8
commit f5fe43c0ef
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/common.c
View File

@ -18,6 +18,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <libgen.h>
#include <errno.h> #include <errno.h>
#include <net/if.h> #include <net/if.h>
@ -102,7 +103,7 @@ static int _helper_error(Phone * phone, char const * message, int ret)
/* helper_request */ /* helper_request */
static int _request_call(ModemRequest * request); static int _request_call(Phone * phone, ModemRequest * request);
static int _request_call_hangup(Phone * phone, ModemRequest * request); static int _request_call_hangup(Phone * phone, ModemRequest * request);
static int _request_authenticate(ModemRequest * request); static int _request_authenticate(ModemRequest * request);
@ -113,7 +114,7 @@ static int _helper_request(Phone * phone, ModemRequest * request)
case MODEM_REQUEST_AUTHENTICATE: case MODEM_REQUEST_AUTHENTICATE:
return _request_authenticate(request); return _request_authenticate(request);
case MODEM_REQUEST_CALL: case MODEM_REQUEST_CALL:
return _request_call(request); return _request_call(phone, request);
case MODEM_REQUEST_CALL_HANGUP: case MODEM_REQUEST_CALL_HANGUP:
return _request_call_hangup(phone, request); return _request_call_hangup(phone, request);
default: default:
@ -133,11 +134,32 @@ static int _request_authenticate(ModemRequest * request)
return -error_set_code(1, "Unknown authentication"); return -error_set_code(1, "Unknown authentication");
} }
static int _request_call(ModemRequest * request) static int _request_call(Phone * phone, ModemRequest * request)
{ {
char * argv[] = { "/usr/sbin/pppd", "pppd", "call", "gprs", NULL };
char const * p;
gboolean res;
const GSpawnFlags flags = G_SPAWN_FILE_AND_ARGV_ZERO;
GError * error = NULL;
if(request->call.call_type != MODEM_CALL_TYPE_DATA) if(request->call.call_type != MODEM_CALL_TYPE_DATA)
return -error_set_code(1, "Unknown call type"); return -error_set_code(1, "Unknown call type");
/* FIXME really implement */ /* pppd */
if((p = config_get(phone->config, "gprs", "pppd")) != NULL)
{
if((argv[0] = strdup(p)) == NULL)
return -error_set_code(1, "%s", strerror(errno));
argv[1] = basename(argv[0]);
}
res = g_spawn_async(NULL, argv, NULL, flags, NULL, NULL, NULL, &error);
if(p != NULL)
free(argv[0]);
if(res == FALSE)
{
error_set_code(1, "%s", error->message);
g_error_free(error);
return -1;
}
return 0; return 0;
} }

2
tools/gprs.c
View File

@ -12,8 +12,6 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* TODO:
* - actually call (and track) pppd */