[PATCHv2 4/6] all: re-tag APNs according to the new dtd 3/3

From: Oleg Zhurakivskyy <oleg zhurakivskyy intel com>
To: networkmanager-list gnome org
Subject: [PATCHv2 4/6] all: re-tag APNs according to the new dtd 3/3
Date: Thu, 28 Jul 2011 13:03:19 +0300
---
 serviceproviders.xml |  452 +++++++++++++++++++++++++-------------------------
 1 files changed, 226 insertions(+), 226 deletions(-)

diff --git a/serviceproviders.xml b/serviceproviders.xml
index 839c1f2..0e9bdf1 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -5043,53 +5043,53 @@ conceived.
 		<name>NetworkNorway</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>OneCall</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Lebara</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Altibox</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SheTalks</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Telipol</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Ventelo</name>
 		<gsm>
 			<network-id mcc="242" mnc="07"/>
-			<apn value="internet.ventelo.no"/>
+			<apn value="internet.ventelo.no" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Ludo Mobil</name>
 		<gsm>
 			<network-id mcc="242" mnc="07"/>
-			<apn value="internet.ventelo.no"/>
+			<apn value="internet.ventelo.no" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -5101,11 +5101,11 @@ conceived.
 				<ussd>*111#</ussd>
 				<dtmf>47300000</dtmf>
 			</balance-check>
-			<apn value="internet.tele2.no">
+			<apn value="internet.tele2.no" type="internet" plan="postpaid">
 				<name>Mobilt internet</name>
 			</apn>
 			<!-- http://www.tele2.no/mobilt-bredbaand.html -->
-			<apn value="mobileinternet.tele2.no">
+			<apn value="mobileinternet.tele2.no" type="internet" plan="postpaid">
 				<name>Mobilt bredbÃ¥nd</name>
 			</apn>
 		</gsm>
@@ -5118,14 +5118,14 @@ conceived.
 		<name>Nepal Telecom</name>
 		<gsm>
 			<network-id mcc="429" mnc="01"/>
-			<apn value="ntnet"/>
+			<apn value="ntnet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mero Mobile</name>
 		<gsm>
 			<network-id mcc="429" mnc="02"/>
-			<apn value="mero"/>
+			<apn value="mero" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -5137,16 +5137,16 @@ conceived.
 		<gsm>
 			<network-id mcc="530" mnc="00"/>
 			<network-id mcc="530" mnc="05"/>
-			<apn value="wap.telecom.co.nz" type="wap">
+			<apn value="wap.telecom.co.nz" type="wap" plan="postpaid">
 				<name>XT mobile (WAP)</name>
 			</apn>
-			<apn value="internet.telecom.co.nz">
+			<apn value="internet.telecom.co.nz" type="internet" plan="postpaid">
 				<name>XT mobile (Internet with Firewall)</name>
 			</apn>
-			<apn value="direct.telecom.co.nz">
+			<apn value="direct.telecom.co.nz" type="internet" plan="postpaid">
 				<name>XT mobile (Direct Internet)</name>
 			</apn>
-			<apn value="oa.telecom.co.nz">
+			<apn value="oa.telecom.co.nz" type="internet" plan="postpaid">
 				<name>XT mobile (One Office/Remote Office)</name>
 			</apn>
 		</gsm>
@@ -5155,15 +5155,15 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="530" mnc="01"/>
-			<apn value="live.vodafone.com">
+			<apn value="live.vodafone.com" type="internet" plan="postpaid">
 				<name>WAP</name>
 				<dns>202.73.206.16</dns>
 				<dns>202.73.198.16</dns>
 			</apn>
-			<apn value="www.vodafone.net.nz">
+			<apn value="www.vodafone.net.nz" type="internet" plan="postpaid">
 				<name>Contract / Prepaid (Restricted)</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Unrestricted (public)</name>
 				<dns>202.73.206.16</dns>
 				<dns>202.73.198.16</dns>
@@ -5178,14 +5178,14 @@ conceived.
 		<name>Oman Mobile</name>
 		<gsm>
 			<network-id mcc="422" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Nawras</name>
 		<gsm>
 			<network-id mcc="422" mnc="03"/>
-			<apn value="isp.nawras.com.om"/>
+			<apn value="isp.nawras.com.om" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -5196,7 +5196,7 @@ conceived.
 		<name>Cable and Wireless</name>
 		<gsm>
 			<network-id mcc="714" mnc="01"/>
-			<apn value="apn01.cwpanama.com.pa">
+			<apn value="apn01.cwpanama.com.pa" type="internet" plan="postpaid">
 			</apn>
 		</gsm>
 	</provider>
@@ -5204,7 +5204,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="714" mnc="02"/>
-			<apn value="internet.movistar.pa">
+			<apn value="internet.movistar.pa" type="internet" plan="postpaid">
 				<username>movistarpa</username>
 				<password>movistarpa</password>
 				<dns>200.39.10.1</dns>
@@ -5220,7 +5220,7 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="716" mnc="10"/>
-			<apn value="tim.pe">
+			<apn value="tim.pe" type="internet" plan="postpaid">
 				<username>tim</username>
 				<password>tulibertad</password>
 			</apn>
@@ -5230,7 +5230,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="716" mnc="06"/>
-			<apn value="movistar.pe">
+			<apn value="movistar.pe" type="internet" plan="postpaid">
 				<username>movistar@datos</username>
 				<password>movistar</password>
 			</apn>
@@ -5244,7 +5244,7 @@ conceived.
 		<name>Vini</name>
 		<gsm>
 			<network-id mcc="547" mnc="20"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -5255,21 +5255,21 @@ conceived.
 		<name>Globe Telecom</name>
 		<gsm>
 			<network-id mcc="515" mnc="02"/>
-			<apn value="internet.globe.com.ph">
+			<apn value="internet.globe.com.ph" type="internet" plan="postpaid">
 				<name>Postpaid</name>
 				<username>globe</username>
 				<password>globe</password>
 				<dns>203.127.225.10</dns>
 				<dns>203.127.225.11</dns>
 			</apn>
-			<apn value="http.globe.com.ph" type="prepaid">
+			<apn value="http.globe.com.ph" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<username>globe</username>
 				<password>globe</password>
 				<dns>203.127.225.10</dns>
 				<dns>203.127.225.11</dns>
 			</apn>
-			<apn value="www.globe.com.ph">
+			<apn value="www.globe.com.ph" type="internet" plan="postpaid">
 				<name>WAP</name>
 				<username>globe</username>
 				<password>globe</password>
@@ -5282,7 +5282,7 @@ conceived.
 		<name>Smart</name>
 		<gsm>
 			<network-id mcc="515" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>witsductoor</username>
 				<password>banonoy</password>
 				<dns>202.57.96.3</dns>
@@ -5294,7 +5294,7 @@ conceived.
 		<name>Digitel (Sun Cellular)</name>
 		<gsm>
 			<network-id mcc="515" mnc="05"/>
