[ofono] Make more APIs available to external plugins. JB#55027

This allows to build Jolla ril driver as an external dynamically
loadable plugin.

ofono/.gitignore

@@ -42,8 +42,11 @@ unit/test-sms-root
 unit/test-simutil
 unit/test-mux
 unit/test-caif
+unit/test-cell-info
+unit/test-cell-info-dbus
 unit/test-stkutil
 unit/test-cdmasms
+unit/test-conf
 unit/test-dbus-access
 unit/test-dbus-clients
 unit/test-dbus-queue
@@ -58,13 +61,10 @@ unit/test-rilmodem-cs
 unit/test-rilmodem-gprs
 unit/test-rilmodem-sms
 unit/test-sailfish_access
-unit/test-sailfish_cell_info
-unit/test-sailfish_cell_info_dbus
-unit/test-sailfish_manager
-unit/test-sailfish_sim_info
-unit/test-sailfish_sim_info_dbus
-unit/test-config
+unit/test-slot-manager
 unit/test-watch
+unit/test-sim-info
+unit/test-sim-info-dbus
 unit/test-sms-filter
 unit/test-voicecall-filter
 unit/test-*.log

ofono/Makefile.am

@@ -28,7 +28,9 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/ril-constants.h include/ril-transport.h \
 			include/watch.h gdbus/gdbus.h include/dbus-clients.h \
 			include/netmon.h include/lte.h include/ims.h \
-			include/storage.h
+			include/slot.h include/cell-info.h \
+			include/storage.h include/conf.h include/misc.h \
+			include/mtu-limit.h
 
 nodist_pkginclude_HEADERS = include/version.h
 
@@ -119,22 +121,15 @@ builtin_modules += udevng
 builtin_sources += plugins/udevng.c
 endif
 
-if SAILFISH_MANAGER
-builtin_modules += sailfish_manager
-builtin_sources += plugins/sailfish_manager/sailfish_cell_info.c \
-			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
-			plugins/sailfish_manager/sailfish_manager.c \
-			plugins/sailfish_manager/sailfish_manager_dbus.c \
-			plugins/sailfish_manager/sailfish_sim_info.c \
-			plugins/sailfish_manager/sailfish_sim_info_dbus.c
-endif
-
-
 if SAILFISH_ACCESS
 builtin_modules += sailfish_access
 builtin_sources += plugins/sailfish_access.c
 endif
 
+if DATAFILES
+dist_conf_DATA += drivers/ril/ril_subscription.conf
+endif
+
 if RILMODEM
 if SAILFISH_RILMODEM
 
@@ -181,10 +176,6 @@ builtin_sources +=	drivers/ril/ril_call_barring.c \
 # Vendor specific extensions
 builtin_sources +=	drivers/ril/ril_vendor_mtk.c
 
-if DATAFILES
-dist_conf_DATA += drivers/ril/ril_subscription.conf
-endif
-
 else
 
 builtin_sources += $(gril_sources)
@@ -754,7 +745,6 @@ endif
 sbin_PROGRAMS = src/ofonod
 
 src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
-			src/mtu-watch.c \
 			src/main.c src/ofono.h src/log.c src/plugin.c \
 			src/modem.c src/common.h src/common.c \
 			src/manager.c src/dbus.c src/util.h src/util.c \
@@ -781,12 +771,15 @@ src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
 			src/handsfree-audio.c src/bluetooth.h \
 			src/sim-mnclength.c src/voicecallagent.c \
 			src/sms-filter.c src/gprs-filter.c \
-			src/dbus-clients.c src/dbus-queue.c \
-			src/dbus-access.c src/config.c \
+			src/dbus-clients.c src/dbus-queue.c src/dbus-access.c \
 			src/voicecall-filter.c src/ril-transport.c \
 			src/hfp.h src/siri.c src/watchlist.c \
 			src/netmon.c src/lte.c src/ims.c \
-			src/netmonagent.c src/netmonagent.h
+			src/netmonagent.c src/netmonagent.h \
+			src/slot-manager.c src/slot-manager-dbus.c \
+			src/cell-info.c src/cell-info-dbus.c \
+			src/sim-info.c src/sim-info-dbus.c \
+			src/conf.c src/mtu-limit.c
 
 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -813,8 +806,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
 
 AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
 			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
-			-I$(srcdir)/btio -I$(srcdir)/gril \
-			-I$(srcdir)/plugins/sailfish_manager
+			-I$(srcdir)/btio -I$(srcdir)/gril
 
 doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 		doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
