Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mms-engine
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core
mms-engine
Commits
b9fe7422
Commit
b9fe7422
authored
Jul 12, 2016
by
Slava Monich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[mms-engine] Logging cleanup. MER#1027
Logging functionality that used to be part of mms-engine has been migrated to libglibutil
parent
f4d77484
Changes
58
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
58 changed files
with
776 additions
and
905 deletions
+776
-905
mms-connman-nemo/include/mms_connman_nemo_log.h
mms-connman-nemo/include/mms_connman_nemo_log.h
+1
-2
mms-connman-nemo/src/mms_connection_nemo.c
mms-connman-nemo/src/mms_connection_nemo.c
+37
-37
mms-connman-nemo/src/mms_connman_nemo.c
mms-connman-nemo/src/mms_connman_nemo.c
+14
-14
mms-connman-ofono/include/mms_connman_ofono_log.h
mms-connman-ofono/include/mms_connman_ofono_log.h
+1
-2
mms-connman-ofono/src/mms_connection_ofono.c
mms-connman-ofono/src/mms_connection_ofono.c
+27
-27
mms-connman-ofono/src/mms_connman_ofono.c
mms-connman-ofono/src/mms_connman_ofono.c
+20
-20
mms-engine/main.c
mms-engine/main.c
+20
-19
mms-engine/mms_engine.c
mms-engine/mms_engine.c
+30
-31
mms-handler-dbus/src/mms_handler_dbus.c
mms-handler-dbus/src/mms_handler_dbus.c
+19
-19
mms-lib/Makefile
mms-lib/Makefile
+0
-4
mms-lib/include/mms_lib_log.h
mms-lib/include/mms_lib_log.h
+1
-2
mms-lib/include/mms_log.h
mms-lib/include/mms_log.h
+0
-96
mms-lib/src/mms_attachment.c
mms-lib/src/mms_attachment.c
+12
-14
mms-lib/src/mms_attachment_image.c
mms-lib/src/mms_attachment_image.c
+15
-15
mms-lib/src/mms_attachment_jpeg.c
mms-lib/src/mms_attachment_jpeg.c
+8
-8
mms-lib/src/mms_attachment_qt.cpp
mms-lib/src/mms_attachment_qt.cpp
+5
-5
mms-lib/src/mms_codec.c
mms-lib/src/mms_codec.c
+6
-12
mms-lib/src/mms_codec.h
mms-lib/src/mms_codec.h
+8
-7
mms-lib/src/mms_connection.c
mms-lib/src/mms_connection.c
+4
-5
mms-lib/src/mms_connman.c
mms-lib/src/mms_connman.c
+5
-6
mms-lib/src/mms_dispatcher.c
mms-lib/src/mms_dispatcher.c
+26
-28
mms-lib/src/mms_error.c
mms-lib/src/mms_error.c
+3
-4
mms-lib/src/mms_error.h
mms-lib/src/mms_error.h
+3
-3
mms-lib/src/mms_file_util.c
mms-lib/src/mms_file_util.c
+6
-8
mms-lib/src/mms_handler.c
mms-lib/src/mms_handler.c
+27
-38
mms-lib/src/mms_message.c
mms-lib/src/mms_message.c
+10
-11
mms-lib/src/mms_task.c
mms-lib/src/mms_task.c
+25
-26
mms-lib/src/mms_task_decode.c
mms-lib/src/mms_task_decode.c
+26
-26
mms-lib/src/mms_task_encode.c
mms-lib/src/mms_task_encode.c
+21
-22
mms-lib/src/mms_task_http.c
mms-lib/src/mms_task_http.c
+39
-39
mms-lib/src/mms_task_notification.c
mms-lib/src/mms_task_notification.c
+28
-29
mms-lib/src/mms_task_publish.c
mms-lib/src/mms_task_publish.c
+8
-8
mms-lib/src/mms_task_read.c
mms-lib/src/mms_task_read.c
+1
-3
mms-lib/src/mms_task_retrieve.c
mms-lib/src/mms_task_retrieve.c
+6
-7
mms-lib/src/mms_task_send.c
mms-lib/src/mms_task_send.c
+8
-9
mms-lib/src/mms_transfer_list.c
mms-lib/src/mms_transfer_list.c
+4
-5
mms-lib/test/common/Makefile
mms-lib/test/common/Makefile
+1
-2
mms-lib/test/common/test_connection.c
mms-lib/test/common/test_connection.c
+5
-6
mms-lib/test/common/test_connman.c
mms-lib/test/common/test_connman.c
+5
-6
mms-lib/test/common/test_handler.c
mms-lib/test/common/test_handler.c
+38
-39
mms-lib/test/common/test_http.c
mms-lib/test/common/test_http.c
+6
-6
mms-lib/test/common/test_transfer_list.c
mms-lib/test/common/test_transfer_list.c
+3
-4
mms-lib/test/common/test_util.c
mms-lib/test/common/test_util.c
+5
-5
mms-lib/test/test_delivery_ind/test_delivery_ind.c
mms-lib/test/test_delivery_ind/test_delivery_ind.c
+17
-15
mms-lib/test/test_media_type/test_media_type.c
mms-lib/test/test_media_type/test_media_type.c
+7
-7
mms-lib/test/test_mms_codec/test_mms_codec.c
mms-lib/test/test_mms_codec/test_mms_codec.c
+11
-10
mms-lib/test/test_read_ind/test_read_ind.c
mms-lib/test/test_read_ind/test_read_ind.c
+17
-15
mms-lib/test/test_read_report/test_read_report.c
mms-lib/test/test_read_report/test_read_report.c
+19
-19
mms-lib/test/test_resize/test_resize.c
mms-lib/test/test_resize/test_resize.c
+22
-19
mms-lib/test/test_retrieve/test_retrieve.c
mms-lib/test/test_retrieve/test_retrieve.c
+27
-27
mms-lib/test/test_retrieve_cancel/test_retrieve_cancel.c
mms-lib/test/test_retrieve_cancel/test_retrieve_cancel.c
+19
-18
mms-lib/test/test_retrieve_no_proxy/test_retrieve_no_proxy.c
mms-lib/test/test_retrieve_no_proxy/test_retrieve_no_proxy.c
+15
-16
mms-lib/test/test_retrieve_order/test_retrieve_order.c
mms-lib/test/test_retrieve_order/test_retrieve_order.c
+17
-17
mms-lib/test/test_send/test_send.c
mms-lib/test/test_send/test_send.c
+17
-18
mms-settings-dconf/src/mms_settings_dconf.c
mms-settings-dconf/src/mms_settings_dconf.c
+28
-27
mms-transfer-list-dbus/src/mms_transfer_dbus.c
mms-transfer-list-dbus/src/mms_transfer_dbus.c
+10
-7
mms-transfer-list-dbus/src/mms_transfer_list_dbus.c
mms-transfer-list-dbus/src/mms_transfer_list_dbus.c
+12
-10
rpm/mms-engine.spec
rpm/mms-engine.spec
+1
-1
No files found.
mms-connman-nemo/include/mms_connman_nemo_log.h
View file @
b9fe7422
...
...
@@ -10,13 +10,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef JOLLA_MMS_CONNMAN_NEMO_LOG_H
#define JOLLA_MMS_CONNMAN_NEMO_LOG_H
#include "mms_l
og
.h"
#include "mms_l
ib_types
.h"
#define MMS_CONNMAN_LOG_MODULES(log) \
log(gofonoext_log) \
...
...
mms-connman-nemo/src/mms_connection_nemo.c
View file @
b9fe7422
...
...
@@ -10,7 +10,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "mms_connection_nemo.h"
...
...
@@ -20,9 +19,10 @@
#include <gofono_connctx.h>
/* Logging */
#define
MMS_
LOG_MODULE_NAME mms_connection_log
#define
G
LOG_MODULE_NAME mms_connection_log
#include "mms_connman_nemo_log.h"
MMS_LOG_MODULE_DEFINE
(
"mms-connection-nemo"
);
#include <gutil_log.h>
GLOG_MODULE_DEFINE
(
"mms-connection-nemo"
);
enum
mm_handler_id
{
MM_HANDLER_VALID
,
...
...
@@ -113,7 +113,7 @@ mms_connection_nemo_reset_mms_imsi_done(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
DEBUG
(
"Released %s"
,
self
->
path
);
G
DEBUG
(
"Released %s"
,
self
->
path
);
mms_connman_busy_dec
(
self
->
cm
);
mms_connection_unref
(
&
self
->
connection
);
}
...
...
@@ -161,7 +161,7 @@ mms_connection_nemo_cancel(
{
if
(
self
->
connection
.
state
<=
MMS_CONNECTION_STATE_OPENING
&&
mms_connection_nemo_set_state
(
self
,
MMS_CONNECTION_STATE_FAILED
))
{
MMS_
DEBUG
(
"Connection %s cancelled"
,
self
->
connection
.
imsi
);
G
DEBUG
(
"Connection %s cancelled"
,
self
->
connection
.
imsi
);
}
else
{
mms_connection_nemo_set_state
(
self
,
MMS_CONNECTION_STATE_CLOSED
);
}
...
...
@@ -174,7 +174,7 @@ mms_connection_nemo_cancel_if_invalid(
void
*
arg
)
{
if
(
!
obj
->
valid
)
{
MMS_
VERBOSE_
(
"oops!"
);
G
VERBOSE_
(
"oops!"
);
mms_connection_nemo_cancel
(
MMS_CONNECTION_NEMO
(
arg
));
}
}
...
...
@@ -186,9 +186,9 @@ mms_connection_nemo_active_changed(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
active
)
{
MMS_
DEBUG
(
"Connection %s opened"
,
self
->
connection
.
imsi
);
G
DEBUG
(
"Connection %s opened"
,
self
->
connection
.
imsi
);
mms_connection_nemo_set_state
(
self
,
MMS_CONNECTION_STATE_OPEN
);
}
else
{
mms_connection_nemo_disconnect_context
(
self
,
CONTEXT_HANDLER_ACTIVE
);
...
...
@@ -203,10 +203,10 @@ mms_connection_nemo_interface_changed(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
ifname
)
{
self
->
connection
.
netif
=
context
->
ifname
;
MMS_
DEBUG
(
"Interface: %s"
,
self
->
connection
.
netif
);
G
DEBUG
(
"Interface: %s"
,
self
->
connection
.
netif
);
}
else
{
self
->
connection
.
netif
=
NULL
;
}
...
...
@@ -219,10 +219,10 @@ mms_connection_nemo_mms_proxy_changed(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
mms_proxy
)
{
self
->
connection
.
mmsproxy
=
context
->
mms_proxy
;
MMS_
DEBUG
(
"MessageProxy: %s"
,
self
->
connection
.
mmsproxy
);
G
DEBUG
(
"MessageProxy: %s"
,
self
->
connection
.
mmsproxy
);
}
else
{
self
->
connection
.
mmsproxy
=
NULL
;
}
...
...
@@ -235,10 +235,10 @@ mms_connection_nemo_mms_center_changed(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
mms_center
)
{
self
->
connection
.
mmsc
=
context
->
mms_center
;
MMS_
DEBUG
(
"MessageCenter: %s"
,
self
->
connection
.
mmsc
);
G
DEBUG
(
"MessageCenter: %s"
,
self
->
connection
.
mmsc
);
}
else
{
self
->
connection
.
mmsc
=
NULL
;
}
...
...
@@ -252,7 +252,7 @@ mms_connection_nemo_activate_failed(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
mms_connection_nemo_cancel
(
self
);
}
...
...
@@ -269,7 +269,7 @@ mms_connection_nemo_check_context(
}
else
{
OfonoConnMgr
*
connmgr
=
self
->
connmgr
;
if
(
ofono_connmgr_valid
(
connmgr
)
&&
connmgr
->
attached
)
{
MMS_
DEBUG
(
"Activate %s"
,
ofono_connctx_path
(
context
));
G
DEBUG
(
"Activate %s"
,
ofono_connctx_path
(
context
));
ofono_connctx_activate
(
context
);
}
}
...
...
@@ -283,7 +283,7 @@ mms_connection_nemo_connmgr_attached_changed(
void
*
arg
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
MMS_
DEBUG
(
"Data registration %s for %s"
,
connmgr
->
attached
?
"on"
:
"off"
,
G
DEBUG
(
"Data registration %s for %s"
,
connmgr
->
attached
?
"on"
:
"off"
,
ofono_connmgr_path
(
connmgr
));
mms_connection_nemo_check_context
(
self
);
}
...
...
@@ -307,15 +307,15 @@ mms_connection_nemo_setup_context(
/* Capture the current context state */
if
(
context
->
mms_proxy
&&
context
->
mms_proxy
[
0
])
{
conn
->
mmsproxy
=
context
->
mms_proxy
;
MMS_
DEBUG
(
"MessageProxy: %s"
,
conn
->
mmsproxy
);
G
DEBUG
(
"MessageProxy: %s"
,
conn
->
mmsproxy
);
}
if
(
context
->
mms_center
&&
context
->
mms_center
[
0
])
{
conn
->
mmsc
=
context
->
mms_center
;
MMS_
DEBUG
(
"MessageCenter: %s"
,
conn
->
mmsc
);
G
DEBUG
(
"MessageCenter: %s"
,
conn
->
mmsc
);
}
if
(
context
->
ifname
&&
context
->
ifname
[
0
])
{
conn
->
netif
=
context
->
ifname
;
MMS_
DEBUG
(
"Interface: %s"
,
conn
->
netif
);
G
DEBUG
(
"Interface: %s"
,
conn
->
netif
);
}
/* Track context property changes */
...
...
@@ -364,8 +364,8 @@ void
mms_connection_nemo_init_context
(
MMSConnectionNemo
*
self
)
{
MMS_
ASSERT
(
ofono_connmgr_valid
(
self
->
connmgr
));
MMS_
ASSERT
(
!
self
->
context
);
G
ASSERT
(
ofono_connmgr_valid
(
self
->
connmgr
));
G
ASSERT
(
!
self
->
context
);
/* From this point on, cancel the connection if OfonoConnMgr becomes
* invalid (which would probably mean SIM removal or ofono crash) */
...
...
@@ -379,7 +379,7 @@ mms_connection_nemo_init_context(
self
->
context
=
ofono_connctx_ref
(
ofono_connmgr_get_context_for_type
(
self
->
connmgr
,
OFONO_CONNCTX_TYPE_MMS
));
if
(
self
->
context
)
{
MMS_
DEBUG
(
"MMS context %s"
,
ofono_connctx_path
(
self
->
context
));
G
DEBUG
(
"MMS context %s"
,
ofono_connctx_path
(
self
->
context
));
if
(
ofono_connctx_valid
(
self
->
context
))
{
mms_connection_nemo_setup_context
(
self
);
}
else
{
...
...
@@ -388,7 +388,7 @@ mms_connection_nemo_init_context(
mms_connection_nemo_context_valid_changed
,
self
);
}
}
else
{
MMS_
WARN
(
"No MMS context"
);
G
WARN
(
"No MMS context"
);
mms_connection_nemo_cancel
(
self
);
}
}
...
...
@@ -414,7 +414,7 @@ mms_connection_nemo_mms_imsi_changed(
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
arg
);
if
(
mm
->
valid
&&
g_strcmp0
(
mm
->
mms_imsi
,
self
->
connection
.
imsi
))
{
MMS_
VERBOSE_
(
"%s"
,
mm
->
mms_imsi
);
G
VERBOSE_
(
"%s"
,
mm
->
mms_imsi
);
mms_connection_nemo_cancel
(
self
);
}
}
...
...
@@ -431,9 +431,9 @@ mms_connection_nemo_set_mms_imsi_done(
if
(
error
)
{
mms_connection_nemo_cancel
(
self
);
}
else
{
MMS_
DEBUG
(
"MMS modem path %s"
,
path
);
MMS_
ASSERT
(
!
self
->
path
);
MMS_
ASSERT
(
!
self
->
connmgr
);
G
DEBUG
(
"MMS modem path %s"
,
path
);
G
ASSERT
(
!
self
->
path
);
G
ASSERT
(
!
self
->
connmgr
);
self
->
path
=
g_strdup
(
path
);
if
(
self
->
connection
.
state
==
MMS_CONNECTION_STATE_OPENING
)
{
...
...
@@ -454,7 +454,7 @@ mms_connection_nemo_set_mms_imsi_done(
}
}
else
{
/* Connection has been cancelled, release the slot */
MMS_
DEBUG
(
"Canceled, releasing %s"
,
path
);
G
DEBUG
(
"Canceled, releasing %s"
,
path
);
mms_connection_ref
(
&
self
->
connection
);
mms_connman_busy_inc
(
self
->
cm
);
ofonoext_mm_set_mms_imsi_full
(
self
->
mm
,
""
,
...
...
@@ -473,7 +473,7 @@ mms_connection_nemo_cancel_if_mm_invalid(
void
*
arg
)
{
if
(
!
mm
->
valid
)
{
MMS_
VERBOSE_
(
"oops!"
);
G
VERBOSE_
(
"oops!"
);
mms_connection_nemo_cancel
(
MMS_CONNECTION_NEMO
(
arg
));
}
}
...
...
@@ -504,7 +504,7 @@ mms_connection_nemo_mm_valid_changed(
OfonoExtModemManager
*
mm
,
void
*
arg
)
{
MMS_
VERBOSE_
(
"%p %d"
,
arg
,
mm
->
valid
);
G
VERBOSE_
(
"%p %d"
,
arg
,
mm
->
valid
);
if
(
mm
->
valid
)
{
mms_connection_nemo_request_sim
(
arg
);
}
...
...
@@ -519,7 +519,7 @@ mms_connection_nemo_new(
MMSConnectionNemo
*
self
=
g_object_new
(
MMS_TYPE_CONNECTION_NEMO
,
NULL
);
MMSConnection
*
conn
=
&
self
->
connection
;
MMS_
VERBOSE_
(
"%p %s"
,
self
,
imsi
);
G
VERBOSE_
(
"%p %s"
,
self
,
imsi
);
conn
->
type
=
type
;
conn
->
imsi
=
self
->
imsi
=
g_strdup
(
imsi
);
conn
->
state
=
MMS_CONNECTION_STATE_OPENING
;
...
...
@@ -545,7 +545,7 @@ mms_connection_nemo_close(
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
connection
);
OfonoConnCtx
*
context
=
self
->
context
;
if
(
ofono_connctx_valid
(
context
)
&&
context
->
active
)
{
MMS_
DEBUG
(
"Deactivate %s"
,
ofono_connctx_path
(
context
));
G
DEBUG
(
"Deactivate %s"
,
ofono_connctx_path
(
context
));
ofono_connctx_deactivate
(
context
);
}
else
{
mms_connection_nemo_cancel
(
self
);
...
...
@@ -562,8 +562,8 @@ mms_connection_nemo_dispose(
GObject
*
object
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
object
);
MMS_
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
MMS_
ASSERT
(
!
mms_connection_is_active
(
&
self
->
connection
));
G
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
G
ASSERT
(
!
mms_connection_is_active
(
&
self
->
connection
));
mms_connection_nemo_disconnect
(
self
);
if
(
self
->
context
)
{
if
(
mms_connection_is_active
(
&
self
->
connection
)
&&
...
...
@@ -586,7 +586,7 @@ mms_connection_nemo_finalize(
GObject
*
object
)
{
MMSConnectionNemo
*
self
=
MMS_CONNECTION_NEMO
(
object
);
MMS_
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
G
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
ofono_connmgr_unref
(
self
->
connmgr
);
ofono_connctx_unref
(
self
->
context
);
ofonoext_mm_unref
(
self
->
mm
);
...
...
@@ -618,7 +618,7 @@ void
mms_connection_nemo_init
(
MMSConnectionNemo
*
self
)
{
MMS_
VERBOSE_
(
"%p"
,
self
);
G
VERBOSE_
(
"%p"
,
self
);
}
/*
...
...
mms-connman-nemo/src/mms_connman_nemo.c
View file @
b9fe7422
...
...
@@ -10,7 +10,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "mms_connman_nemo.h"
...
...
@@ -20,9 +19,10 @@
#include <gofono_modem.h>
/* Logging */
#define
MMS_
LOG_MODULE_NAME mms_connman_log
#define
G
LOG_MODULE_NAME mms_connman_log
#include "mms_connman_nemo_log.h"
MMS_LOG_MODULE_DEFINE
(
"mms-connman-nemo"
);
#include <gutil_log.h>
GLOG_MODULE_DEFINE
(
"mms-connman-nemo"
);
enum
mm_event
{
MM_EVENT_VALID
,
...
...
@@ -79,10 +79,10 @@ mms_connman_nemo_check_default_sim(
if
(
g_strcmp0
(
path
,
ofono_simmgr_path
(
self
->
default_sim
)))
{
ofono_simmgr_unref
(
self
->
default_sim
);
if
(
path
)
{
MMS_
DEBUG
(
"Default SIM at %s"
,
path
);
G
DEBUG
(
"Default SIM at %s"
,
path
);
self
->
default_sim
=
ofono_simmgr_new
(
path
);
}
else
{
MMS_
DEBUG
(
"No default SIM"
);
G
DEBUG
(
"No default SIM"
);
self
->
default_sim
=
NULL
;
}
}
...
...
@@ -136,10 +136,10 @@ mms_connman_nemo_default_imsi(
ofono_simmgr_wait_valid
(
self
->
default_sim
,
MMS_INIT_TIMEOUT_MS
,
0
)
&&
self
->
default_sim
/* Check it again */
&&
self
->
default_sim
->
imsi
)
{
MMS_
DEBUG
(
"Default IMSI %s"
,
self
->
default_sim
->
imsi
);
G
DEBUG
(
"Default IMSI %s"
,
self
->
default_sim
->
imsi
);
return
g_strdup
(
self
->
default_sim
->
imsi
);
}
MMS_
DEBUG
(
"No default IMSI"
);
G
DEBUG
(
"No default IMSI"
);
return
NULL
;
}
...
...
@@ -153,8 +153,8 @@ mms_connman_nemo_connection_weak_ref_notify(
GObject
*
connection
)
{
MMSConnManNemo
*
self
=
MMS_CONNMAN_NEMO
(
arg
);
MMS_
ASSERT
(
MMS_CONNECTION
(
connection
)
==
self
->
conn
);
MMS_
VERBOSE_
(
"%p"
,
connection
);
G
ASSERT
(
MMS_CONNECTION
(
connection
)
==
self
->
conn
);
G
VERBOSE_
(
"%p"
,
connection
);
self
->
conn_change_id
=
0
;
self
->
conn
=
NULL
;
}
...
...
@@ -168,7 +168,7 @@ mms_connman_nemo_drop_connection(
MMSConnManNemo
*
self
)
{
if
(
self
->
conn
)
{
MMS_
VERBOSE_
(
"%p"
,
self
->
conn
);
G
VERBOSE_
(
"%p"
,
self
->
conn
);
mms_connection_remove_handler
(
self
->
conn
,
self
->
conn_change_id
);
self
->
conn_change_id
=
0
;
g_object_weak_unref
(
G_OBJECT
(
self
->
conn
),
...
...
@@ -187,7 +187,7 @@ mms_connman_nemo_connection_state_changed(
void
*
arg
)
{
MMSConnManNemo
*
self
=
MMS_CONNMAN_NEMO
(
arg
);
MMS_
ASSERT
(
connection
==
self
->
conn
);
G
ASSERT
(
connection
==
self
->
conn
);
if
(
self
->
conn
&&
!
mms_connection_is_active
(
self
->
conn
))
{
mms_connman_nemo_drop_connection
(
self
);
}
...
...
@@ -216,7 +216,7 @@ mms_connman_nemo_open_connection(
self
->
conn
=
mms_connection_nemo_new
(
cm
,
imsi
,
type
);
self
->
conn_change_id
=
mms_connection_add_state_change_handler
(
self
->
conn
,
mms_connman_nemo_connection_state_changed
,
self
);
MMS_
ASSERT
(
mms_connection_is_active
(
self
->
conn
));
G
ASSERT
(
mms_connection_is_active
(
self
->
conn
));
g_object_weak_ref
(
G_OBJECT
(
self
->
conn
),
mms_connman_nemo_connection_weak_ref_notify
,
self
);
return
self
->
conn
;
...
...
@@ -260,7 +260,7 @@ mms_connman_nemo_finalize(
GObject
*
object
)
{
MMSConnManNemo
*
self
=
MMS_CONNMAN_NEMO
(
object
);
MMS_
VERBOSE_
(
""
);
G
VERBOSE_
(
""
);
ofonoext_mm_unref
(
self
->
mm
);
G_OBJECT_CLASS
(
mms_connman_nemo_parent_class
)
->
finalize
(
object
);
}
...
...
@@ -288,7 +288,7 @@ void
mms_connman_nemo_init
(
MMSConnManNemo
*
self
)
{
MMS_
VERBOSE_
(
""
);
G
VERBOSE_
(
""
);
self
->
mm
=
ofonoext_mm_new
();
self
->
mm_event_id
[
MM_EVENT_VALID
]
=
ofonoext_mm_add_valid_changed_handler
(
self
->
mm
,
...
...
mms-connman-ofono/include/mms_connman_ofono_log.h
View file @
b9fe7422
...
...
@@ -10,13 +10,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef JOLLA_MMS_CONNMAN_OFONO_LOG_H
#define JOLLA_MMS_CONNMAN_OFONO_LOG_H
#include "mms_l
og
.h"
#include "mms_l
ib_types
.h"
#define MMS_CONNMAN_LOG_MODULES(log) \
log(gofono_log)
...
...
mms-connman-ofono/src/mms_connection_ofono.c
View file @
b9fe7422
...
...
@@ -10,7 +10,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "mms_connection_ofono.h"
...
...
@@ -19,9 +18,10 @@
#include <gofono_simmgr.h>
/* Logging */
#define
MMS_
LOG_MODULE_NAME mms_connection_log
#define
G
LOG_MODULE_NAME mms_connection_log
#include "mms_connman_ofono_log.h"
MMS_LOG_MODULE_DEFINE
(
"mms-connection-ofono"
);
#include <gutil_log.h>
GLOG_MODULE_DEFINE
(
"mms-connection-ofono"
);
enum
context_handler_id
{
CONTEXT_HANDLER_ACTIVATE_FAILED
,
...
...
@@ -109,9 +109,9 @@ mms_connection_ofono_active_changed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
active
)
{
MMS_
DEBUG
(
"Connection %s opened"
,
self
->
connection
.
imsi
);
G
DEBUG
(
"Connection %s opened"
,
self
->
connection
.
imsi
);
mms_connection_ofono_set_state
(
self
,
MMS_CONNECTION_STATE_OPEN
);
}
else
{
mms_connection_ofono_set_state
(
self
,
MMS_CONNECTION_STATE_CLOSED
);
...
...
@@ -125,10 +125,10 @@ mms_connection_ofono_interface_changed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
ifname
)
{
self
->
connection
.
netif
=
context
->
ifname
;
MMS_
DEBUG
(
"Interface: %s"
,
self
->
connection
.
netif
);
G
DEBUG
(
"Interface: %s"
,
self
->
connection
.
netif
);
}
else
{
self
->
connection
.
netif
=
NULL
;
}
...
...
@@ -141,10 +141,10 @@ mms_connection_ofono_mms_proxy_changed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
mms_proxy
)
{
self
->
connection
.
mmsproxy
=
context
->
mms_proxy
;
MMS_
DEBUG
(
"MessageProxy: %s"
,
self
->
connection
.
mmsproxy
);
G
DEBUG
(
"MessageProxy: %s"
,
self
->
connection
.
mmsproxy
);
}
else
{
self
->
connection
.
mmsproxy
=
NULL
;
}
...
...
@@ -157,10 +157,10 @@ mms_connection_ofono_mms_center_changed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
if
(
context
->
mms_center
)
{
self
->
connection
.
mmsc
=
context
->
mms_center
;
MMS_
DEBUG
(
"MessageCenter: %s"
,
self
->
connection
.
mmsc
);
G
DEBUG
(
"MessageCenter: %s"
,
self
->
connection
.
mmsc
);
}
else
{
self
->
connection
.
mmsc
=
NULL
;
}
...
...
@@ -173,9 +173,9 @@ mms_connection_ofono_imsi_changed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
sim
==
sim
);
G
ASSERT
(
self
->
sim
==
sim
);
if
(
g_strcmp0
(
sim
->
imsi
,
self
->
connection
.
imsi
))
{
MMS_
DEBUG_
(
"%s"
,
sim
->
imsi
);
G
DEBUG_
(
"%s"
,
sim
->
imsi
);
mms_connection_ofono_cancel
(
self
);
}
}
...
...
@@ -187,10 +187,10 @@ mms_connection_ofono_present_changed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
sim
==
sim
);
MMS_
DEBUG_
(
"%s"
,
sim
->
present
?
"true"
:
"false"
);
G
ASSERT
(
self
->
sim
==
sim
);
G
DEBUG_
(
"%s"
,
sim
->
present
?
"true"
:
"false"
);
if
(
!
sim
->
present
)
{
MMS_
DEBUG_
(
"%s"
,
sim
->
imsi
);
G
DEBUG_
(
"%s"
,
sim
->
imsi
);
mms_connection_ofono_cancel
(
self
);
}
}
...
...
@@ -203,7 +203,7 @@ mms_connection_ofono_activate_failed(
void
*
arg
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
arg
);
MMS_
ASSERT
(
self
->
context
==
context
);
G
ASSERT
(
self
->
context
==
context
);
mms_connection_ofono_cancel
(
self
);
}
...
...
@@ -216,9 +216,9 @@ mms_connection_ofono_new(
MMSConnectionOfono
*
self
=
g_object_new
(
MMS_TYPE_CONNECTION_OFONO
,
NULL
);
MMSConnection
*
conn
=
&
self
->
connection
;
MMS_
ASSERT
(
ofono_simmgr_valid
(
sim
));
MMS_
ASSERT
(
sim
->
present
);
MMS_
VERBOSE_
(
"%p %s"
,
self
,
sim
->
imsi
);
G
ASSERT
(
ofono_simmgr_valid
(
sim
));
G
ASSERT
(
sim
->
present
);
G
VERBOSE_
(
"%p %s"
,
self
,
sim
->
imsi
);
conn
->
type
=
type
;
conn
->
imsi
=
self
->
imsi
=
g_strdup
(
sim
->
imsi
);
...
...
@@ -229,15 +229,15 @@ mms_connection_ofono_new(
if
(
context
->
mms_proxy
&&
context
->
mms_proxy
[
0
])
{
conn
->
mmsproxy
=
context
->
mms_proxy
;
MMS_
DEBUG
(
"MessageProxy: %s"
,
conn
->
mmsproxy
);
G
DEBUG
(
"MessageProxy: %s"
,
conn
->
mmsproxy
);
}
if
(
context
->
mms_center
&&
context
->
mms_center
[
0
])
{
conn
->
mmsc
=
context
->
mms_center
;
MMS_
DEBUG
(
"MessageCenter: %s"
,
conn
->
mmsc
);
G
DEBUG
(
"MessageCenter: %s"
,
conn
->
mmsc
);
}
if
(
context
->
ifname
&&
context
->
ifname
[
0
])
{
conn
->
netif
=
context
->
ifname
;
MMS_
DEBUG
(
"Interface: %s"
,
conn
->
netif
);
G
DEBUG
(
"Interface: %s"
,
conn
->
netif
);
}
/* Listen for property changes */
...
...
@@ -286,8 +286,8 @@ mms_connection_ofono_dispose(
GObject
*
object
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
object
);
MMS_
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
MMS_
ASSERT
(
!
mms_connection_is_active
(
&
self
->
connection
));
G
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
G
ASSERT
(
!
mms_connection_is_active
(
&
self
->
connection
));
mms_connection_ofono_disconnect
(
self
);
if
(
self
->
sim
)
{
ofono_simmgr_unref
(
self
->
sim
);
...
...
@@ -314,7 +314,7 @@ mms_connection_ofono_finalize(
GObject
*
object
)
{
MMSConnectionOfono
*
self
=
MMS_CONNECTION_OFONO
(
object
);
MMS_
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
G
VERBOSE_
(
"%p %s"
,
self
,
self
->
imsi
);
g_free
(
self
->
imsi
);
G_OBJECT_CLASS
(
mms_connection_ofono_parent_class
)
->
finalize
(
object
);
}
...
...
@@ -341,7 +341,7 @@ void
mms_connection_ofono_init
(
MMSConnectionOfono
*
self
)
{
MMS_
VERBOSE_
(
"%p"
,
self
);
G
VERBOSE_
(
"%p"
,
self
);
}
/*
...
...
mms-connman-ofono/src/mms_connman_ofono.c
View file @
b9fe7422
...
...
@@ -10,7 +10,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "mms_connman_ofono.h"
...
...
@@ -23,9 +22,10 @@
#include <gofono_modem.h>
/* Logging */
#define
MMS_
LOG_MODULE_NAME mms_connman_log
#define
G
LOG_MODULE_NAME mms_connman_log
#include "mms_connman_ofono_log.h"
MMS_LOG_MODULE_DEFINE
(
"mms-connman-ofono"
);
#include <gutil_log.h>
GLOG_MODULE_DEFINE
(
"mms-connman-ofono"
);
enum
manager_handler_id
{
MANAGER_HANDLER_VALID_CHANGED
,
...
...
@@ -78,25 +78,25 @@ mms_connman_ofono_wait_valid(
self
->
default_modem
->
modem
&&
!
ofono_modem_wait_valid
(
self
->
default_modem
->
modem
,
MMS_OFONO_TIMEOUT
,
&
error
))
{
MMS_ERR
(
"%s"
,
MMS_
ERRMSG
(
error
));
GERR
(
"%s"
,
G
ERRMSG
(
error
));
g_error_free
(
error
);
}
if
(
self
->
default_modem
&&
self
->
default_modem
->
simmgr
&&
!
ofono_simmgr_wait_valid
(
self
->
default_modem
->
simmgr
,
MMS_OFONO_TIMEOUT
,
&
error
))
{
MMS_ERR
(
"%s"
,
MMS_
ERRMSG
(
error
));
GERR
(
"%s"
,
G
ERRMSG
(
error
));
g_error_free
(
error
);
}
if
(
self
->
default_modem
&&
self
->
default_modem
->
connmgr
&&
!
ofono_connmgr_wait_valid
(
self
->
default_modem
->
connmgr
,
MMS_OFONO_TIMEOUT
,
&
error
))
{
MMS_ERR
(
"%s"
,
MMS_
ERRMSG
(
error
));
GERR
(
"%s"
,
G
ERRMSG
(
error
));
g_error_free
(
error
);
}
}
else
{
MMS_ERR
(
"%s"
,
MMS_
ERRMSG
(
error
));
GERR
(
"%s"
,
G
ERRMSG
(
error
));
g_error_free
(
error
);
}
}
...
...
@@ -125,19 +125,19 @@ mms_connman_ofono_modem_for_imsi(
return
modem
;
}
}
MMS_
INFO
(
"SIM %s is not avialable"
,
imsi
);
G
INFO
(
"SIM %s is not avialable"
,
imsi
);
}
else
if
(
self
->
default_modem
)
{
if
(
ofono_simmgr_valid
(
self
->
default_modem
->
simmgr
))
{
if
(
self
->
default_modem
->
simmgr
->
present
)
{
return
self
->
default_modem
;
}
else
{
MMS_
INFO
(
"SIM card is not present"
);
G
INFO
(
"SIM card is not present"
);
}
}
else
{
MMS_
INFO
(
"No SIM card found"
);
G
INFO
(
"No SIM card found"
);
}
}
else
{
MMS_
WARN
(
"No default modem"
);
G
WARN
(
"No default modem"
);
}
return
NULL
;
}
...
...
@@ -178,7 +178,7 @@ mms_connman_ofono_connection_gone(
MMSOfonoModem
*
modem
=
value
;
if
(((
GObject
*
)
modem
->
conn
)
==
connection
)
{
modem
->
conn
=
NULL
;
MMS_
VERBOSE_
(
"%s"
,
ofono_modem_path
(
modem
->
modem
));
G
VERBOSE_
(
"%s"
,
ofono_modem_path
(
modem
->
modem
));
break
;
}
}
...
...
@@ -215,7 +215,7 @@ mms_connman_ofono_open_connection(
}
return
modem
->
conn
;
}
else
{
MMS_
WARN
(
"SIM %s has no MMS context"
,
imsi
);
G
WARN
(
"SIM %s has no MMS context"
,
imsi
);
}
}
return
NULL
;
...
...
@@ -243,9 +243,9 @@ mms_connman_ofono_select_default_modem(
}
if
(
self
->
default_modem
!=
context
)
{
if
(
context
)
{
MMS_
INFO
(
"Default modem %s"
,
ofono_modem_path
(
context
->
modem
));
G
INFO
(
"Default modem %s"
,
ofono_modem_path
(
context
->
modem
));
}
else
{
MMS_
INFO
(
"No default modem"
);
G
INFO
(
"No default modem"
);
}
self
->
default_modem
=
context
;
}
...
...
@@ -289,7 +289,7 @@ mms_connman_ofono_modem_added(
{
if
(
manager
->
valid
)
{
MMSConnManOfono
*
self
=
MMS_CONNMAN_OFONO
(
arg
);
MMS_
ASSERT
(
manager
==
self
->
manager
);
G
ASSERT
(
manager
==
self
->
manager
);
mms_connman_ofono_add_modem
(
self
,
modem
);
mms_connman_ofono_select_default_modem
(
self
);
}
...
...
@@ -304,7 +304,7 @@ mms_connman_ofono_modem_removed(
{
if
(
manager
->
valid
)
{
MMSConnManOfono
*
self
=
MMS_CONNMAN_OFONO
(
arg
);
MMS_
ASSERT
(
manager
==
self
->
manager
);
G
ASSERT
(
manager
==
self
->
manager
);
g_hash_table_remove
(
self
->
modems
,
path
);
mms_connman_ofono_select_default_modem
(
self
);
}
...
...
@@ -330,7 +330,7 @@ mms_connman_ofono_valid_changed(
void
*
arg
)
{
MMSConnManOfono
*
self
=
MMS_CONNMAN_OFONO
(
arg
);
MMS_
ASSERT
(
manager
==
self
->
manager
);
G
ASSERT
(
manager
==
self
->
manager
);
if
(
manager
->
valid
)
{
mms_connman_ofono_init_modems
(
self
);
}
else
{
...
...
@@ -391,7 +391,7 @@ mms_connman_ofono_dispose(
GObject
*
object
)
{
MMSConnManOfono
*
self
=
MMS_CONNMAN_OFONO
(
object
);
MMS_
VERBOSE_
(
""
);
G
VERBOSE_
(
""
);
self
->
default_modem
=
NULL
;
g_hash_table_remove_all
(
self
->
modems
);
if
(
self
->
manager
)
{
...
...
@@ -412,7 +412,7 @@ mms_connman_ofono_finalize(
GObject
*
object
)
{
MMSConnManOfono
*
self
=
MMS_CONNMAN_OFONO
(
object
);
MMS_
VERBOSE_
(
""
);
G
VERBOSE_
(
""
);
g_hash_table_destroy
(
self
->
modems
);
G_OBJECT_CLASS
(
mms_connman_ofono_parent_class
)
->
finalize
(
object
);
}
...
...
mms-engine/main.c
View file @
b9fe7422
...
...
@@ -10,7 +10,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/