-			<apn value="minternet"/>
+			<apn value="minternet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -5305,7 +5305,7 @@ conceived.
 		<name>Djuice</name>
 		<gsm>
 			<network-id mcc="515" mnc="06"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>telenor</username>
 				<password>telenor</password>
 			</apn>
@@ -5315,10 +5315,10 @@ conceived.
 		<name>Mobilink</name>
 		<gsm>
 			<network-id mcc="515" mnc="01"/>
-			<apn value="connect.mobilinkworld.com">
+			<apn value="connect.mobilinkworld.com" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
-			<apn value="jazzconnect.mobilinkworld.com">
+			<apn value="jazzconnect.mobilinkworld.com" type="internet" plan="postpaid">
 				<name>Jazz</name>
 			</apn>
 		</gsm>
@@ -5327,7 +5327,7 @@ conceived.
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="515" mnc="06"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>telenor</username>
 				<password>telenor</password>
 			</apn>
@@ -5337,7 +5337,7 @@ conceived.
 		<name>Ufone</name>
 		<gsm>
 			<network-id mcc="410" mnc="03"/>
-			<apn value="ufone.internet">
+			<apn value="ufone.internet" type="internet" plan="postpaid">
 				<username>ufone</username>
 				<password>ufone</password>
 			</apn>
@@ -5347,14 +5347,14 @@ conceived.
 		<name>Warid</name>
 		<gsm>
 			<network-id mcc="515" mnc="07"/>
-			<apn value="warid"/>
+			<apn value="warid" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>ZONG</name>
 		<gsm>
 			<network-id mcc="515" mnc="04"/>
-			<apn value="zonginternet"/>
+			<apn value="zonginternet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -5365,7 +5365,7 @@ conceived.
 		<name>ERA</name>
 		<gsm>
 			<network-id mcc="260" mnc="02"/>
-			<apn value="erainternet">
+			<apn value="erainternet" type="internet" plan="postpaid">
 				<username>erainternet</username>
 				<password>erainternet</password>
 				<dns>213.158.194.1</dns>
@@ -5377,14 +5377,14 @@ conceived.
 		<name>Play Online</name>
 		<gsm>
 			<network-id mcc="260" mnc="06"/>
-			<apn value="Internet"/>
+			<apn value="Internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Heyah</name>
 		<gsm>
 			<network-id mcc="260" mnc="02"/>
-			<apn value="heyah.pl">
+			<apn value="heyah.pl" type="internet" plan="postpaid">
 				<username>heyah</username>
 				<password>heyah</password>
 				<dns>213.158.194.1</dns>
@@ -5396,7 +5396,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="260" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>internet</username>
 				<password>internet</password>
 				<dns>194.9.223.79</dns>
@@ -5408,7 +5408,7 @@ conceived.
 		<name>iPlus</name>
 		<gsm>
 			<network-id mcc="260" mnc="01"/>
-			<apn value="www.plusgsm.pl">
+			<apn value="www.plusgsm.pl" type="internet" plan="postpaid">
 				<dns>212.2.96.51</dns>
 				<dns>212.2.96.52</dns>
 			</apn>
@@ -5418,7 +5418,7 @@ conceived.
 		<name>GaduAIR</name>
 		<gsm>
 			<network-id mcc="260" mnc="01"/>
-			<apn value="internet.gadu-gadu.pl"/>
+			<apn value="internet.gadu-gadu.pl" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -5429,18 +5429,18 @@ conceived.
 		<name>Kanguru</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="kanguru-portatil">
+			<apn value="kanguru-portatil" type="internet" plan="postpaid">
 				<name>Portable</name>
 				<name xml:lang="pt">PortÃ¡til</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
-			<apn value="kanguru-tempo" type="prepaid">
+			<apn value="kanguru-tempo" type="internet" plan="prepaid">
 				<name>Tempo (Prepaid)</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
-			<apn value="kangurufixo">
+			<apn value="kangurufixo" type="internet" plan="postpaid">
 				<name>Fixo</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
@@ -5452,17 +5452,17 @@ conceived.
 		<name>Clix</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="clixinternetmovel"/>
+			<apn value="clixinternetmovel" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Optimus</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="umts">
+			<apn value="umts" type="internet" plan="postpaid">
 				<name>3G</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>GPRS</name>
 				<dns>194.79.69.129</dns>
 			</apn>
@@ -5472,7 +5472,7 @@ conceived.
 		<name>TMN</name>
 		<gsm>
 			<network-id mcc="268" mnc="06"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>tmn</username>
 				<password>tmn</password>
 				<dns>194.65.3.20</dns>
@@ -5484,7 +5484,7 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
-			<apn value="internet.vodafone.pt">
+			<apn value="internet.vodafone.pt" type="internet" plan="postpaid">
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
@@ -5494,7 +5494,7 @@ conceived.
 		<name>ZON</name>
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
-			<apn value="internet.zon.pt">
+			<apn value="internet.zon.pt" type="internet" plan="postpaid">
 			</apn>
 		</gsm>
 	</provider>
@@ -5506,24 +5506,24 @@ conceived.
 		<name>VOX</name>
 		<gsm>
 			<network-id mcc="744" mnc="01"/>
-			<apn value="vox.wap"></apn>
+			<apn value="vox.wap" type="internet" plan="postpaid"></apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Personal</name>
 		<gsm>
 			<network-id mcc="744" mnc="05"/>
-			<apn value="internet"></apn>
+			<apn value="internet" type="internet" plan="postpaid"></apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="744" mnc="04"/>
-			<apn value="internet.tigo.py">
+			<apn value="internet.tigo.py" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
-			<apn value="broadband.tigo.py">
+			<apn value="broadband.tigo.py" type="internet" plan="postpaid">
 				<name>Broadband</name>
 				<name xml:lang="es">Banda Ancha MÃ³vil</name>
 				<username>tigo</username>
@@ -5535,7 +5535,7 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="744" mnc="02"/>
-			<apn value="gprs.claro.com.py">
+			<apn value="gprs.claro.com.py" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -5548,10 +5548,10 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="427" mnc="02"/>
-			<apn value="vodafone.com.qa">
+			<apn value="vodafone.com.qa" type="internet" plan="postpaid">
 				<name>Web (old)</name>
 			</apn>
-			<apn value="web.vodafone.com.qa">
+			<apn value="web.vodafone.com.qa" type="internet" plan="postpaid">
 				<name>Web</name>
 			</apn>
 		</gsm>
@@ -5560,7 +5560,7 @@ conceived.
 		<name>Q-Tel</name>
 		<gsm>
 			<network-id mcc="427" mnc="01"/>
-			<apn value="gprs.qtel">
+			<apn value="gprs.qtel" type="internet" plan="postpaid">
 				<name>Qatarnet</name>
 				<username>gprs</username>
 				<password>gprs</password>
@@ -5575,16 +5575,16 @@ conceived.
 		<name>SFR RÃ©union</name>
 		<gsm>
 			<network-id mcc="647" mnc="10"/>