@@ -974,61 +966,50 @@ unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-simutil unit/test-stkutil \
 				unit/test-sms unit/test-cdmasms
 
-if SAILFISH_MANAGER
-
-unit_test_sailfish_cell_info_SOURCES = unit/test-sailfish_cell_info.c \
-			plugins/sailfish_manager/sailfish_cell_info.c
-unit_test_sailfish_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
-unit_test_sailfish_cell_info_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sailfish_cell_info_OBJECTS)
-unit_tests += unit/test-sailfish_cell_info
+unit_test_cell_info_SOURCES = unit/test-cell-info.c src/cell-info.c src/log.c
+unit_test_cell_info_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT)
+unit_test_cell_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_cell_info_OBJECTS)
+unit_tests += unit/test-cell-info
 
-unit_test_sailfish_cell_info_dbus_SOURCES = unit/test-dbus.c \
-			unit/test-sailfish_cell_info_dbus.c \
-			unit/fake_sailfish_cell_info.c \
-			plugins/sailfish_manager/sailfish_cell_info.c \
-			plugins/sailfish_manager/sailfish_cell_info_dbus.c \
+unit_test_cell_info_dbus_SOURCES = unit/test-dbus.c \
+			unit/test-cell-info-dbus.c unit/fake_cell_info.c \
+			src/cell-info.c src/cell-info-dbus.c \
 			gdbus/object.c src/dbus-clients.c \
 			src/dbus.c src/log.c
-unit_test_sailfish_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+unit_test_cell_info_dbus_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
 			@DBUS_GLIB_CFLAGS@
-unit_test_sailfish_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sailfish_cell_info_dbus_OBJECTS)
-unit_tests += unit/test-sailfish_cell_info_dbus
-
-unit_test_sailfish_sim_info_SOURCES = unit/test-sailfish_sim_info.c \
-			unit/fake_watch.c \
-			plugins/sailfish_manager/sailfish_sim_info.c \
-			src/storage.c src/watchlist.c src/log.c
-unit_test_sailfish_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+unit_test_cell_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_cell_info_dbus_OBJECTS)
+unit_tests += unit/test-cell-info-dbus
+
+unit_test_sim_info_SOURCES = unit/test-sim-info.c unit/fake_watch.c \
+			src/sim-info.c src/storage.c src/watchlist.c src/log.c
+unit_test_sim_info_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
 			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sailfish_sim_info_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sailfish_sim_info_OBJECTS)
-unit_tests += unit/test-sailfish_sim_info
+unit_test_sim_info_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sim_info_OBJECTS)
+unit_tests += unit/test-sim-info
 
-unit_test_sailfish_sim_info_dbus_SOURCES = unit/test-sailfish_sim_info_dbus.c \
+unit_test_sim_info_dbus_SOURCES = unit/test-sim-info-dbus.c \
 			unit/test-dbus.c unit/fake_watch.c \
-			plugins/sailfish_manager/sailfish_sim_info.c \
-			plugins/sailfish_manager/sailfish_sim_info_dbus.c \
+			src/sim-info.c src/sim-info-dbus.c \
 			gdbus/object.c \
 			src/dbus.c src/storage.c src/watchlist.c src/log.c
-unit_test_sailfish_sim_info_dbus_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
+unit_test_sim_info_dbus_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS) \
 			@DBUS_GLIB_CFLAGS@ -DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sailfish_sim_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sailfish_sim_info_dbus_OBJECTS)
-unit_tests += unit/test-sailfish_sim_info_dbus
-
-unit_test_sailfish_manager_SOURCES = unit/test-sailfish_manager.c \
-			unit/fake_watch.c \
-			plugins/sailfish_manager/sailfish_manager.c \
-			plugins/sailfish_manager/sailfish_cell_info.c \
-			plugins/sailfish_manager/sailfish_sim_info.c \
+unit_test_sim_info_dbus_LDADD = @DBUS_GLIB_LIBS@ @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_sim_info_dbus_OBJECTS)
+unit_tests += unit/test-sim-info-dbus
+
+unit_test_slot_manager_SOURCES = unit/test-slot-manager.c unit/fake_watch.c \
+			src/slot-manager.c src/cell-info.c src/sim-info.c \
 			src/storage.c src/log.c
-unit_test_sailfish_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
+unit_test_slot_manager_CFLAGS = $(AM_CFLAGS) $(COVERAGE_OPT) \
 			-DSTORAGEDIR='"/tmp/ofono"'
