4 files changed, 36 insertions, 30 deletions

diff --git a/README.md b/README.md
index c1ffead5a..a00423512 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3325.
+This is the source code for early-access 3326.
 
 ## Legal Notice
 
diff --git a/src/yuzu/multiplayer/direct_connect.cpp b/src/yuzu/multiplayer/direct_connect.cpp
index 4ceb33536..680a489b5 100755
--- a/src/yuzu/multiplayer/direct_connect.cpp
+++ b/src/yuzu/multiplayer/direct_connect.cpp
@@ -81,20 +81,13 @@ void DirectConnectWindow::Connect() {
             }

         }

     }

-    switch (static_cast<ConnectionType>(ui->connection_type->currentIndex())) {

-    case ConnectionType::TraversalServer:

-        break;

-    case ConnectionType::IP:

-        if (!ui->ip->hasAcceptableInput()) {

-            NetworkMessage::ErrorManager::ShowError(

-                NetworkMessage::ErrorManager::IP_ADDRESS_NOT_VALID);

-            return;

-        }

-        if (!ui->port->hasAcceptableInput()) {

-            NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::PORT_NOT_VALID);

-            return;

-        }

-        break;

+    if (!ui->ip->hasAcceptableInput()) {

+        NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::IP_ADDRESS_NOT_VALID);

+        return;

+    }

+    if (!ui->port->hasAcceptableInput()) {

+        NetworkMessage::ErrorManager::ShowError(NetworkMessage::ErrorManager::PORT_NOT_VALID);

+        return;

     }

 

     // Store settings

diff --git a/src/yuzu/multiplayer/direct_connect.ui b/src/yuzu/multiplayer/direct_connect.ui
index 6c38a18f9..fa3309ef2 100755
--- a/src/yuzu/multiplayer/direct_connect.ui
+++ b/src/yuzu/multiplayer/direct_connect.ui
@@ -27,19 +27,10 @@
           <number>0</number>

          </property>

          <item>

-          <widget class="QComboBox" name="connection_type">

-           <item>

-            <property name="text">

-             <string>IP Address</string>

-            </property>

-           </item>

-          </widget>

-         </item>

-         <item>

           <widget class="QWidget" name="ip_container" native="true">

            <layout class="QHBoxLayout" name="ip_layout">

             <property name="leftMargin">

-             <number>5</number>

+             <number>0</number>

             </property>

             <property name="topMargin">

              <number>0</number>

@@ -53,14 +44,14 @@
             <item>

              <widget class="QLabel" name="label_2">

               <property name="text">

-               <string>IP</string>

+               <string>Server Address</string>

               </property>

              </widget>

             </item>

             <item>

              <widget class="QLineEdit" name="ip">

               <property name="toolTip">

-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IP address of the host&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Server address of the host&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

               </property>

               <property name="maxLength">

                <number>253</number>

@@ -85,6 +76,18 @@
               <property name="placeholderText">

                <string notr="true" extracomment="placeholder string that tells user default port">24872</string>

               </property>

+              <property name="sizePolicy">

+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">

+                <horstretch>0</horstretch>

+                <verstretch>0</verstretch>

+               </sizepolicy>

+              </property>

+              <property name="maximumSize">

+               <size>

+                  <width>65</width>

+                  <height>50</height>

+               </size>

+              </property>

              </widget>

             </item>

            </layout>

diff --git a/src/yuzu/multiplayer/validation.h b/src/yuzu/multiplayer/validation.h
index 4d48cb78a..611112302 100755
--- a/src/yuzu/multiplayer/validation.h
+++ b/src/yuzu/multiplayer/validation.h
@@ -40,9 +40,19 @@ private:
 

     /// ipv4 / ipv6 / hostnames

     QRegularExpression ip_regex = QRegularExpression(QStringLiteral(

-        "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|"

-        "^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$|"

-        "^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\\.)+[a-zA-Z]{2,}$"));

+            //IPv4 regex

+            "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|"

+            //IPv6 regex

+            "^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|"

+            "(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|"

+            "(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|"

+            "(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|"

+            "(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|"

+            "(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|"

+            "(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|"

+            "(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?$|"

+            // Hostname regex

+            "^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\\.)+[a-zA-Z]{2,}$"));

     QRegularExpressionValidator ip;

 

     /// port must be between 0 and 65535