-			<apn value="websfr">
+			<apn value="websfr" type="internet" plan="postpaid">
 				<name>Contract / Prepaid</name>
 			</apn>
-			<apn value="slsfr">
+			<apn value="slsfr" type="internet" plan="postpaid">
 				<name>SFR slsfr</name>
 			</apn>
-			<apn value="internetpro">
+			<apn value="internetpro" type="internet" plan="postpaid">
 				<name>SFR internetpro</name>
 			</apn>
-			<apn value="ipnet">
+			<apn value="ipnet" type="internet" plan="postpaid">
 				<name>SFR ipnet</name>
 			</apn>
 		</gsm>
@@ -5597,7 +5597,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="226" mnc="10"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>172.22.7.21</dns>
 				<dns>172.22.7.20</dns>
 			</apn>
@@ -5607,27 +5607,27 @@ conceived.
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="226" mnc="01"/>
-			<apn value="tobe.vodafone.ro">
+			<apn value="tobe.vodafone.ro" type="internet" plan="postpaid">
 				<name>Mobile Internet (Prepaid)</name>
 				<username>tobe.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="internet.vodafone.ro">
+			<apn value="internet.vodafone.ro" type="internet" plan="postpaid">
 				<name>Mobile Internet (Postpaid)</name>
 				<username>internet.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="internet.pre.vodafone.ro" type="prepaid">
+			<apn value="internet.pre.vodafone.ro" type="internet" plan="prepaid">
 				<name>Mobile Internet (Prepaid)</name>
 				<username>internet.pre.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="live.vodafone.com">
+			<apn value="live.vodafone.com" type="internet" plan="postpaid">
 				<name>Live! (Postpaid)</name>
 				<username>live</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="live.pre.vodafone.ro" type="prepaid">
+			<apn value="live.pre.vodafone.ro" type="internet" plan="prepaid">
 				<name>Live! (Prepaid)</name>
 				<username>live.pre.vodafone.com</username>
 				<password>vodafone</password>
@@ -5645,10 +5645,10 @@ conceived.
 		<name>Digi.Net Mobil</name>
 		<gsm>
 			<network-id mcc="226" mnc="05"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Home</name>
 			</apn>
-			<apn value="static">
+			<apn value="static" type="internet" plan="postpaid">
 				<name>Business (static)</name>
 			</apn>
 		</gsm>
@@ -5661,7 +5661,7 @@ conceived.
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="220" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>telenor</username>
 				<password>gprs</password>
 			</apn>
@@ -5671,7 +5671,7 @@ conceived.
 		<name>Telekom Srbija</name>
 		<gsm>
 			<network-id mcc="220" mnc="03"/>
-			<apn value="gprsinternet">
+			<apn value="gprsinternet" type="internet" plan="postpaid">
 				<username>mts</username>
 				<password>064</password>
 				<dns>195.178.38.3</dns>
@@ -5682,7 +5682,7 @@ conceived.
 		<name>VIP Mobile</name>
 		<gsm>
 			<network-id mcc="220" mnc="05"/>
-			<apn value="vipmobile">
+			<apn value="vipmobile" type="internet" plan="postpaid">
 				<username>vipmobile</username>
 				<password>vipmobile</password>
 			</apn>
@@ -5696,7 +5696,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="635" mnc="10"/>
-			<apn value="internet.mtn">
+			<apn value="internet.mtn" type="internet" plan="postpaid">
 			</apn>
 		</gsm>
 	</provider>
@@ -5709,7 +5709,7 @@ conceived.
 		<name xml:lang="ru">Ð?Ð°Ð¹ÐºÐ°Ð»Ð?ÐµÑ?Ñ?Ð?Ð¾Ð¼</name>
 		<gsm>
 			<network-id mcc="250" mnc="12"/>
-			<apn value="inet.bwc.ru">
+			<apn value="inet.bwc.ru" type="internet" plan="postpaid">
 				<username>bwc</username>
 				<password>bwc</password>
 				<dns>81.18.113.2</dns>
@@ -5723,7 +5723,7 @@ conceived.
 		<gsm>
 			<network-id mcc="250" mnc="28"/>
 			<network-id mcc="250" mnc="99"/>
-			<apn value="internet.beeline.ru">
+			<apn value="internet.beeline.ru" type="internet" plan="postpaid">
 				<username>beeline</username>
 				<password>beeline</password>
 				<dns>217.118.66.243</dns>
@@ -5735,14 +5735,14 @@ conceived.
 		<name>ETK</name>
 		<gsm>
 			<network-id mcc="250" mnc="05"/>
-			<apn value="wap.etk.ru"/>
+			<apn value="wap.etk.ru" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MTS</name>
 		<gsm>
 			<network-id mcc="250" mnc="01"/>
-			<apn value="internet.mts.ru">
+			<apn value="internet.mts.ru" type="internet" plan="postpaid">
 				<username>mts</username>
 				<password>mts</password>
 				<dns>213.87.0.1</dns>
@@ -5757,59 +5757,59 @@ conceived.
 		<gsm>
 			<network-id mcc="250" mnc="02"/>
 
-			<apn value="internet.nw">
+			<apn value="internet.nw" type="internet" plan="postpaid">
 				<name>NW</name>
 				<name xml:lang="ru">Ð¡ÐµÐ²ÐµÑ?Ð¾-Ð?Ð°Ð¿Ð°Ð´</name>
 				<dns>10.140.142.42</dns>
 				<dns>10.140.142.45</dns>
 			</apn>
-			<apn value="internet.ugsm">
+			<apn value="internet.ugsm" type="internet" plan="postpaid">
 				<name>UGSM</name>
 				<name xml:lang="ru">Ð£Ñ?Ð°Ð»</name>
 				<dns>83.149.32.2</dns>
 				<dns>83.149.33.2</dns>
 			</apn>
-			<apn value="internet.usi.ru">
+			<apn value="internet.usi.ru" type="internet" plan="postpaid">
 				<name>usi</name>
 				<dns>212.120.160.130</dns>
 				<dns>212.120.160.130</dns>
 			</apn>
-			<apn value="internet.dv">
+			<apn value="internet.dv" type="internet" plan="postpaid">
 				<name>DV</name>
 				<name xml:lang="ru">Ð?Ð°Ð»Ñ?Ð½Ð¸Ð¹ Ð?Ð¾Ñ?Ñ?Ð¾Ðº</name>
 				<dns>83.149.52.77</dns>
 				<dns>194.186.112.18</dns>
 			</apn>
-			<apn value="internet.kvk">
+			<apn value="internet.kvk" type="internet" plan="postpaid">
 				<name>kvk</name>
 				<name xml:lang="ru">Ð?Ð°Ð²ÐºÐ°Ð·</name>
 				<dns>83.149.24.244</dns>
 				<dns>62.183.50.230</dns>
 			</apn>
-			<apn value="internet.ltmsk">
+			<apn value="internet.ltmsk" type="internet" plan="postpaid">
 				<name>ltmsk</name>
 				<dns>10.22.10.20</dns>
 				<dns>10.22.10.21</dns>
 			</apn>
