Fix APN setting error

1. remove Chinese characters in APN settings database, it will cause
connection manager crash as the profile_name is used as dbus path.
2. change proxy port from 8080 to 80

diff --git a/resources/dnet_db_data.sql b/resources/dnet_db_data.sql
index a454e38..0ce961f 100644 (file)
--- a/resources/dnet_db_data.sql
+++ b/resources/dnet_db_data.sql
@@ -102,11 +102,11 @@ INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, au
 INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(61, 'T Mobile MMS','mms',0,NULL,NULL,1,'213.158.194.226:8080','http://mms/servlets/mms',300, 0,0,NULL,0,NULL,NULL,29,2, 0, 1, 0);
 INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(62, 'Bouygues Internet',NULL,0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,30,1,0,1,1);
 INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(63, 'Bouygues MMS','mms.bouygtel.com',1,NULL,NULL,1,'62.201.129.226:8080','http://mms.bouyguestelecom.fr/mms/wapenc',300,0,0,NULL,0,NULL,NULL,30,2, 0, 1, 0);
-INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(64, '�?��移动 (China Mobile) GPRS','cmnet',0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,31,1,0,1,1);
-INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(65, '�?��移动彩信 (China Mobile)','cmwap',1,NULL,NULL,1,'10.0.0.172:8080','http://mmsc.monternet.com',300,0,0,NULL,0,NULL,NULL,31,2, 0, 1, 0);
-INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(66, '�?��?��?3g 网络 (China Unicom)','3gnet',0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,32,1,0,1,1);
-INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(67, '�?��?��?3g 彩信 (China Unicom)','3gwap',1,NULL,NULL,1,'10.0.0.172:8080','http://mmsc.myuni.com.cn',300,0,0,NULL,0,NULL,NULL,32,2, 0, 1, 0);
-INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(68, '�?��移动 (China Mobile) GPRS','cmnet',0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,37,1,0,1,1);
-INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(69, '�?��移动彩信 (China Mobile)','cmwap',1,NULL,NULL,1,'10.0.0.172:8080','http://mmsc.monternet.com',300,0,0,NULL,0,NULL,NULL,37,2, 0, 1, 0);
+INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(64, 'China Mobile GPRS','cmnet',0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,31,1,0,1,1);
+INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(65, 'China Mobile MMS','cmwap',1,NULL,NULL,1,'10.0.0.172:80','http://mmsc.monternet.com',300,0,0,NULL,0,NULL,NULL,31,2, 0, 1, 0);
+INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(66, 'China Unicom 3G','3gnet',0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,32,1,0,1,1);
+INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(67, 'China Unicom MMS','3gwap',1,NULL,NULL,1,'10.0.0.172:80','http://mmsc.myuni.com.cn',300,0,0,NULL,0,NULL,NULL,32,2, 0, 1, 0);
+INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(68, 'China Mobile GPRS','cmnet',0,NULL,NULL,1,NULL,NULL,300,0,0,NULL,0,NULL,NULL,37,1,0,1,1);
+INSERT INTO "pdp_profile" (profile_id, profile_name, apn, auth_type, auth_id, auth_pwd, pdp_protocol,proxy_ip_addr,home_url,linger_time, traffic_class,is_static_ip_addr,ip_addr,is_static_dns_addr,dns_addr1,dns_addr2,network_info_id,svc_category_id, hidden, editable, default_internet_con)       VALUES(69, 'China Mobile MMS','cmwap',1,NULL,NULL,1,'10.0.0.172:80','http://mmsc.monternet.com',300,0,0,NULL,0,NULL,NULL,37,2, 0, 1, 0);
 
 

diff --git a/src/main.c b/src/main.c
index 6e0f8df..732bb64 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -59,7 +59,7 @@ static gboolean on_init(TcorePlugin *p)
                err("fail to get dbus(%s)", error->message);
                return FALSE;
        }
-       dbg("get dbus connection(%p)", conn);
+       dbg("get dbus connection (%p)", conn);
 
        dbg("plugin pointer (%p)", p);
        rv = _ps_context_initialize(p);