mirror of git://git.sysmocom.de/ofono
Add network time support
Adding a new notify function in the netreg atom for notifying a received Network Identification and Timezone (NITZ) indication. This data is consumed via a nettime plugin, of which there is also an example.
This commit is contained in:
Aki Niemi
parent
1d7fe6aa5a
commit
b8ec7553ef
10
Makefile.am
10
Makefile.am
|
|
@ -12,7 +12,8 @@ include_HEADERS = include/log.h include/plugin.h include/history.h \
|
|||
include/netreg.h include/voicecall.h include/devinfo.h \
|
||||
include/cbs.h include/call-volume.h \
|
||||
include/gprs.h include/gprs-context.h \
|
||||
include/radio-settings.h include/stk.h
|
||||
include/radio-settings.h include/stk.h \
|
||||
include/nettime.h
|
||||
|
||||
nodist_include_HEADERS = include/version.h
|
||||
|
||||
|
|
@ -242,8 +243,8 @@ builtin_sources += plugins/ste.c
|
|||
endif
|
||||
|
||||
if MAINTAINER_MODE
|
||||
builtin_modules += example_history
|
||||
builtin_sources += plugins/example_history.c
|
||||
builtin_modules += example_history example_nettime
|
||||
builtin_sources += plugins/example_history.c plugins/example_nettime.c
|
||||
endif
|
||||
|
||||
sbin_PROGRAMS = src/ofonod
|
||||
|
|
@ -260,7 +261,8 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) \
|
|||
src/simutil.h src/simutil.c src/storage.h \
|
||||
src/storage.c src/cbs.c src/watch.c src/call-volume.c \
|
||||
src/gprs.c src/idmap.h src/idmap.c \
|
||||
src/radio-settings.c src/stkutil.h src/stkutil.c
|
||||
src/radio-settings.c src/stkutil.h src/stkutil.c \
|
||||
src/nettime.c
|
||||
|
||||
src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
|
||||
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@ struct ofono_netreg_driver {
|
|||
void ofono_netreg_strength_notify(struct ofono_netreg *netreg, int strength);
|
||||
void ofono_netreg_status_notify(struct ofono_netreg *netreg, int status,
|
||||
int lac, int ci, int tech);
|
||||
void ofono_netreg_time_notify(struct ofono_netreg *netreg,
|
||||
struct ofono_network_time *info);
|
||||
|
||||
int ofono_netreg_driver_register(const struct ofono_netreg_driver *d);
|
||||
void ofono_netreg_driver_unregister(const struct ofono_netreg_driver *d);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
/*
|
||||
*
|
||||
* oFono - Open Telephony stack for Linux
|
||||
*
|
||||
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
*
|
||||
* 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
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* 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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __OFONO_NETTIME_H
|
||||
#define __OFONO_NETTIME_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct ofono_network_time;
|
||||
|
||||
struct ofono_nettime_context {
|
||||
struct ofono_nettime_driver *driver;
|
||||
struct ofono_modem *modem;
|
||||
void *data;
|
||||
};
|
||||
|
||||
struct ofono_nettime_driver {
|
||||
const char *name;
|
||||
int (*probe)(struct ofono_nettime_context *context);
|
||||
void (*remove)(struct ofono_nettime_context *context);
|
||||
void (*info_received)(struct ofono_nettime_context *context,
|
||||
struct ofono_network_time *info);
|
||||
};
|
||||
|
||||
int ofono_nettime_driver_register(const struct ofono_nettime_driver *driver);
|
||||
void ofono_nettime_driver_unregister(const struct ofono_nettime_driver *driver);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __OFONO_NETTIME_H */
|
||||
|
|
@ -92,6 +92,17 @@ struct ofono_call {
|
|||
int clip_validity;
|
||||
};
|
||||
|
||||
struct ofono_network_time {
|
||||
int sec; /* Seconds [0..59], -1 if unavailable */
|
||||
int min; /* Minutes [0..59], -1 if unavailable */
|
||||
int hour; /* Hours [0..23], -1 if unavailable */
|
||||
int mday; /* Day of month [1..31], -1 if unavailable */
|
||||
int mon; /* Month [1..12], -1 if unavailable */
|
||||
int year; /* Current year, -1 if unavailable */
|
||||
int dst; /* Current adjustment, in seconds */
|
||||
int utcoff; /* Offset from UTC in seconds */
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,84 @@
|
|||
/*
|
||||
*
|
||||
* oFono - Open Source Telephony
|
||||
*
|
||||
* Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
*
|
||||
* 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
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* 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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <glib.h>
|
||||
|
||||
#define OFONO_API_SUBJECT_TO_CHANGE
|
||||
#include <ofono/plugin.h>
|
||||
#include <ofono/log.h>
|
||||
#include <ofono/nettime.h>
|
||||
#include <ofono/types.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
static int example_nettime_probe(struct ofono_nettime_context *context)
|
||||
{
|
||||
ofono_debug("Example Network Time Probe for modem: %p",
|
||||
context->modem);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void example_nettime_remove(struct ofono_nettime_context *context)
|
||||
{
|
||||
ofono_debug("Example Network Time Remove for modem: %p",
|
||||
context->modem);
|
||||
}
|
||||
|
||||
static void example_nettime_info_received(struct ofono_nettime_context *context,
|
||||
struct ofono_network_time *info)
|
||||
{
|
||||
if (!info)
|
||||
return;
|
||||
|
||||
ofono_debug("Received a network time notification on modem: %p",
|
||||
context->modem);
|
||||
ofono_debug("Time: %04d-%02d-%02d %02d:%02d:%02d%c%02d:%02d (DST=%d)",
|
||||
info->year, info->mon, info->mday, info->hour,
|
||||
info->min, info->sec, info->utcoff > 0 ? '+' : '-',
|
||||
info->utcoff / 3600, (info->utcoff % 3600) / 60,
|
||||
info->dst / 3600);
|
||||
}
|
||||
|
||||
static struct ofono_nettime_driver example_driver = {
|
||||
.name = "Example Network Time",
|
||||
.probe = example_nettime_probe,
|
||||
.remove = example_nettime_remove,
|
||||
.info_received = example_nettime_info_received,
|
||||
};
|
||||
|
||||
static int example_nettime_init(void)
|
||||
{
|
||||
return ofono_nettime_driver_register(&example_driver);
|
||||
}
|
||||
|
||||
static void example_nettime_exit(void)
|
||||
{
|
||||
ofono_nettime_driver_unregister(&example_driver);
|
||||
}
|
||||
|
||||
OFONO_PLUGIN_DEFINE(example_nettime, "Example Network Time Plugin",
|
||||
VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT,
|
||||
example_nettime_init, example_nettime_exit)
|
||||
|
|
@ -1147,6 +1147,7 @@ static void modem_sim_ready(void *user, enum ofono_sim_state new_state)
|
|||
modem->driver->post_sim(modem);
|
||||
|
||||
__ofono_history_probe_drivers(modem);
|
||||
__ofono_nettime_probe_drivers(modem);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,121 @@
|
|||
/*
|
||||
*
|
||||
* oFono - Open Source Telephony
|
||||
*
|
||||
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
*
|
||||
* 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
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* 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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "ofono.h"
|
||||
|
||||
static GSList *nettime_drivers = NULL;
|
||||
|
||||
static struct ofono_nettime_context *nettime_context_create(
|
||||
struct ofono_modem *modem,
|
||||
struct ofono_nettime_driver *driver)
|
||||
{
|
||||
struct ofono_nettime_context *context;
|
||||
|
||||
if (driver->probe == NULL)
|
||||
return NULL;
|
||||
|
||||
context = g_try_new0(struct ofono_nettime_context, 1);
|
||||
|
||||
if (context == NULL)
|
||||
return NULL;
|
||||
|
||||
context->driver = driver;
|
||||
context->modem = modem;
|
||||
|
||||
if (driver->probe(context) < 0) {
|
||||
g_free(context);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return context;
|
||||
}
|
||||
|
||||
static void context_remove(struct ofono_atom *atom)
|
||||
{
|
||||
struct ofono_nettime_context *context = __ofono_atom_get_data(atom);
|
||||
|
||||
if (context->driver->remove)
|
||||
context->driver->remove(context);
|
||||
|
||||
g_free(context);
|
||||
}
|
||||
|
||||
void __ofono_nettime_probe_drivers(struct ofono_modem *modem)
|
||||
{
|
||||
struct ofono_nettime_driver *driver;
|
||||
struct ofono_nettime_context *context;
|
||||
GSList *l;
|
||||
|
||||
for (l = nettime_drivers; l; l = l->next) {
|
||||
driver = l->data;
|
||||
|
||||
context = nettime_context_create(modem, driver);
|
||||
|
||||
if (!context)
|
||||
continue;
|
||||
|
||||
__ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_NETTIME,
|
||||
context_remove, context);
|
||||
}
|
||||
}
|
||||
|
||||
static void nettime_info_received(struct ofono_atom *atom, void *data)
|
||||
{
|
||||
struct ofono_nettime_context *context = __ofono_atom_get_data(atom);
|
||||
struct ofono_network_time *info = data;
|
||||
|
||||
if (context->driver->info_received == NULL)
|
||||
return;
|
||||
|
||||
context->driver->info_received(context, info);
|
||||
}
|
||||
|
||||
void __ofono_nettime_info_received(struct ofono_modem *modem,
|
||||
struct ofono_network_time *info)
|
||||
{
|
||||
__ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_NETTIME,
|
||||
nettime_info_received, info);
|
||||
}
|
||||
|
||||
int ofono_nettime_driver_register(const struct ofono_nettime_driver *driver)
|
||||
{
|
||||
DBG("driver: %p name: %s", driver, driver->name);
|
||||
|
||||
nettime_drivers = g_slist_prepend(nettime_drivers, (void *)driver);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ofono_nettime_driver_unregister(const struct ofono_nettime_driver *driver)
|
||||
{
|
||||
DBG("driver: %p name: %s", driver, driver->name);
|
||||
|
||||
nettime_drivers = g_slist_remove(nettime_drivers, driver);
|
||||
}
|
||||
|
|
@ -1065,6 +1065,17 @@ void ofono_netreg_status_notify(struct ofono_netreg *netreg, int status,
|
|||
notify_status_watches(netreg);
|
||||
}
|
||||
|
||||
void ofono_netreg_time_notify(struct ofono_netreg *netreg,
|
||||
struct ofono_network_time *info)
|
||||
{
|
||||
struct ofono_modem *modem = __ofono_atom_get_modem(netreg->atom);
|
||||
|
||||
if (!info)
|
||||
return;
|
||||
|
||||
__ofono_nettime_info_received(modem, info);
|
||||
}
|
||||
|
||||
static GSList *compress_operator_list(const struct ofono_network_operator *list,
|
||||
int total)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@ enum ofono_atom_type {
|
|||
OFONO_ATOM_TYPE_GPRS_CONTEXT = 17,
|
||||
OFONO_ATOM_TYPE_RADIO_SETTINGS = 18,
|
||||
OFONO_ATOM_TYPE_STK = 19,
|
||||
OFONO_ATOM_TYPE_NETTIME = 20,
|
||||
};
|
||||
|
||||
enum ofono_atom_watch_condition {
|
||||
|
|
@ -264,3 +265,10 @@ struct sms;
|
|||
|
||||
void __ofono_message_waiting_mwi(struct ofono_message_waiting *mw,
|
||||
struct sms *sms, gboolean *out_discard);
|
||||
|
||||
#include <ofono/nettime.h>
|
||||
|
||||
void __ofono_nettime_probe_drivers(struct ofono_modem *modem);
|
||||
|
||||
void __ofono_nettime_info_received(struct ofono_modem *modem,
|
||||
struct ofono_network_time *info);
|
||||
|
|
|
|||
Loading…
Reference in New Issue