-			<apn value="internet.sib">
+			<apn value="internet.sib" type="internet" plan="postpaid">
 				<name>sib</name>
 				<name xml:lang="ru">Ð¡Ð¸Ð±Ð¸Ñ?Ñ?</name>
 				<dns>83.149.51.65</dns>
 				<dns>83.149.50.65</dns>
 			</apn>
-			<apn value="internet.volga">
+			<apn value="internet.volga" type="internet" plan="postpaid">
 				<name>volga</name>
 				<name xml:lang="ru">Ð?Ð¾Ð²Ð¾Ð»Ð¶Ñ?Ðµ</name>
 				<dns>83.149.16.7</dns>
 				<dns>195.128.128.1</dns>
 			</apn>
-			<apn value="internet.mc">
+			<apn value="internet.mc" type="internet" plan="postpaid">
 				<name>mc</name>
 				<name xml:lang="ru">Ð¦ÐµÐ½Ñ?Ñ?</name>
 				<dns>81.18.129.252</dns>
 				<dns>217.150.34.1</dns>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Moscow</name>
 				<name xml:lang="ru">Ð?Ð¾Ñ?ÐºÐ²Ð°</name>
 				<username>gdata</username>
@@ -5821,7 +5821,7 @@ conceived.
 		<name>NCC</name>
 		<gsm>
 			<network-id mcc="250" mnc="03"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>ncc</username>
 				<dns>10.0.3.5</dns>
 				<dns>10.0.3.2</dns>
@@ -5832,7 +5832,7 @@ conceived.
 		<name>NTC</name>
 		<gsm>
 			<network-id mcc="250" mnc="16"/>
-			<apn value="internet.ntc">
+			<apn value="internet.ntc" type="internet" plan="postpaid">
 				<dns>80.243.64.67</dns>
 				<dns>80.243.68.34</dns>
 			</apn>
@@ -5843,7 +5843,7 @@ conceived.
 		<name xml:lang="ru">Ð?Ð½Ð¸Ñ?ÐµÐ¹ Ð¢ÐµÐ»ÐµÐºÐ¾Ð¼</name>
 		<gsm>
 			<network-id mcc="250" mnc="05"/>
-			<apn value="internet.etk.ru">
+			<apn value="internet.etk.ru" type="internet" plan="postpaid">
 				<username>etk</username>
 				<dns>10.10.30.3</dns>
 				<dns>10.10.30.4</dns>
@@ -5855,7 +5855,7 @@ conceived.
 		<name xml:lang="ru">Ð?Ð¾Ñ?Ð¸Ð²</name>
 		<gsm>
 			<network-id mcc="250" mnc="35"/>
-			<apn value="inet.ycc.ru">
+			<apn value="inet.ycc.ru" type="internet" plan="postpaid">
 				<username>motiv</username>
 				<dns>217.148.52.34</dns>
 				<dns>217.148.52.3</dns>
@@ -5866,7 +5866,7 @@ conceived.
 		<name>Tatincom</name>
 		<name xml:lang="ru">Ð¢Ð°Ñ?Ð¸Ð½ÐºÐ¾Ð¼</name>
 		<gsm>
-			<apn value="internet.tatincom.ru">
+			<apn value="internet.tatincom.ru" type="internet" plan="postpaid">
 				<username>tatincom</username>
 				<password>tatincom</password>
 				<dns>89.207.96.2</dns>
@@ -5879,7 +5879,7 @@ conceived.
 		<name xml:lang="ru">Ð¢ÐµÐ»Ðµ2</name>
 		<gsm>
 			<network-id mcc="250" mnc="20"/>
-			<apn value="internet.tele2.ru">
+			<apn value="internet.tele2.ru" type="internet" plan="postpaid">
 				<dns>130.244.127.161</dns>
 				<dns>130.244.127.169</dns>
 			</apn>
@@ -5990,7 +5990,7 @@ conceived.
 		<name>U-tel</name>
 		<gsm>
 			<network-id mcc="250" mnc="39"/>
-			<apn value="internet.usi.ru"/>
+			<apn value="internet.usi.ru" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -6001,10 +6001,10 @@ conceived.
 		<name>Mobily</name>
 		<gsm>
 			<network-id mcc="420" mnc="03"/>
-			<apn value="web1">
+			<apn value="web1" type="internet" plan="postpaid">
 				<name>Postpaid</name>
 			</apn>
-			<apn value="web2" type="prepaid">
+			<apn value="web2" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -6013,7 +6013,7 @@ conceived.
 		<name>STC</name>
 		<gsm>
 			<network-id mcc="420" mnc="01"/>
-			<apn value="jawalnet.com.sa">
+			<apn value="jawalnet.com.sa" type="internet" plan="postpaid">
 				<dns>212.118.133.101</dns>
 				<dns>212.118.133.102</dns>
 			</apn>
@@ -6023,7 +6023,7 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="420" mnc="04"/>
-			<apn value="zain"/>
+			<apn value="zain" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -6037,14 +6037,14 @@ conceived.
 			<network-id mcc="240" mnc="02"/>
 			<network-id mcc="240" mnc="04"/>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
-			<apn value="data.tre.se">
+			<apn value="data.tre.se" type="internet" plan="postpaid">
 				<name>Mobiltelefon</name>
 			</apn>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
-			<apn value="bredband.tre.se">
+			<apn value="bredband.tre.se" type="internet" plan="postpaid">
 				<name>Bredband</name>
 			</apn>
-			<apn value="net.tre.se">
+			<apn value="net.tre.se" type="internet" plan="postpaid">
 				<name>Bredband Kontantkort</name>
 			</apn>
 		</gsm>
@@ -6054,11 +6054,11 @@ conceived.
 		<gsm>
 			<network-id mcc="240" mnc="08"/>
 			<!-- http://glocalnet.se/mobiltbredband -->
-			<apn value="bredband.glocalnet.se">
+			<apn value="bredband.glocalnet.se" type="internet" plan="postpaid">
 				<name>Mobilt Bredband</name>
 			</apn>
 			<!-- http://kundservice.glocalnet.se/Kundservice/Mobiltelefoni/Installningar/ -->
-			<apn value="internet.glocalnet.se">
+			<apn value="internet.glocalnet.se" type="internet" plan="postpaid">
 				<name>Glocalnet Internet</name>
 			</apn>
 		</gsm>
@@ -6069,7 +6069,7 @@ conceived.
 			<network-id mcc="240" mnc="01"/>
 
 			<!-- http://www.halebop.se/halebop_kundtjanst/vanliga_fragor_kontantkort/ -->
-			<apn value="halebop.telia.se"/>
+			<apn value="halebop.telia.se" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6090,11 +6090,11 @@ conceived.
 				<dtmf>211</dtmf>
 			</balance-check>
 			<!-- http://www.tele2.se/internet-via-gprs.html -->
