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

bearer-mbim: use common helper to build disconnection message

Browse Source
This commit is contained in:
Aleksander Morgado
2020-11-21 15:18:14 +01:00
parent 0f1cd36e65
commit 8679396d99
1 changed files with 38 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/mm-bearer-mbim.c
View File

@@ -191,6 +191,41 @@ reload_stats (MMBaseBearer *self,
task); task);
} }
/*****************************************************************************/
/* Disconnection message builder.
*/
static MbimMessage *
build_disconnect_message (MMBearerMbim *self,
MMPortMbim *port,
guint32 session_id)
{
if (mbim_device_check_ms_mbimex_version (mm_port_mbim_peek_device (port), 3, 0))
return mbim_message_ms_basic_connect_v3_connect_set_new (session_id,
MBIM_ACTIVATION_COMMAND_DEACTIVATE,
MBIM_COMPRESSION_NONE,
MBIM_AUTH_PROTOCOL_NONE,
MBIM_CONTEXT_IP_TYPE_DEFAULT,
mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET),
MBIM_ACCESS_MEDIA_TYPE_UNKNOWN,
"", /* access string */
"", /* user name */
"", /* password */
NULL, /* unnamed ies */
NULL);
return mbim_message_connect_set_new (session_id,
MBIM_ACTIVATION_COMMAND_DEACTIVATE,
"", /* access string */
"", /* user name */
"", /* password */
MBIM_COMPRESSION_NONE,
MBIM_AUTH_PROTOCOL_NONE,
MBIM_CONTEXT_IP_TYPE_DEFAULT,
mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET),
NULL);
}
/*****************************************************************************/ /*****************************************************************************/
/* Connect */ /* Connect */
@@ -1158,39 +1193,9 @@ connect_context_step (GTask *task)
return; return;
} }
case CONNECT_STEP_ENSURE_DISCONNECTED: { case CONNECT_STEP_ENSURE_DISCONNECTED:
MbimDevice *device;
mm_obj_dbg (self, "ensuring session %u is disconnected...", ctx->session_id); mm_obj_dbg (self, "ensuring session %u is disconnected...", ctx->session_id);
message = build_disconnect_message (self, ctx->mbim, ctx->session_id);
device = mm_port_mbim_peek_device (ctx->mbim);
if (mbim_device_check_ms_mbimex_version (device, 3, 0))
message = mbim_message_ms_basic_connect_v3_connect_set_new (
ctx->session_id,
MBIM_ACTIVATION_COMMAND_DEACTIVATE,
MBIM_COMPRESSION_NONE,
MBIM_AUTH_PROTOCOL_NONE,
MBIM_CONTEXT_IP_TYPE_DEFAULT,
mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET),
MBIM_ACCESS_MEDIA_TYPE_UNKNOWN,
"", /* access string */
"", /* user name */
"", /* password */
NULL, /* unnamed ies */
NULL);
else
message = mbim_message_connect_set_new (
ctx->session_id,
MBIM_ACTIVATION_COMMAND_DEACTIVATE,
"",
"",
"",
MBIM_COMPRESSION_NONE,
MBIM_AUTH_PROTOCOL_NONE,
MBIM_CONTEXT_IP_TYPE_DEFAULT,
mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET),
NULL);
mbim_device_command (mm_port_mbim_peek_device (ctx->mbim), mbim_device_command (mm_port_mbim_peek_device (ctx->mbim),
message, message,
MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT,
@@ -1198,7 +1203,6 @@ connect_context_step (GTask *task)
(GAsyncReadyCallback)ensure_disconnected_ready, (GAsyncReadyCallback)ensure_disconnected_ready,
task); task);
return; return;
}
case CONNECT_STEP_CONNECT: { case CONNECT_STEP_CONNECT: {
MbimDevice *device; MbimDevice *device;
@@ -1600,35 +1604,8 @@ disconnect_context_step (GTask *task)
case DISCONNECT_STEP_DISCONNECT: { case DISCONNECT_STEP_DISCONNECT: {
g_autoptr(MbimMessage) message = NULL; g_autoptr(MbimMessage) message = NULL;
MbimDevice *device;
device = mm_port_mbim_peek_device (ctx->mbim); message = build_disconnect_message (self, ctx->mbim, ctx->session_id);
if (mbim_device_check_ms_mbimex_version (device, 3, 0))
message = mbim_message_ms_basic_connect_v3_connect_set_new (
ctx->session_id,
MBIM_ACTIVATION_COMMAND_DEACTIVATE,
MBIM_COMPRESSION_NONE,
MBIM_AUTH_PROTOCOL_NONE,
MBIM_CONTEXT_IP_TYPE_DEFAULT,
mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET),
MBIM_ACCESS_MEDIA_TYPE_UNKNOWN,
"",
"",
"",
NULL,
NULL);
else
message = mbim_message_connect_set_new (
ctx->session_id,
MBIM_ACTIVATION_COMMAND_DEACTIVATE,
"",
"",
"",
MBIM_COMPRESSION_NONE,
MBIM_AUTH_PROTOCOL_NONE,
MBIM_CONTEXT_IP_TYPE_DEFAULT,
mbim_uuid_from_context_type (MBIM_CONTEXT_TYPE_INTERNET),
NULL);
mbim_device_command (mm_port_mbim_peek_device (ctx->mbim), mbim_device_command (mm_port_mbim_peek_device (ctx->mbim),
message, message,
MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT,