3:32 a.m.
Hi,
Following patch removes the EmergencyType property as the required
functionality can be achieved with the EmergencyAlert property itself.
Also EmergencyBroadcast property has been renamed to WarningSystemBroadcast
to make it general for ETWS, CMAS and EU-Alert CBS message.
Regards,
Jeevaka
Jeevaka Badrappan (4):
cbs: remove EmergencyType property
cbs: rename EmergencyBroadcast property
doc: Update the cell broadcast properties
test: update the cell broadcast property
doc/cell-broadcast-api.txt | 17 ++++++-----------
src/cbs.c | 44 +++++++++++---------------------------------
test/monitor-ofono | 2 +-
3 files changed, 18 insertions(+), 45 deletions(-)
3:32 a.m.
New subject: [PATCH 1/4] cbs: remove EmergencyType property
---
src/cbs.c | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/src/cbs.c b/src/cbs.c
index d99f250..36cca48 100644
--- a/src/cbs.c
+++ b/src/cbs.c
@@ -98,7 +98,6 @@ static void cbs_dispatch_base_station_id(struct ofono_cbs *cbs, const
char *id)
}
static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char *message,
- enum etws_topic_type topic,
gboolean alert, gboolean popup)
{
DBusConnection *conn = ofono_dbus_get_connection();
@@ -107,29 +106,6 @@ static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char
*message,
DBusMessageIter iter;
DBusMessageIter dict;
dbus_bool_t boolean;
- const char *emergency_str;
-
- if (topic == ETWS_TOPIC_TYPE_TEST) {
- ofono_error("Explicitly ignoring ETWS Test messages");
- return;
- }
-
- switch (topic) {
- case ETWS_TOPIC_TYPE_EARTHQUAKE:
- emergency_str = "Earthquake";
- break;
- case ETWS_TOPIC_TYPE_TSUNAMI:
- emergency_str = "Tsunami";
- break;
- case ETWS_TOPIC_TYPE_EARTHQUAKE_TSUNAMI:
- emergency_str = "Earthquake+Tsunami";
- break;
- case ETWS_TOPIC_TYPE_EMERGENCY:
- emergency_str = "Other";
- break;
- default:
- return;
- };
signal = dbus_message_new_signal(path, OFONO_CELL_BROADCAST_INTERFACE,
"EmergencyBroadcast");
@@ -144,9 +120,6 @@ static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char
*message,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
- ofono_dbus_dict_append(&dict, "EmergencyType",
- DBUS_TYPE_STRING, &emergency_str);
-
boolean = alert;
ofono_dbus_dict_append(&dict, "EmergencyAlert",
DBUS_TYPE_BOOLEAN, &boolean);
@@ -251,6 +224,11 @@ void ofono_cbs_notify(struct ofono_cbs *cbs, const unsigned char
*pdu,
gboolean alert = FALSE;
gboolean popup = FALSE;
+ if (c.message_identifier == ETWS_TOPIC_TYPE_TEST) {
+ ofono_error("Explicitly ignoring ETWS Test messages");
+ goto out;
+ }
+
/* 3GPP 23.041 9.4.1.2.1: Alert is encoded in bit 9 */
if (c.message_code & (1 << 9))
alert = TRUE;
@@ -259,8 +237,7 @@ void ofono_cbs_notify(struct ofono_cbs *cbs, const unsigned char
*pdu,
if (c.message_code & (1 << 8))
popup = TRUE;
- cbs_dispatch_emergency(cbs, message,
- c.message_identifier, alert, popup);
+ cbs_dispatch_emergency(cbs, message, alert, popup);
goto out;
}
--
1.7.0.4
3:32 a.m.
New subject: [PATCH 2/4] cbs: rename EmergencyBroadcast property
---
src/cbs.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/cbs.c b/src/cbs.c
index 36cca48..8bbae21 100644
--- a/src/cbs.c
+++ b/src/cbs.c
@@ -97,8 +97,9 @@ static void cbs_dispatch_base_station_id(struct ofono_cbs *cbs, const
char *id)
__ofono_netreg_set_base_station_name(cbs->netreg, id);
}
-static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char *message,
- gboolean alert, gboolean popup)
+static void cbs_dispatch_warningsystem(struct ofono_cbs *cbs,
+ const char *message, gboolean alert,
+ gboolean popup)
{
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(cbs->atom);
@@ -108,7 +109,7 @@ static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char
*message,
dbus_bool_t boolean;
signal = dbus_message_new_signal(path, OFONO_CELL_BROADCAST_INTERFACE,
- "EmergencyBroadcast");
+ "WarningSystemBroadcast");
if (signal == NULL)
return;
@@ -237,7 +238,7 @@ void ofono_cbs_notify(struct ofono_cbs *cbs, const unsigned char
*pdu,
if (c.message_code & (1 << 8))
popup = TRUE;
- cbs_dispatch_emergency(cbs, message, alert, popup);
+ cbs_dispatch_warningsystem(cbs, message, alert, popup);
goto out;
}
@@ -532,7 +533,7 @@ static GDBusMethodTable cbs_methods[] = {
static GDBusSignalTable cbs_signals[] = {
{ "PropertyChanged", "sv" },
{ "IncomingBroadcast", "sq" },
- { "EmergencyBroadcast", "sa{sv}" },
+ { "WarningSystemBroadcast", "sa{v}" },
{ }
};
--
1.7.0.4
3:32 a.m.
New subject: [PATCH 3/4] doc: Update the cell broadcast properties
---
doc/cell-broadcast-api.txt | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/doc/cell-broadcast-api.txt b/doc/cell-broadcast-api.txt
index 52618eb..5f6b4d6 100644
--- a/doc/cell-broadcast-api.txt
+++ b/doc/cell-broadcast-api.txt
@@ -36,19 +36,14 @@ Signals PropertyChanged(string name, variant value)
Please note that base station name broadcasts are
handled by the NetworkRegistration interface.
- EmergencyBroadcast(string text, dict properties)
+ WarningSystemBroadcast(string text, dict properties)
- This signal is emitted whenever an ETWS cell broadcast
- is received. The string text contains contents of the
- broadcast. The dict is made up of the following
- entries:
- EmergencyType - string value, possible values
- include: "Earthquake",
- "Tsunami",
- "Earthquake+Tsunami",
- "Other"
+ This signal is emitted whenever an ETWS or CMAS or
+ EU-Alert cell broadcast is received. The string text
+ contains contents of the broadcast. The dict is made
+ up of the following entries:
EmergencyAlert - boolean value hinting whether
- an extra emergency indicator
+ an emergency indicator
should be activated (e.g.
vibrate mode, emergency alert
mode.)
--
1.7.0.4
3:32 a.m.
New subject: [PATCH 4/4] test: update the cell broadcast property
---
test/monitor-ofono | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/monitor-ofono b/test/monitor-ofono
index 8570c34..b803aa2 100755
--- a/test/monitor-ofono
+++ b/test/monitor-ofono
@@ -161,7 +161,7 @@ if __name__ == '__main__':
path_keyword="path",
interface_keyword="interface")
- for member in ["IncomingBroadcast", "EmergencyBroadcast",
+ for member in ["IncomingBroadcast", "WarningSystemBroadcast",
"IncomingMessage", "ImmediateMessage"]:
bus.add_signal_receiver(message,
bus_name="org.ofono",
--
1.7.0.4
4223
days inactive
4223
days old
4 comments
1 participants
participants (1)
-
Jeevaka Badrappan