-			<apn value="internet.tele2.se">
+			<apn value="internet.tele2.se" type="internet" plan="postpaid">
 				<name>Mobilt Internet</name>
 			</apn>
 			<!-- http://www.tele2.se/alien-modem.html -->
-			<apn value="mobileinternet.tele2.se">
+			<apn value="mobileinternet.tele2.se" type="internet" plan="postpaid">
 				<name>Mobilt Bredband</name>
 			</apn>
 		</gsm>
@@ -6104,7 +6104,7 @@ conceived.
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
 			<network-id mcc="240" mnc="05"/>
-			<apn value="data.comviq.se">
+			<apn value="data.comviq.se" type="internet" plan="postpaid">
 				<name>Surf</name>
 			</apn>
 		</gsm>
@@ -6116,7 +6116,7 @@ conceived.
 			<network-id mcc="240" mnc="05"/>
 			
 			<!-- http://multicomsecurity.se/produkter-tjanster/mobil-datakommunikation/mobiflex/ -->
-			<apn value="mobiflex.telia.se">
+			<apn value="mobiflex.telia.se" type="internet" plan="postpaid">
 				<name>Mobiflex</name>
 			</apn>
 		</gsm>
@@ -6129,13 +6129,13 @@ conceived.
 			<network-id mcc="240" mnc="08"/>
 
 			<!-- http://www.telenor.se/privat/mobiltelefoni/alla-mobiltjanster/alla-mobiltjanster.html#C45-2100 -->
-			<apn value="internet.telenor.se">
+			<apn value="internet.telenor.se" type="internet" plan="postpaid">
 				<name>Mobilt Internet</name>
 			</apn>
-			<apn value="services.telenor.se">
+			<apn value="services.telenor.se" type="internet" plan="postpaid">
 				<name>Mobilsurf med maxtaxa</name>
 			</apn>
-			<apn value="bredband.telenor.se">
+			<apn value="bredband.telenor.se" type="internet" plan="postpaid">
 				<name>Mobilt Bredband</name>
 			</apn>
 		</gsm>
@@ -6150,21 +6150,21 @@ conceived.
 				<ussd>*121#</ussd>
 			</balance-check>
 			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
-			<apn value="online.telia.se"/>
+			<apn value="online.telia.se" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="240" mnc="14"/>
-			<apn value="internet.se"/>
+			<apn value="internet.se" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>djuice</name>
 		<gsm>
 			<network-id mcc="240" mnc="09"/>
-			<apn value="internet.djuice.se"/>
+			<apn value="internet.djuice.se" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6173,25 +6173,25 @@ conceived.
 			<network-id mcc="240" mnc="02"/>
 			<network-id mcc="240" mnc="04"/>
 			<!-- MVNO operating on 3's network -->
-			<apn value="bredband.comhem.se"/>
+			<apn value="bredband.comhem.se" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Parlino</name>
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
-			<apn value="internet.parlino.se"/>
+			<apn value="internet.parlino.se" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Universal Telecom</name>
 		<gsm>
 			<!-- http://www.uvtc.com/SWEDEN/internet/mobiltbredband/Default.aspx -->
-			<apn value="sp-internet">
+			<apn value="sp-internet" type="internet" plan="postpaid">
 				<name>Mobilt Bredband</name>
 			</apn>
 			<!-- http://www.uvtc.com/sweden/Mobil/Faq/default.aspx -->
-			<apn value="internet.uvtc.com">
+			<apn value="internet.uvtc.com" type="internet" plan="postpaid">
 				<name>Mobilt Internet</name>
 			</apn>
 		</gsm>
@@ -6205,26 +6205,26 @@ conceived.
 		<gsm>
 			<network-id mcc="525" mnc="03"/>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html mid page -->
-			<apn value="sunsurf">
+			<apn value="sunsurf" type="internet" plan="postpaid">
 				<name>SunSurf/Mobile Broadband (postpaid)</name>
 				<username>65</username>
 			</apn>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html top page-->
-			<apn value="miworld">
+			<apn value="miworld" type="internet" plan="postpaid">
 				<name>MiWorld Mobile (postpaid)</name>
 				<username>65(mobilenumber)</username>
 				<password>user123</password>
 			</apn>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html lower page -->
-			<apn value="miworldcard" type="prepaid">
+			<apn value="miworldcard" type="internet" plan="prepaid">
 				<name>MiWorld Mobile (prepaid)</name>
 				<username>65(mobilenumber)</username>
 				<password>user123</password>
 			</apn>
-			<apn value="prepaidbb" type="prepaid">
+			<apn value="prepaidbb" type="internet" plan="prepaid">
 				<name>Mobile Broadband (prepaid)</name>
 			</apn>
-			<apn value="sunsurfmcard" type="prepaid">
+			<apn value="sunsurfmcard" type="internet" plan="prepaid">
 				<name>M Card (prepaid)</name>
 			</apn>
 		</gsm>
@@ -6234,7 +6234,7 @@ conceived.
 		<gsm>
 			<network-id mcc="525" mnc="01"/>
 			<network-id mcc="525" mnc="02"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>165.21.100.88</dns>
 				<dns>165.21.83.88</dns>
 			</apn>
@@ -6244,16 +6244,16 @@ conceived.
 		<name>Starhub</name>
 		<gsm>
 			<network-id mcc="525" mnc="05"/>
-			<apn value="shwap" type="wap">
+			<apn value="shwap" type="wap" plan="postpaid">
 				<name>WAP</name>
 				<username>star</username>
 				<password>hub</password>
 				<dns>203.116.1.78</dns>
 			</apn>
-			<apn value="shppd" type="prepaid">
+			<apn value="shppd" type="internet" plan="prepaid">
 				<name>MaxMobile Broadband (prepaid)</name>
 			</apn>
-			<apn value="shinternet">
+			<apn value="shinternet" type="internet" plan="postpaid">
 				<name>MaxMobile Broadband (postpaid)</name>
 			</apn>
 		</gsm>
@@ -6267,14 +6267,14 @@ conceived.
 		<gsm>
 			<network-id mcc="293" mnc="41"/>
 
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Postpaid</name>
 				<username>mobitel</username>
 				<password>internet</password>
 				<dns>213.229.248.161</dns>
 				<dns>193.189.160.11</dns>
 			</apn>
-			<apn value="internetpro">
+			<apn value="internetpro" type="internet" plan="postpaid">
 				<username>mobitel</username>
 				<password>internet</password>
 				<dns>213.229.248.161</dns>
@@ -6286,7 +6286,7 @@ conceived.
 		<name>Vodafone / Simobil</name>
 		<gsm>
 			<network-id mcc="293" mnc="40"/>
-			<apn value="internet.simobil.si">
+			<apn value="internet.simobil.si" type="internet" plan="postpaid">
 				<username>simobil</username>
 				<password>internet</password>
 			</apn>
@@ -6296,7 +6296,7 @@ conceived.
 		<name>T-2</name>
 		<gsm>
 			<network-id mcc="293" mnc="64"/>
