colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-bearer: generic CDMA connections are all over serial port and PPP

Browse Source
This commit is contained in:
Aleksander Morgado
2012-08-22 16:01:10 +02:00
parent e38828c318
commit 96a6e8923a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mm-broadband-bearer.c
View File

@@ -270,12 +270,10 @@ dial_cdma_ready (MMBaseModem *modem,
/* else... Yuhu! */ /* else... Yuhu! */
/* If serial port, set PPP method. Otherwise, assume DHCP is needed. */ /* Generic CDMA connections are done over PPP always */
g_assert (MM_IS_AT_SERIAL_PORT (ctx->data));
config = mm_bearer_ip_config_new (); config = mm_bearer_ip_config_new ();
mm_bearer_ip_config_set_method (config, mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_PPP);
(MM_IS_AT_SERIAL_PORT (ctx->data) ?
MM_BEARER_IP_METHOD_PPP :
MM_BEARER_IP_METHOD_DHCP));
/* Assume only IPv4 is given */ /* Assume only IPv4 is given */
g_simple_async_result_set_op_res_gpointer ( g_simple_async_result_set_op_res_gpointer (
@@ -416,14 +414,22 @@ connect_cdma (MMBroadbandBearer *self,
gpointer user_data) gpointer user_data)
{ {
DetailedConnectContext *ctx; DetailedConnectContext *ctx;
MMPort *real_data;
g_assert (primary != NULL); g_assert (primary != NULL);
if (MM_IS_AT_SERIAL_PORT (data))
real_data = data;
else {
mm_dbg ("Ignoring 'net' interface in CDMA connection");
real_data = MM_PORT (primary);
}
ctx = detailed_connect_context_new (self, ctx = detailed_connect_context_new (self,
modem, modem,
primary, primary,
NULL, NULL,
data, real_data,
cancellable, cancellable,
callback, callback,
user_data); user_data);