Merge "Add MMSC settings for Aliv." into main
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 86cfafc..54d41e8 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -242,7 +242,7 @@
       mnc="01"
       apn="hos"
       mmsc="http://mmsc.cosmote.gr"
-      mmsproxy="010.010.010.020"
+      mmsproxy="10.10.10.20"
       mmsport="8080"
       type="mms"
       network_type_bitmask="18"
@@ -2727,15 +2727,6 @@
       user_visible="false"
   />
 
-  <apn carrier="Republica Movil Internet"
-      mcc="214"
-      mnc="03"
-      apn="orangeworld"
-      type="default,ia,supl,dun"
-      mvno_match_data="Republica Movil"
-      mvno_type="spn"
-  />
-
  <apn carrier="diainternet"
       mcc="214"
       mnc="03"
@@ -3240,6 +3231,16 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="DIGI Spain IMS"
+      carrier_id="2442"
+      mcc="214"
+      mnc="22"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Lycamobile"
       mcc="214"
       mnc="25"
@@ -4127,6 +4128,16 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="DIGI Italy IMS"
+      carrier_id="2443"
+      mcc="222"
+      mnc="36"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Iliad"
       carrier_id = "2124"
       mcc="222"
@@ -5084,7 +5095,7 @@
       apn="mmsaut"
       authtype="1"
       mmsc="http://mmsaut.at/send"
-      mmsproxy="212.095.031.050"
+      mmsproxy="212.95.31.50"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
@@ -8739,6 +8750,7 @@
       mnc="03"
       apn="hos"
       type="xcap"
+      protocol="IPV4V6"
       user_visible="false"
   />
 
@@ -9975,8 +9987,8 @@
       mnc="03"
       apn="IMS"
       type="ims"
-      protocol="IPV6"
-      roaming_protocol="IPV6"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       user_visible="false"
   />
 
@@ -31371,17 +31383,6 @@
       mmsport="3130"
   />
 
-  <apn carrier="YemenMobile"
-      carrier_id = "2349"
-      mcc="421"
-      mnc="03"
-      apn="ymobile"
-      user="ymobile"
-      password="ymobile"
-      authtype="3"
-      type="default,ia,supl"
-  />
-
   <apn carrier="HiTS-UNITEL"
       carrier_id = "2168"
       mcc="421"
@@ -31404,7 +31405,7 @@
       carrier_id = "2349"
       mcc="421"
       mnc="11"
-      apn="ymims"
+      apn="ims"
       authtype="0"
       type="ims"
       protocol="IPV4V6"
@@ -32331,6 +32332,18 @@
       roaming_protocol="IP"
   />
 
+  <apn carrier="TONE mobile"
+      mcc="440"
+      mnc="10"
+      apn="tone.ne.jp"
+      type="default"
+      user="tone"
+      password="tone"
+      authtype="2"
+      mvno_type="spn"
+      mvno_match_data="docomo"
+  />
+
   <apn carrier="楽天(rakuten.jp)"
       carrier_id="2429"
       mcc="440"
@@ -35480,8 +35493,10 @@
   <apn carrier="Lebara Internet"
       mcc="505"
       mnc="03"
-      apn="purtona.net"
+      apn="live.vodafone.com"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="01"
       mvno_type="gid"
   />
@@ -35489,11 +35504,24 @@
   <apn carrier="Lebara MMS"
       mcc="505"
       mnc="03"
-      apn="purtona.wap"
-      mmsc="http://purtona.mms/mmssend"
-      mmsproxy="10.202.2.20"
+      apn="HOS"
+      type="mms,xcap"
+      mmsc="http://pxt.vodafone.net.au/pxtsend"
+      mmsproxy="10.202.2.60"
       mmsport="8080"
-      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="01"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Lebara IMS"
+      mcc="505"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="01"
       mvno_type="gid"
   />
@@ -41396,6 +41424,13 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Telekom"
+      mcc="901"
+      mnc="40"
+      apn="internet.m2mportal.de"
+      type="default"
+  />
+
   <apn carrier="EMnify"
       mcc="901"
       mnc="43"