-			<apn value="internet.t-2.net"/>
+			<apn value="internet.t-2.net" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -6308,7 +6308,7 @@ conceived.
 		<gsm>
 			<network-id mcc="231" mnc="02"/>
 			<network-id mcc="231" mnc="04"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>194.154.230.66</dns>
 				<dns>194.154.230.74</dns>
 			</apn>
@@ -6318,7 +6318,7 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="231" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>213.151.200.30</dns>
 				<dns>213.151.208.161</dns>
 			</apn>
@@ -6328,7 +6328,7 @@ conceived.
 		<name>O2</name>
 		<gsm>
 			<network-id mcc="231" mnc="06"/>
-			<apn value="o2internet">
+			<apn value="o2internet" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -6341,7 +6341,7 @@ conceived.
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="608" mnc="02"/>
-			<apn value="wap.sentelgsm.com">
+			<apn value="wap.sentelgsm.com" type="internet" plan="postpaid">
 				<dns>200.85.0.104</dns>
 				<dns>200.85.0.107</dns>
 			</apn>
@@ -6355,7 +6355,7 @@ conceived.
 		<name>movistar</name>
 		<gsm>
 			<network-id mcc="706" mnc="04"/>
-			<apn value="internet.movistar.sv">
+			<apn value="internet.movistar.sv" type="internet" plan="postpaid">
 				<username>movistarsv</username>
 				<password>movistarsv</password>
 			</apn>
@@ -6365,21 +6365,21 @@ conceived.
 		<name>digicel</name>
 		<gsm>
 			<network-id mcc="706" mnc="02"/>
-			<apn value="wap.digicelsv.com"/>
+			<apn value="wap.digicelsv.com" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="706" mnc="03"/>
-			<apn value="internet.tigo.sv"/>
+			<apn value="internet.tigo.sv" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="706" mnc="10"/>
-			<apn value="internet.ideasclaro">
+			<apn value="internet.ideasclaro" type="internet" plan="postpaid">
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -6392,7 +6392,7 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="634" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -6403,7 +6403,7 @@ conceived.
 		<name>AIS</name>
 		<gsm>
 			<network-id mcc="520" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>202.183.255.20</dns>
 				<dns>202.183.255.21</dns>
 			</apn>
@@ -6413,7 +6413,7 @@ conceived.
 		<name>DTAC</name>
 		<gsm>
 			<network-id mcc="520" mnc="18"/>
-			<apn value="www.dtac.co.th">
+			<apn value="www.dtac.co.th" type="internet" plan="postpaid">
 				<dns>202.44.202.2</dns>
 				<dns>203.44.144.33</dns>
 			</apn>
@@ -6423,7 +6423,7 @@ conceived.
 		<name>True Move</name>
 		<gsm>
 			<network-id mcc="520" mnc="99"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>true</username>
 				<password>true</password>
 			</apn>
@@ -6433,7 +6433,7 @@ conceived.
 		<name>TOT 3G</name>
 		<gsm>
 			<network-id mcc="520" mnc="15"/>
-			<apn value="internet" />
+			<apn value="internet" type="internet" plan="postpaid" />
 		</gsm>
 	</provider>
 </country>
@@ -6444,10 +6444,10 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="605" mnc="01"/>
-			<apn value="keygp" type="prepaid">
+			<apn value="keygp" type="internet" plan="prepaid">
 				<name>Internet Everywhere Prepaid</name>
 			</apn>
-			<apn value="keypro">
+			<apn value="keypro" type="internet" plan="postpaid">
 				<name>Internet Everywhere Professional</name>
 			</apn>
 		</gsm>
@@ -6461,12 +6461,12 @@ conceived.
 		<gsm>
 			<network-id mcc="286" mnc="03"/>
 			<network-id mcc="286" mnc="04"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>212.156.4.4</dns>
 				<dns>212.156.4.20</dns>
 			</apn>
 
-			<apn value="aycell">
+			<apn value="aycell" type="internet" plan="postpaid">
 				<name>(former Aycell)</name>
 				<dns>212.156.4.1</dns>
 				<dns>212.156.4.4</dns>
@@ -6477,7 +6477,7 @@ conceived.
 		<name>Turkcell</name>
 		<gsm>
 			<network-id mcc="286" mnc="01"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>gprs</username>
 				<password>gprs</password>
 				<dns>86.108.136.27</dns>
@@ -6489,22 +6489,22 @@ conceived.
 		<name>Vodafone / KKTC Telsim</name>
 		<gsm>
 			<network-id mcc="286" mnc="02"/><!-- mnc="0251" in Vodofone XML -->
-			<apn value="edje.kktctelsim.com">
+			<apn value="edje.kktctelsim.com" type="internet" plan="postpaid">
 				<name>Faturali / Kontorlu</name>
 			</apn>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>KKTC Telsim</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="telsim">
+			<apn value="telsim" type="internet" plan="postpaid">
 				<name>Postpaid</name>
 				<username>telsim</username>
 				<password>telsim</password>
 				<dns>212.65.128.20</dns>
 				<dns>212.156.4.7</dns>
 			</apn>
-			<apn value="prepaidgprs" type="prepaid">
+			<apn value="prepaidgprs" type="internet" plan="prepaid">
 				<name>Prepaid</name>
 				<dns>212.65.128.20</dns>
 				<dns>212.156.4.7</dns>
@@ -6519,7 +6519,7 @@ conceived.
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="374" mnc="13"/>
-			<apn value="wap.digiceltt.com">
+			<apn value="wap.digiceltt.com" type="internet" plan="postpaid">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -6529,7 +6529,7 @@ conceived.
 		<name>bmobile / TSTT</name>
 		<gsm>
 			<network-id mcc="374" mnc="12"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -6545,9 +6545,9 @@ conceived.
 		<gsm>
 			<network-id mcc="466" mnc="92"/>
 			<!-- http://www.nav4all.com/site2/www.nav4all.com/enguk/gprs_settings_taiwan_chunghwatelekom_nav4all.php?m=F3 -->
-			<apn value="emome"/>
+			<apn value="emome" type="internet" plan="postpaid"/>
 			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 lists username/pass = web. Others list empty -->
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6555,7 +6555,7 @@ conceived.
 		<name xml:lang="zh">é? å?³é?»ä¿¡ / å??ä¿¡é?»è¨?</name>
 		<gsm>
 			<network-id mcc="466" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6563,7 +6563,7 @@ conceived.
 		<name xml:lang="zh">å?°æ¹¾å¤§å?¥å¤§</name>
 		<gsm>
 			<network-id mcc="466" mnc="99"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6571,7 +6571,7 @@ conceived.
 		<name xml:lang="zh">æ³?äº?é?»ä¿¡</name>
 		<gsm>
 			<network-id mcc="466" mnc="97"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6579,7 +6579,7 @@ conceived.
 		<name xml:lang="zh">å¨?å¯¶é?»ä¿¡ (Vibo) / é??æ?¦é?»ä¿¡ (Aurora)</name>
 		<gsm>
 			<network-id mcc="466" mnc="89"/>
