Changeset 2169

Timestamp:

19/09/12 15:24:45 (8 months ago)

Author:

matthijs

Message:

luci: Support channel 12 and 13 on 2.0n.

Before, only channels 1-11 were offered, regardless of the country
configured.

Now, the country selected is used to select either regulatory domain 0,
the safe default which offers only 1-11, or regdomain 1, which also
offers channels 12 and 13. The country to regdomain mapping is taken
from the SIMPL firmware (nyu.js). This has the side effect effect that
the country list subtly changed, but that shouldn't really be a problem.

Additionally, the regdomain is also passed along to the wifi driver. The
wifi driver does not automatically select the right regdomain based on
the country code passed, so the wifi driver needs this explicit
regdomain setting to allow using channel 12 and 13. This has the added
effect that these channels can now be autoselected when the channel is
set to "auto" and that these channels can be used in wifi client mode.

Furthermore, the structure of the country list was changed, so that it
no longer needs to be sorted after loading it. This should improve the
load time of the wireless settings page in the WebGUI.

Closes: #648

Location:

trunk

Files:

• fon/fonbase/files/lib/fon/config.sh (modified) (1 diff)
• fon/ra_wifi/files/lib/wifi/rt3052.sh (modified) (2 diffs)
• luci/modules/admin-fon/luasrc/model/cbi/fon_wifi/main.lua (modified) (2 diffs)
• luci/modules/admin-fon/root/etc/3166en.db.lua (modified) (1 diff)

trunk/fon/fonbase/files/lib/fon/config.sh

@@ -356 +356 @@
                         config_get ht advanced ht
                         config_get country advanced country
+                        # Lookup the regdomain for the country
+                        regdom=$(echo "for i, v in ipairs(loadfile('/etc/3166en.db.lua')()) do if v[1] == '$country' then print(v[3]) end end" | lua)
                         uci_set "wireless" "$wifi_device" "type" "rt3052"
                         uci_set "wireless" "$wifi_device" "ht" "${ht:-40}"
                         uci_set "wireless" "$wifi_device" "country" "${country:-ES}"
+                        uci_set "wireless" "$wifi_device" "regdom" "${regdom:-0}"
                         uci_set "wireless" "$wifi_device" "mode" "$mode"
                         local wifi_switch=`cat /proc/gpio_switch`

trunk/fon/ra_wifi/files/lib/wifi/rt3052.sh

@@ -9 +9 @@
         config_get ht $device ht
         config_get country $device country
+        config_get regdom $device regdom
         ssid2=`uci get fon.public.essid`
         [ ! -z "$ssid2" ] && ssid2="FON_$ssid2"
@@ -26 +27 @@
 #The word of "Default" must not be removed
 Default
-CountryRegion=0
+CountryRegion=${regdom}
 CountryRegionABand=7
 CountryCode=${country:-ES}

trunk/luci/modules/admin-fon/luasrc/model/cbi/fon_wifi/main.lua

@@ -84 +84 @@
 -- point signals, so don't offer channel selection in wifi mode.
 if wanmode ~= "wifi" and wanmode ~= "wifi-bridge" then
-        c = s:option(ListValue, "channel", translate("wifi_channel", "Channel"))
-        c:value("auto", translate("wifi_automatic", "Automatic"))
+        channels = s:option(ListValue, "channel", translate("wifi_channel", "Channel"))
+        channels:value("auto", translate("wifi_automatic", "Automatic"))
+        -- This adds channels 1-11, which are available everywhere.
+        -- Below, channels 12 and 13 are added for countries where they
+        -- are allowed.
         for i = 1,11 do
-                c:value(i, i)
+                channels:value(i, i)
         end
 end
@@ -108 +111 @@
         -- HT40 mode is only available in n-only mode.
         r:depends("bgmode", "6")
-        local util = require "luci.util"
+end
+
+-- 2.0g does not support channel 12 and 13 due to limitations in the
+-- HAL.
+if device == "fonera20n" and channels then
         local c3166 = loadfile((os.getenv("LUCI_SYSROOT") or "") .. "/etc/3166en.db.lua")()
         c = s:option(ListValue, "country", translate("wifi_country", "Country"))
         c.default = "ES"