-unit_test_sailfish_manager_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_sailfish_manager_OBJECTS)
-unit_tests += unit/test-sailfish_manager
+unit_test_slot_manager_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_slot_manager_OBJECTS)
+unit_tests += unit/test-slot-manager
 
 unit_test_watch_SOURCES = unit/test-watch.c src/watch.c \
 			src/log.c src/watchlist.c
@@ -1038,15 +1019,6 @@ unit_test_watch_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_watch_OBJECTS)
 unit_tests += unit/test-watch
 
-endif
-
-unit_test_config_SOURCES = unit/test-config.c drivers/ril/ril_util.c \
-				src/config.c src/log.c
-unit_test_config_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
-unit_test_config_LDADD = @GLIB_LIBS@ -ldl
-unit_objects += $(unit_test_config_OBJECTS)
-unit_tests += unit/test-config
-
 if SAILFISH_ACCESS
 unit_test_sailfish_access_SOURCES = unit/test-sailfish_access.c \
 			plugins/sailfish_access.c src/dbus-access.c src/log.c
@@ -1066,8 +1038,15 @@ unit_tests += unit/test-dbus-access
 if RILMODEM
 if SAILFISH_RILMODEM
 
+unit_test_conf_SOURCES = unit/test-conf.c drivers/ril/ril_util.c \
+			src/conf.c src/util.c src/log.c
+unit_test_conf_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
+unit_test_conf_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_conf_OBJECTS)
+unit_tests += unit/test-conf
+
 unit_test_ril_config_SOURCES = unit/test-ril_config.c drivers/ril/ril_util.c \
-				drivers/ril/ril_config.c src/log.c
+			drivers/ril/ril_config.c src/conf.c src/util.c src/log.c
 unit_test_ril_config_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_ril_config_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_ril_config_OBJECTS)
@@ -1081,15 +1060,15 @@ unit_objects += $(unit_test_ril_ecclist_OBJECTS)
 unit_tests += unit/test-ril_ecclist
 
 unit_test_ril_util_SOURCES = unit/test-ril_util.c drivers/ril/ril_util.c \
-				src/log.c
+			src/util.c src/log.c
 unit_test_ril_util_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_ril_util_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_ril_util_OBJECTS)
 unit_tests += unit/test-ril_util
 
 unit_test_ril_vendor_SOURCES = unit/test-ril_vendor.c unit/fake_watch.c \
 	drivers/ril/ril_vendor.c drivers/ril/ril_vendor_mtk.c  \
-	drivers/ril/ril_util.c src/log.c
+	drivers/ril/ril_util.c src/util.c src/log.c
 unit_test_ril_vendor_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
 unit_test_ril_vendor_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_ril_vendor_OBJECTS)

ofono/configure.ac

@@ -183,8 +183,8 @@ AC_ARG_ENABLE(sailfish-rilmodem, AC_HELP_STRING([--enable-sailfish-rilmodem],
 				[enable_sailfish_rilmodem="no"])
 AM_CONDITIONAL(SAILFISH_RILMODEM, test "${enable_sailfish_rilmodem}" != "no")
 
-PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.35, dummy=yes,
-			AC_MSG_ERROR(libglibutil >= 1.0.35 is required))
+PKG_CHECK_MODULES(GLIBUTIL, libglibutil >= 1.0.49, dummy=yes,
+			AC_MSG_ERROR(libglibutil >= 1.0.49 is required))
 CFLAGS="$CFLAGS $GLIBUTIL_CFLAGS"
 LIBS="$LIBS $GLIBUTIL_LIBS"
 

ofono/drivers/ril/ril_call_barring.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2018 Jolla Ltd.
+ *  Copyright (C) 2015-2021 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -18,8 +18,6 @@
 #include "ril_util.h"
 #include "ril_log.h"
 
-#include "common.h"
-
 /* See 3GPP 27.007 7.4 for possible values */
 #define RIL_MAX_SERVICE_LENGTH 3
 

ofono/drivers/ril/ril_call_forward.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2021 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -17,7 +17,7 @@
 #include "ril_util.h"
 #include "ril_log.h"
 
-#include "common.h"
+#include <ofono/netreg.h>
 
 struct ril_call_forward {
 	GRilIoQueue *q;

ofono/drivers/ril/ril_call_settings.c

@@ -1,7 +1,7 @@
 /*
  *  oFono - Open Source Telephony - RIL-based devices
  *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2021 Jolla Ltd.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -17,8 +17,6 @@
 #include "ril_util.h"
 #include "ril_log.h"
 
-#include "common.h"
-
 struct ril_call_settings {
 	GRilIoQueue *q;
 	guint timer_id;