-			<apn value="vibo"/>
+			<apn value="vibo" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6595,21 +6595,21 @@ conceived.
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="640" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="640" mnc="04"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Zantel</name>
 		<gsm>
 			<network-id mcc="640" mnc="03"/>
-			<apn value="znet"/>
+			<apn value="znet" type="internet" plan="postpaid"/>
 		</gsm>
 		<cdma>
 			<username>@zantel.com</username>
@@ -6638,15 +6638,15 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="03"/>
 
-			<apn value="www.ab.kyivstar.net">
+			<apn value="www.ab.kyivstar.net" type="internet" plan="postpaid">
 				<name>Ace&amp;Base</name>
 				<username>igprs</username>
 				<password>internet</password>
 			</apn>
-			<apn value="www.kyivstar.net">
+			<apn value="www.kyivstar.net" type="internet" plan="postpaid">
 				<name>Contract GPRS</name>
 			</apn>
-			<apn value="3g.kyivstar.net">
+			<apn value="3g.kyivstar.net" type="internet" plan="postpaid">
 				<name>Internet 3G</name>
 			</apn>
 		</gsm>
@@ -6656,13 +6656,13 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="03"/>
 
-			<apn value="www.djuice.com.ua">
+			<apn value="www.djuice.com.ua" type="internet" plan="postpaid">
 				<name>Internet GPRS</name>
 			</apn>
-			<apn value="xl.kyivstar.net">
+			<apn value="xl.kyivstar.net" type="internet" plan="postpaid">
 				<name>Internet XL</name>
 			</apn>
-			<apn value="3g.kyivstar.net">
+			<apn value="3g.kyivstar.net" type="internet" plan="postpaid">
 				<name>Internet 3G</name>
 			</apn>
 		</gsm>
@@ -6672,12 +6672,12 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="06"/>
 
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>Standard</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
-			<apn value="speed">
+			<apn value="speed" type="internet" plan="postpaid">
 				<name>Faster</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
@@ -6688,18 +6688,18 @@ conceived.
 		<name>Beeline</name>
 		<gsm>
 			<network-id mcc="255" mnc="02"/>
-			<apn value="internet.beeline.ua"/>
+			<apn value="internet.beeline.ua" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Jeans</name>
 		<gsm>
 			<network-id mcc="255" mnc="01"/>
-			<apn value="www.jeans.ua">
+			<apn value="www.jeans.ua" type="internet" plan="postpaid">
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
 			</apn>
-			<apn value="hyper.net">
+			<apn value="hyper.net" type="internet" plan="postpaid">
 				<name>Hyper.NET</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
@@ -6711,19 +6711,19 @@ conceived.
 		<gsm>
 			<network-id mcc="255" mnc="01"/>
 
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<name>GPRS Internet</name>
 				<username>internet</username>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
-			<apn value="hyper.net">
+			<apn value="hyper.net" type="internet" plan="postpaid">
 				<name>Hyper.NET</name>
 			</apn>
-			<apn value="active">
+			<apn value="active" type="internet" plan="postpaid">
 				<name>HyperActive</name>
 			</apn>
-			<apn value="www.umc.ua">
+			<apn value="www.umc.ua" type="internet" plan="postpaid">
 				<name>umc.ua</name>
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
@@ -6740,7 +6740,7 @@ conceived.
 		<name>Utel</name>
 		<gsm>
 			<network-id mcc="255" mnc="07"/>
-			<apn value="3g.utel.ua"/>
+			<apn value="3g.utel.ua" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -6770,7 +6770,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="641" mnc="10"/>
-			<apn value="yellopix.mtn.co.ug">
+			<apn value="yellopix.mtn.co.ug" type="internet" plan="postpaid">
 				<dns>193.108.252.50</dns>
 				<dns>193.108.252.51</dns>
 			</apn>
@@ -6780,17 +6780,17 @@ conceived.
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="641" mnc="14"/>
-			<apn value="orange.ug"/>
+			<apn value="orange.ug" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
     <provider>
 		<name>UTL</name>
 		<gsm>
 			<network-id mcc="641" mnc="11"/>
-			<apn value="utbroadband">
+			<apn value="utbroadband" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 			</apn>
-			<apn value="utweb">
+			<apn value="utweb" type="internet" plan="postpaid">
 				<name>Mobile Internet</name>
 			</apn>
 		</gsm>
@@ -6800,14 +6800,14 @@ conceived.
 		<gsm>
 			<network-id mcc="641" mnc="22"/>
 			<!-- http://www.waridtel.co.ug/gprs.php -->
-			<apn value="web.waridtel.co.ug"/>
+			<apn value="web.waridtel.co.ug" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
     <provider>
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="641" mnc="01"/>
-			<apn value="web.ug.zain.com"/>
+			<apn value="web.ug.zain.com" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -6824,13 +6824,13 @@ conceived.
 			<network-id mcc="310" mnc="560"/>
 			<network-id mcc="310" mnc="680"/>
 			<!-- http://www.wireless.att.com/answer-center/main.jsp?solutionId=35078&t=solutionTab -->
-			<apn value="wap.cingular">
+			<apn value="wap.cingular" type="internet" plan="postpaid">
 				<name>MEdia Net (phones)</name>
 			</apn>
-			<apn value="Broadband">
+			<apn value="Broadband" type="internet" plan="postpaid">
 				<name>LaptopConnect (data cards)</name>
 			</apn>
-			<apn value="isp.cingular">
+			<apn value="isp.cingular" type="internet" plan="postpaid">
 				<name>Data Connect (old)</name>
 			</apn>
 		</gsm>
@@ -6853,16 +6853,16 @@ conceived.
 			<network-id mcc="310" mnc="660"/>
 			<network-id mcc="310" mnc="800"/>
 
-			<apn value="epc.tmobile.com">
+			<apn value="epc.tmobile.com" type="internet" plan="postpaid">
 				<name>Internet/WebConnect</name>
 			</apn>
-			<apn value="wap.voicestream.com">
+			<apn value="wap.voicestream.com" type="internet" plan="postpaid">
 				<name>Web2Go/t-zones</name>
 			</apn>
-			<apn value="internet2.voicestream.com">
+			<apn value="internet2.voicestream.com" type="internet" plan="postpaid">
 				<name>Internet (old)</name>
 			</apn>
-			<apn value="internet3.voicestream.com">
+			<apn value="internet3.voicestream.com" type="internet" plan="postpaid">
 				<name>Internet with VPN (old)</name>
 			</apn>
 		</gsm>
@@ -6871,7 +6871,7 @@ conceived.
 		<name>Cincinnati Bell Wireless</name>
 		<gsm>
 			<network-id mcc="310" mnc="420"/>
-			<apn value="wap.gocbw.com">
+			<apn value="wap.gocbw.com" type="internet" plan="postpaid">
 				<username>cbw</username>
 			</apn>
 		</gsm>
@@ -7516,14 +7516,14 @@ conceived.
 		<name>BendBroadband</name>
 		<gsm>
 			<network-id mcc="311" mnc="570"/>
-			<apn value="ISP"/>
+			<apn value="ISP" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MTPCS (Cellular One)</name>
 		<gsm>
 			<network-id mcc="310" mnc="570"/>
-			<apn value="wapgw.chinookwireless.net"/>
+			<apn value="wapgw.chinookwireless.net" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -7541,17 +7541,17 @@ conceived.
 		<gsm>
 			<network-id mcc="748" mnc="00"/>
 			<network-id mcc="748" mnc="01"/>
-			<apn value="adslmovil">
+			<apn value="adslmovil" type="internet" plan="postpaid">
 				<name>ADSL MÃ³vil</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
 			</apn>
-			<apn value="prepago.ancel" type="prepaid">
+			<apn value="prepago.ancel" type="internet" plan="prepaid">
 				<name>ADSL MÃ³vil Prepago</name>
 				<username>BAM</username>
 				<password>BAM</password>
 			</apn>
-			<apn value="gprs.ancel">
+			<apn value="gprs.ancel" type="internet" plan="postpaid">
 				<name>GPRS</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
@@ -7562,12 +7562,12 @@ conceived.
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="748" mnc="10"/>
-			<apn value="gprs.claro.com.uy">
+			<apn value="gprs.claro.com.uy" type="internet" plan="postpaid">
 				<name>3G Internet</name>
 				<username>ctigprs</username>
 				<password>ctigprs999</password>
 			</apn>
-			<apn value="internet.ctimovil.com.uy">
+			<apn value="internet.ctimovil.com.uy" type="internet" plan="postpaid">
 				<name>2G Internet</name>
 				<username>ctiweb</username>
 				<password>ctiweb999</password>
@@ -7578,12 +7578,12 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="748" mnc="07"/>
-			<apn value="apnumt.movistar.com.uy">
+			<apn value="apnumt.movistar.com.uy" type="internet" plan="postpaid">
 				<name>3G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
-			<apn value="webapn.movistar.com.uy">
+			<apn value="webapn.movistar.com.uy" type="internet" plan="postpaid">
 				<name>2G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
@@ -7598,7 +7598,7 @@ conceived.
 		<name>Uzdunrobita / MTS</name>
 		<gsm>
 			<network-id mcc="434" mnc="07"/>
-			<apn value="net.urd.uz">
+			<apn value="net.urd.uz" type="internet" plan="postpaid">
 				<username>user</username>
 				<password>pass</password>
 			</apn>
@@ -7612,7 +7612,7 @@ conceived.
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="360" mnc="070"/>
-			<apn value="wap.digiceloecs.com">
+			<apn value="wap.digiceloecs.com" type="internet" plan="postpaid">
 				<username>wapoecs</username>
 				<password>wap03oecs</password>
 			</apn>
@@ -7628,7 +7628,7 @@ conceived.
 			<network-id mcc="734" mnc="01"/>
 			<network-id mcc="734" mnc="02"/>
 			<network-id mcc="734" mnc="03"/>
-			<apn value="gprsweb.digitel.ve">
+			<apn value="gprsweb.digitel.ve" type="internet" plan="postpaid">
 				<dns>57.67.127.195</dns>
 			</apn>
 		</gsm>
@@ -7637,7 +7637,7 @@ conceived.
 		<name>Movilnet</name>
 		<gsm>
 			<network-id mcc="734" mnc="06"/>
-			<apn value="int.movilnet.com.ve">
+			<apn value="int.movilnet.com.ve" type="internet" plan="postpaid">
 				<dns>200.44.32.12</dns>
 				<dns>200.11.248.12</dns>
 			</apn>
@@ -7647,7 +7647,7 @@ conceived.
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="734" mnc="04"/>
-			<apn value="internet.movistar.ve">
+			<apn value="internet.movistar.ve" type="internet" plan="postpaid">
 				<dns>200.35.65.3</dns>
 				<dns>200.35.65.4</dns>
 			</apn>
@@ -7661,7 +7661,7 @@ conceived.
 		<name>MobiFone</name>
 		<gsm>
 			<network-id mcc="452" mnc="01"/>
-			<apn value="m-wap">
+			<apn value="m-wap" type="internet" plan="postpaid">
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
@@ -7671,12 +7671,12 @@ conceived.
 		<name>Vinaphone</name>
 		<gsm>
 			<network-id mcc="452" mnc="02"/>
-			<apn value="m3-world">
+			<apn value="m3-world" type="internet" plan="postpaid">
 				<name>Mobile Internet</name>
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
-			<apn value="m3-card">
+			<apn value="m3-card" type="internet" plan="postpaid">
 				<name>Mobile Broadband</name>
 				<username>mms</username>
 				<password>mms</password>
@@ -7698,10 +7698,10 @@ conceived.
 		<name>Viettel Mobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="04"/>
-			<apn value="v-internet">
+			<apn value="v-internet" type="internet" plan="postpaid">
 				<name>Mobile Internet</name>
 			</apn>
-			<apn value="e-connect">
+			<apn value="e-connect" type="internet" plan="postpaid">
 				<name>D-com 3G</name>
 			</apn>
 		</gsm>
@@ -7710,14 +7710,14 @@ conceived.
 		<name>Vietnamobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>EVNTelecom/E-Mobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="08"/>
-			<apn value="e-internet">
+			<apn value="e-internet" type="internet" plan="postpaid">
 				<name>EVNTelecomNet</name>
 			</apn>
 		</gsm>
@@ -7730,7 +7730,7 @@ conceived.
 		<name>Beeline VN</name>
 		<gsm>
 			<network-id mcc="452" mnc="07"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
@@ -7741,7 +7741,7 @@ conceived.
 		<name>Cell-c</name>
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -7751,7 +7751,7 @@ conceived.
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="655" mnc="10"/>
-			<apn value="internet">
+			<apn value="internet" type="internet" plan="postpaid">
 				<dns>196.11.240.241</dns>
 				<dns>209.212.97.1</dns>
 			</apn>
@@ -7761,8 +7761,8 @@ conceived.
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="655" mnc="01"/>
-			<apn value="internet"/>
-			<apn value="unrestricted">
+			<apn value="internet" type="internet" plan="postpaid"/>
+			<apn value="unrestricted" type="internet" plan="postpaid">
 				<name>Unrestricted</name>
 				<dns>196.207.32.69</dns>
 				<dns>196.43.45.190</dns>
@@ -7773,7 +7773,7 @@ conceived.
 		<name>Virgin Mobile</name>
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
-			<apn value="vdata">
+			<apn value="vdata" type="internet" plan="postpaid">
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -7783,7 +7783,7 @@ conceived.
 		<name>8.ta</name>
 		<gsm>
 			<network-id mcc="655" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet" type="internet" plan="postpaid"/>
 		</gsm>
 	</provider>
 </country>
-- 
1.7.1
References:
- [PATCHv2 0/6] APN type and plan attributes for automatic provisioning
  - From: Oleg Zhurakivskyy
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]