-        for cc, cname in util.vspairs(c3166) do
-                c:value(string.upper(cc), cname)
+
+        -- Find out the country selected. Using formvalue makes sure that it's
+        -- not possible to change the country to something not supporting
+        -- channel 12/13 and set the channel to 12 or 13 at the same time.
+        selected_country = c:formvalue(s.section) or c:cfgvalue(s.section)
+        for i, info in ipairs(c3166) do
+                cc, cname, regdom = unpack(info)
+                c:value(cc, cname)
+
+                -- If the currently selected country is in regdomain 1, allow
+                -- channel 12 and 13. We can't add dependencies for this, since
+                -- cbi does not support dependencies for individual values, only
+                -- for options.
+                if selected_country == cc and regdom == 1 then
+                        channels:value(12, 12)
+                        channels:value(13, 13)
+                end
         end
 end
+
 
 p = Template('fon_wifi/wifi_scan_ui')

trunk/luci/modules/admin-fon/root/etc/3166en.db.lua

@@ -1 @@
-return { ["es"] = "SPAIN", ["gs"] = "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS", ["is"] = "ICELAND", ["dk"] = "DENMARK", ["ms"] = "MONTSERRAT", ["ls"] = "LESOTHO", ["cc"] = "COCOS (KEELING) ISLANDS", ["ec"] = "ECUADOR", ["ps"] = "PALESTINIAN TERRITORY, OCCUPIED", ["rs"] = "SERBIA", ["tr"] = "TURKEY", ["pk"] = "PAKISTAN", ["mc"] = "MONACO", ["lc"] = "SAINT LUCIA", ["nc"] = "NEW CALEDONIA", ["fk"] = "FALKLAND ISLANDS (MALVINAS)", ["sc"] = "SEYCHELLES", ["hk"] = "HONG KONG", ["as"] = "AMERICAN SAMOA", ["tc"] = "TURKS AND CAICOS ISLANDS", ["mk"] = "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF", ["bs"] = "BAHAMAS", ["au"] = "AUSTRALIA", ["er"] = "ERITREA", ["fr"] = "FRANCE", ["gr"] = "GREECE", ["hr"] = "CROATIA", ["ir"] = "IRAN, ISLAMIC REPUBLIC OF", ["dj"] = "DJIBOUTI", ["kr"] = "KOREA, REPUBLIC OF", ["bz"] = "BELIZE", ["cz"] = "CZECH REPUBLIC", ["bb"] = "BARBADOS", ["zm"] = "ZAMBIA", ["pr"] = "PUERTO RICO", ["ye"] = "YEMEN", ["eh"] = "WESTERN SAHARA", ["sr"] = "SURINAME", ["sn"] = "SENEGAL", ["pa"] = "PANAMA", ["vg"] = "VIRGIN ISLANDS, BRITISH", ["vn"] = "VIET NAM", ["lb"] = "LEBANON", ["sj"] = "SVALBARD AND JAN MAYEN", ["tj"] = "TAJIKISTAN", ["az"] = "AZERBAIJAN", ["fj"] = "FIJI", ["ml"] = "MALI", ["vu"] = "VANUATU", ["sb"] = "SOLOMON ISLANDS", ["uz"] = "UZBEKISTAN", ["ar"] = "ARGENTINA", ["br"] = "BRAZIL", ["cr"] = "COSTA RICA", ["gq"] = "EQUATORIAL GUINEA", ["ly"] = "LIBYAN ARAB JAMAHIRIYA", ["ky"] = "CAYMAN ISLANDS", ["uy"] = "URUGUAY", ["um"] = "UNITED STATES MINOR OUTLYING ISLANDS", ["py"] = "PARAGUAY", ["ci"] = "TE D'IVOIRE", ["bi"] = "BURUNDI", ["ca"] = "CANADA", ["ba"] = "BOSNIA AND HERZEGOVINA", ["cy"] = "CYPRUS", ["by"] = "BELARUS", ["ga"] = "GABON", ["us"] = "UNITED STATES", ["gy"] = "GUYANA", ["gb"] = "UNITED KINGDOM", ["ae"] = "UNITED ARAB EMIRATES", ["ua"] = "UKRAINE", ["ug"] = "UGANDA", ["ni"] = "NICARAGUA", ["tv"] = "TUVALU", ["na"] = "NAMIBIA", ["ma"] = "MOROCCO", ["la"] = "LAO PEOPLE'S DEMOCRATIC REPUBLIC", ["sa"] = "SAUDI ARABIA", ["tm"] = "TURKMENISTAN", ["gi"] = "GIBRALTAR", ["fi"] = "FINLAND", ["tn"] = "TUNISIA", ["va"] = "HOLY SEE (VATICAN CITY STATE)", ["aq"] = "ANTARCTICA", ["tt"] = "TRINIDAD AND TOBAGO", ["to"] = "TONGA", ["gp"] = "GUADELOUPE", ["tk"] = "TOKELAU", ["tg"] = "TOGO", ["jp"] = "JAPAN", ["kp"] = "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF", ["bh"] = "BAHRAIN", ["ch"] = "SWITZERLAND", ["np"] = "NEPAL", ["it"] = "ITALY", ["lk"] = "SRI LANKA", ["cx"] = "CHRISTMAS ISLAND", ["tz"] = "TANZANIA, UNITED REPUBLIC OF", ["tw"] = "TAIWAN, PROVINCE OF CHINA", ["sy"] = "SYRIAN ARAB REPUBLIC", ["se"] = "SWEDEN", ["ph"] = "PHILIPPINES", ["sz"] = "SWAZILAND", ["ws"] = "SAMOA", ["sd"] = "SUDAN", ["th"] = "THAILAND", ["ax"] = "LAND ISLANDS", ["za"] = "SOUTH AFRICA", ["sh"] = "SAINT HELENA", ["so"] = "SOMALIA", ["si"] = "SLOVENIA", ["sk"] = "SLOVAKIA", ["gh"] = "GHANA", ["sg"] = "SINGAPORE", ["mh"] = "MARSHALL ISLANDS", ["sl"] = "SIERRA LEONE", ["kh"] = "CAMBODIA", ["bo"] = "BOLIVIA", ["gw"] = "GUINEA-BISSAU", ["do"] = "DOMINICAN REPUBLIC", ["co"] = "COLOMBIA", ["wf"] = "WALLIS AND FUTUNA", ["mt"] = "MALTA", ["sm"] = "SAN MARINO", ["vc"] = "SAINT VINCENT AND THE GRENADINES", ["pw"] = "PALAU", ["cg"] = "CONGO", ["rw"] = "RWANDA", ["eg"] = "EGYPT", ["pm"] = "SAINT PIERRE AND MIQUELON", ["kw"] = "KUWAIT", ["bg"] = "BULGARIA", ["ag"] = "ANTIGUA AND BARBUDA", ["ro"] = "ROMANIA", ["kg"] = "KYRGYZSTAN", ["ng"] = "NIGERIA", ["mg"] = "MADAGASCAR", ["sv"] = "EL SALVADOR", ["gg"] = "GUERNSEY", ["nu"] = "NIUE", ["nr"] = "NAURU", ["jo"] = "JORDAN", ["io"] = "BRITISH INDIAN OCEAN TERRITORY", ["bw"] = "BOTSWANA", ["aw"] = "ARUBA", ["fo"] = "FAROE ISLANDS", ["bl"] = "LEMY", ["kz"] = "KAZAKHSTAN", ["re"] = "REUNION", ["an"] = "NETHERLANDS ANTILLES", ["bn"] = "BRUNEI DARUSSALAM", ["cn"] = "CHINA", ["qa"] = "QATAR", ["cv"] = "CAPE VERDE", ["ki"] = "KIRIBATI", ["ai"] = "ANGUILLA", ["am"] = "ARMENIA", ["cf"] = "CENTRAL AFRICAN REPUBLIC", ["pe"] = "PERU", ["pg"] = "PAPUA NEW GUINEA", ["vi"] = "VIRGIN ISLANDS, U.S.", ["om"] = "OMAN", ["lv"] = "LATVIA", ["af"] = "AFGHANISTAN", ["bf"] = "BURKINA FASO", ["no"] = "NORWAY", ["mp"] = "NORTHERN MARIANA ISLANDS", ["mf"] = "SAINT MARTIN", ["nf"] = "NORFOLK ISLAND", ["gf"] = "FRENCH GUIANA", ["ne"] = "NIGER", ["nz"] = "NEW ZEALAND", ["pn"] = "PITCAIRN", ["in"] = "INDIA", ["tf"] = "FRENCH SOUTHERN TERRITORIES", ["kn"] = "SAINT KITTS AND NEVIS", ["bv"] = "BOUVET ISLAND", ["mm"] = "MYANMAR", ["pf"] = "FRENCH POLYNESIA", ["gn"] = "GUINEA", ["hn"] = "HONDURAS", ["dm"] = "DOMINICA", ["cm"] = "CAMEROON", ["bm"] = "BERMUDA", ["gu"] = "GUAM", ["mz"] = "MOZAMBIQUE", ["mr"] = "MAURITANIA", ["mn"] = "MONGOLIA", ["cu"] = "CUBA", ["ru"] = "RUSSIAN FEDERATION", ["ee"] = "ESTONIA", ["de"] = "GERMANY", ["mv"] = "MALDIVES", ["be"] = "BELGIUM", ["mu"] = "MAURITIUS", ["lu"] = "LUXEMBOURG", ["mx"] = "MEXICO", ["yt"] = "MAYOTTE", ["me"] = "MONTENEGRO", ["mq"] = "MARTINIQUE", ["ke"] = "KENYA", ["je"] = "JERSEY", ["ie"] = "IRELAND", ["st"] = "SAO TOME AND PRINCIPE", ["ge"] = "GEORGIA", ["ve"] = "VENEZUELA", ["km"] = "COMOROS", ["jm"] = "JAMAICA", ["im"] = "ISLE OF MAN", ["hm"] = "HEARD ISLAND AND MCDONALD ISLANDS", ["gm"] = "GAMBIA", ["fm"] = "MICRONESIA, FEDERATED STATES OF", ["my"] = "MALAYSIA", ["cl"] = "CHILE", ["mw"] = "MALAWI", ["al"] = "ALBANIA", ["ht"] = "HAITI", ["et"] = "ETHIOPIA", ["mo"] = "MACAO", ["ao"] = "ANGOLA", ["ck"] = "COOK ISLANDS", ["li"] = "LIECHTENSTEIN", ["lr"] = "LIBERIA", ["cd"] = "CONGO, THE DEMOCRATIC REPUBLIC OF THE", ["pt"] = "PORTUGAL", ["ad"] = "ANDORRA", ["bd"] = "BANGLADESH", ["dz"] = "ALGERIA", ["lt"] = "LITHUANIA", ["md"] = "MOLDOVA, REPUBLIC OF", ["tl"] = "TIMOR-LESTE", ["zw"] = "ZIMBABWE", ["iq"] = "IRAQ", ["id"] = "INDONESIA", ["pl"] = "POLAND", ["gd"] = "GRENADA", ["nl"] = "NETHERLANDS", ["at"] = "AUSTRIA", ["bt"] = "BHUTAN", ["il"] = "ISRAEL", ["td"] = "CHAD", ["gl"] = "GREENLAND", ["hu"] = "HUNGARY", ["bj"] = "BENIN", ["gt"] = "GUATEMALA" }
+-- Returns country code -> {name, regdomain}
+-- Regdomain is 0 for the default, limited domain and 1 for the
+-- regdomain supporting wifi channel 12 and 13.
+return {
+        {"AF", "AFGHANISTAN", 0},
+        {"AL", "ALBANIA", 1},
+        {"DZ", "ALGERIA", 1},
+        {"AS", "AMERICAN SAMOA", 0},
+        {"AD", "ANDORRA", 0},
+        {"AO", "ANGOLA", 0},
+        {"AI", "ANGUILLA", 0},
+        {"AQ", "ANTARCTICA", 0},
+        {"AG", "ANTIGUA/BARBUDA", 0},
+        {"AR", "ARGENTINA", 1},
+        {"AM", "ARMENIA", 1},
+        {"AW", "ARUBA", 0},
+        {"AU", "AUSTRALIA", 1},
+        {"AT", "AUSTRIA", 1},
+        {"AZ", "AZERBAIJAN", 1},
+        {"BS", "BAHAMAS", 0},
+        {"BH", "BAHRAIN", 1},
+        {"BD", "BANGLADESH", 0},
+        {"BB", "BARBADOS", 0},
+        {"BY", "BELARUS", 1},
+        {"BE", "BELGIUM", 1},
+        {"BZ", "BELIZE", 1},
+        {"BJ", "BENIN", 0},
+        {"BM", "BERMUDA", 0},
+        {"BT", "BHUTAN", 0},
+        {"BO", "BOLIVIA", 1},
+        {"BA", "BOSNIA/HERZEGOVINA", 0},
+        {"BW", "BOTSWANA", 0},
+        {"BV", "BOUVET ISLAND", 0},
+        {"BR", "BRAZIL", 1},
+        {"BG", "BULGARIA", 1},
+        {"BF", "BURKINA FASO", 0},
+        {"BI", "BURUNDI", 0},
+        {"KH", "CAMBODIA", 0},
+        {"CM", "CAMEROON", 0},
+        {"CA", "CANADA", 0},
+        {"CV", "CAPE VERDE", 0},
+        {"KY", "CAYMAN ISLANDS", 0},
+        {"TD", "CHAD", 0},
+        {"CL", "CHILE", 1},
+        {"CN", "CHINA", 1},
+        {"CX", "CHRISTMAS ISLAND", 0},
+        {"CO", "COLOMBIA", 0},
+        {"KM", "COMOROS", 0},
+        {"CG", "CONGO", 0},
+        {"CD", "CONGO", 0},
+        {"CK", "COOK ISLANDS", 0},
+        {"CR", "COSTA RICA", 1},
+        {"HR", "CROATIA", 0},
+        {"CU", "CUBA", 0},
+        {"CY", "CYPRUS", 1},
+        {"CZ", "CZECH REPUBLIC", 1},
+        {"DK", "DENMARK", 1},
+        {"DJ", "DJIBOUTI", 0},
+        {"DM", "DOMINICA", 0},
+        {"DO", "DOMINICAN REPUBLIC", 0},
+        {"EC", "ECUADOR", 1},
+        {"EG", "EGYPT", 1},
+        {"SV", "EL SALVADOR", 1},
+        {"GQ", "EQUATORIAL GUINEA", 0},
+        {"ER", "ERITREA", 0},
+        {"EE", "ESTONIA", 1},
+        {"ET", "ETHIOPIA", 0},
+        {"FO", "FAROE ISLANDS", 0},
+        {"FJ", "FIJI", 0},
+        {"FI", "FINLAND", 1},
+        {"FR", "FRANCE", 1},
+        {"GA", "GABON", 0},
+        {"GM", "GAMBIA", 0},
+        {"GE", "GEORGIA", 1},
+        {"DE", "GERMANY", 1},
+        {"GH", "GHANA", 0},
+        {"GI", "GIBRALTAR", 0},
+        {"GR", "GREECE", 1},
+        {"GL", "GREENLAND", 0},
+        {"GD", "GRENADA", 0},
+        {"GP", "GUADELOUPE", 0},
+        {"GU", "GUAM", 0},
+        {"GT", "GUATEMALA", 0},
+        {"GG", "GUERNSEY", 0},
+        {"GW", "GUINEA-BISSAU", 0},
+        {"GN", "GUINEA", 0},
+        {"GY", "GUYANA", 0},
+        {"HT", "HAITI", 0},
+        {"VA", "VATICAN", 0},
+        {"HN", "HONDURAS", 1},
+        {"HK", "HONG KONG", 0},
+        {"HU", "HUNGARY", 1},
+        {"IS", "ICELAND", 1},
+        {"IN", "INDIA", 1},
+        {"ID", "INDONESIA", 1},
+        {"IR", "IRAN", 1},
+        {"IQ", "IRAQ", 0},
+        {"IE", "IRELAND", 1},
+        {"IM", "ISLE OF MAN", 0},
+        {"IL", "ISRAEL", 1},
+        {"IT", "ITALY", 1},
+        {"JM", "JAMAICA", 0},
+        {"JP", "JAPAN", 1},
+        {"JE", "JERSEY", 0},
+        {"JO", "JORDAN", 1},
+        {"KZ", "KAZAKHSTAN", 1},
+        {"KE", "KENYA", 0},
+        {"KI", "KIRIBATI", 0},
+        {"KW", "KUWAIT", 1},
+        {"KG", "KYRGYZSTAN", 0},
+        {"AX", "LAND ISLANDS", 0},
+        {"LV", "LATVIA", 1},
+        {"LB", "LEBANON", 1},
+        {"BL", "LEMY", 0},
+        {"LS", "LESOTHO", 0},
+        {"LR", "LIBERIA", 0},
+        {"LY", "LIBYA", 0},
+        {"LI", "LIECHTENSTEIN", 1},
+        {"LT", "LITHUANIA", 1},
+        {"LU", "LUXEMBOURG", 1},
+        {"MO", "MACAO", 1},
+        {"MK", "MACEDONIA", 1},
+        {"MG", "MADAGASCAR", 0},
+        {"MW", "MALAWI", 0},
+        {"MY", "MALAYSIA", 1},
+        {"MV", "MALDIVES", 0},
+        {"ML", "MALI", 0},
+        {"MT", "MALTA", 0},
+        {"MH", "MARSHALL ISLANDS", 0},
+        {"MQ", "MARTINIQUE", 0},
+        {"MR", "MAURITANIA", 0},
+        {"MU", "MAURITIUS", 0},
+        {"YT", "MAYOTTE", 0},
+        {"MX", "MEXICO", 0},
+        {"FM", "MICRONESIA", 0},
+        {"MD", "MOLDOVA", 0},
+        {"MC", "MONACO", 1},
+        {"MN", "MONGOLIA", 0},
+        {"ME", "MONTENEGRO", 0},
+        {"MS", "MONTSERRAT", 0},
+        {"MA", "MOROCCO", 0},
+        {"MZ", "MOZAMBIQUE", 0},
+        {"MM", "MYANMAR", 0},
+        {"NA", "NAMIBIA", 1},
+        {"NR", "NAURU", 0},
+        {"NP", "NEPAL", 0},
+        {"NL", "NETHERLANDS", 1},
+        {"NC", "NEW CALEDONIA", 0},
+        {"NZ", "NEW ZEALAND", 1},
+        {"NI", "NICARAGUA", 0},
+        {"NG", "NIGERIA", 0},
+        {"NE", "NIGER", 0},
+        {"NU", "NIUE", 0},
+        {"NF", "NORFOLK ISLAND", 0},
+        {"NO", "NORWAY", 0},
+        {"OM", "OMAN", 1},
+        {"PK", "PAKISTAN", 1},
+        {"PW", "PALAU", 0},
+        {"PS", "PALESTINIA", 0},
+        {"PA", "PANAMA", 0},
+        {"PG", "PAPUA NEW GUINEA", 0},
+        {"PY", "PARAGUAY", 0},
+        {"PE", "PERU", 1},
+        {"PH", "PHILIPPINES", 1},
+        {"PN", "PITCAIRN", 0},
+        {"PL", "POLAND", 1},
+        {"PT", "PORTUGAL", 1},
+        {"PR", "PUERTO RICO", 0},
+        {"QA", "QATAR", 1},
+        {"RE", "REUNION", 0},
+        {"RO", "ROMANIA", 1},
+        {"RU", "RUSSIA", 1},
+        {"RW", "RWANDA", 0},
+        {"WS", "SAMOA", 0},
+        {"SM", "SAN MARINO", 0},
+        {"SA", "SAUDI ARABIA", 1},
+        {"SN", "SENEGAL", 0},
+        {"RS", "SERBIA", 0},
+        {"SC", "SEYCHELLES", 0},
+        {"SL", "SIERRA LEONE", 0},
+        {"SG", "SINGAPORE", 1},
+        {"SK", "SLOVAKIA", 1},
+        {"SI", "SLOVENIA", 1},
+        {"SB", "SOLOMON ISLANDS", 0},
+        {"SO", "SOMALIA", 0},
+        {"ZA", "SOUTH AFRICA", 1},
+        {"ES", "SPAIN", 1},
+        {"LK", "SRI LANKA", 0},
+        {"SD", "SUDAN", 0},
+        {"SR", "SURINAME", 0},
+        {"SZ", "SWAZILAND", 0},
+        {"SE", "SWEDEN", 1},
+        {"CH", "SWITZERLAND", 1},
+        {"TW", "TAIWAN", 0},
+        {"TJ", "TAJIKISTAN", 0},
+        {"TZ", "TANZANIA", 0},
+        {"CI", "TE D'IVOIRE", 0},
+        {"TH", "THAILAND", 1},
+        {"TL", "TIMOR-LESTE", 0},
+        {"TG", "TOGO", 0},
+        {"TK", "TOKELAU", 0},
+        {"TO", "TONGA", 0},
+        {"TN", "TUNISIA", 1},
+        {"TR", "TURKEY", 1},
+        {"TM", "TURKMENISTAN", 0},
+        {"TV", "TUVALU", 0},
+        {"UG", "UGANDA", 0},
+        {"UA", "UKRAINE", 1},
+        {"AE", "UNITED ARAB EMIRATES", 1},
+        {"GB", "UNITED KINGDOM", 1},
+        {"US", "UNITED STATES", 0},
+        {"UY", "URUGUAY", 1},
+        {"UZ", "UZBEKISTAN", 0},
+        {"VU", "VANUATU", 0},
+        {"VE", "VENEZUELA", 1},
+        {"VN", "VIET NAM", 1},
+        {"YE", "YEMEN", 1},
+        {"ZM", "ZAMBIA", 0},
+        {"ZW", "ZIMBABWE", 1}
+}