Re: [RFC] GPRS context setup and teardown (doc/dataconnectionmanager-api.txt)

* Re: [RFC] GPRS context setup and teardown (doc/dataconnectionmanager-api.txt)
  2009-10-12 21:35 [RFC] GPRS context setup and teardown (doc/dataconnectionmanager-api.txt) Andrzej Zaborowski
@ 2009-10-12 20:01 ` Andrzej Zaborowski
  2009-10-16 18:23   ` Denis Kenzior
  2009-10-23 22:22 ` Denis Kenzior
  1 sibling, 1 reply; 12+ messages in thread
From: Andrzej Zaborowski @ 2009-10-12 20:01 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

2009/10/12 Andrzej Zaborowski <andrew.zaborowski@intel.com>:
> here's a one-big-patch that adds the DataConnectionManager interface
> according to doc/dataconnectionmanager-api.txt without any glue for
> the multiplexer or PPP setup.  Only AT backend is implemented.

This patch depends on 0001 attached, other patches are small
independent changes that I had in queue.

Regards

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Move-network-registration-status-to-string-functions.patch --]
[-- Type: text/x-patch, Size: 3713 bytes --]

From 6bdfef650f64766f13abaa4b6538d7facdebd6f3 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Date: Mon, 12 Oct 2009 22:37:14 +0200
Subject: [PATCH 1/5] Move network registration status to string functions to common.c

so that they can be used in data connection related network
registration code.
---
 src/common.c  |   44 ++++++++++++++++++++++++++++++++++++++++++++
 src/common.h  |    3 +++
 src/network.c |   44 --------------------------------------------
 3 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/src/common.c b/src/common.c
index b62e34c..1b002bf 100644
--- a/src/common.c
+++ b/src/common.c
@@ -597,3 +597,47 @@ gboolean is_valid_pin(const char *pin)
 
 	return TRUE;
 }
+
+const char *registration_status_to_string(int status)
+{
+	switch (status) {
+	case NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
+		return "unregistered";
+	case NETWORK_REGISTRATION_STATUS_REGISTERED:
+		return "registered";
+	case NETWORK_REGISTRATION_STATUS_SEARCHING:
+		return "searching";
+	case NETWORK_REGISTRATION_STATUS_DENIED:
+		return "denied";
+	case NETWORK_REGISTRATION_STATUS_UNKNOWN:
+		return "unknown";
+	case NETWORK_REGISTRATION_STATUS_ROAMING:
+		return "roaming";
+	}
+
+	return "";
+}
+
+const char *registration_tech_to_string(int tech)
+{
+	switch (tech) {
+	case ACCESS_TECHNOLOGY_GSM:
+		return "GSM";
+	case ACCESS_TECHNOLOGY_GSM_COMPACT:
+		return "GSMCompact";
+	case ACCESS_TECHNOLOGY_UTRAN:
+		return "UTRAN";
+	case ACCESS_TECHNOLOGY_GSM_EGPRS:
+		return "GSM+EGPRS";
+	case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
+		return "UTRAN+HSDPA";
+	case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
+		return "UTRAN+HSUPA";
+	case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
+		return "UTRAN+HSDPA+HSUPA";
+	case ACCESS_TECHNOLOGY_EUTRAN:
+		return "EUTRAN";
+	default:
+		return "";
+	}
+}
diff --git a/src/common.h b/src/common.h
index 3805e21..1a5c9ed 100644
--- a/src/common.h
+++ b/src/common.h
@@ -135,3 +135,6 @@ const char *ss_control_type_to_string(enum ss_control_type type);
 const char *bearer_class_to_string(enum bearer_class cls);
 
 gboolean is_valid_pin(const char *pin);
+
+const char *registration_status_to_string(int status);
+const char *registration_tech_to_string(int tech);
diff --git a/src/network.c b/src/network.c
index 0e5d55b..efa0bc7 100644
--- a/src/network.c
+++ b/src/network.c
@@ -117,50 +117,6 @@ static inline const char *network_operator_status_to_string(int status)
 	return "unknown";
 }
 
-static inline const char *registration_status_to_string(int status)
-{
-	switch (status) {
-	case NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
-		return "unregistered";
-	case NETWORK_REGISTRATION_STATUS_REGISTERED:
-		return "registered";
-	case NETWORK_REGISTRATION_STATUS_SEARCHING:
-		return "searching";
-	case NETWORK_REGISTRATION_STATUS_DENIED:
-		return "denied";
-	case NETWORK_REGISTRATION_STATUS_UNKNOWN:
-		return "unknown";
-	case NETWORK_REGISTRATION_STATUS_ROAMING:
-		return "roaming";
-	}
-
-	return "";
-}
-
-static inline const char *registration_tech_to_string(int tech)
-{
-	switch (tech) {
-	case ACCESS_TECHNOLOGY_GSM:
-		return "GSM";
-	case ACCESS_TECHNOLOGY_GSM_COMPACT:
-		return "GSMCompact";
-	case ACCESS_TECHNOLOGY_UTRAN:
-		return "UTRAN";
-	case ACCESS_TECHNOLOGY_GSM_EGPRS:
-		return "GSM+EGPRS";
-	case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
-		return "UTRAN+HSDPA";
-	case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
-		return "UTRAN+HSUPA";
-	case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
-		return "UTRAN+HSDPA+HSUPA";
-	case ACCESS_TECHNOLOGY_EUTRAN:
-		return "EUTRAN";
-	default:
-		return "";
-	}
-}
-
 static void register_callback(const struct ofono_error *error, void *data)
 {
 	struct ofono_netreg *netreg = data;
-- 
1.6.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Always-return-a-string-from-telephony_error_to_str.patch --]
[-- Type: text/x-patch, Size: 905 bytes --]

From 73938e4e1005672b99f92995c26a5ff41a01d656 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Date: Mon, 12 Oct 2009 22:39:47 +0200
Subject: [PATCH 2/5] Always return a string from telephony_error_to_str.

So that it can be used as a printf argument directly.
---
 src/common.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common.c b/src/common.c
index 1b002bf..cb79334 100644
--- a/src/common.c
+++ b/src/common.c
@@ -280,14 +280,14 @@ const char *telephony_error_to_str(const struct ofono_error *error)
 		maxentries = sizeof(ceer_errors) / sizeof(struct error_entry);
 		break;
 	default:
-		return 0;
+		return "Unknown error type";
 	}
 
 	for (i = 0; i < maxentries; i++)
 		if (e[i].error == error->error)
 			return e[i].str;
 
-	return 0;
+	return "Unknown error";
 }
 
 int mmi_service_code_to_bearer_class(int code)
-- 
1.6.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-Emit-debug-message-instead-of-an-error-when-SMS-stor.patch --]
[-- Type: text/x-patch, Size: 785 bytes --]

From 3f771555079fa77045596fa1bc2b516970a43290 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Date: Mon, 12 Oct 2009 22:41:35 +0200
Subject: [PATCH 3/5] Emit debug message instead of an error when SMS storage is empty on init.

---
 drivers/atmodem/sms.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index d425818..b3d6ff5 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -548,7 +548,7 @@ static void at_cmgl_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	struct ofono_sms *sms = user_data;
 
 	if (!ok)
-		ofono_error("Initial listing SMS storage failed!");
+		ofono_debug("Initial listing SMS storage failed!");
 
 	at_cmgl_done(sms);
 }
-- 
1.6.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0004-Don-t-crash-on-sms-messages-containing-only-UDH.patch --]
[-- Type: text/x-patch, Size: 682 bytes --]

From fc0cb192de7cb0f622aa9e6d6879865de2fe169b Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Date: Mon, 12 Oct 2009 22:43:04 +0200
Subject: [PATCH 4/5] Don't crash on sms messages containing only UDH.

---
 src/smsutil.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/smsutil.c b/src/smsutil.c
index a618d07..d7e81c7 100644
--- a/src/smsutil.c
+++ b/src/smsutil.c
@@ -2133,6 +2133,9 @@ char *sms_decode_text(GSList *sms_list)
 
 		udl_in_bytes = sms_udl_in_bytes(udl, dcs);
 
+		if (udl_in_bytes == taken)
+			continue;
+
 		if (charset == SMS_CHARSET_7BIT) {
 			unsigned char buf[160];
 			long written;
-- 
1.6.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread