tunnelmtu 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb39e99dfbd5897b0eaecebc385f68594d586ad9489c7927904879d9bcc614f
-  data.tar.gz: 9105d16c4f10f2afa09ef5eb8dcae4b38c0b539dcc1bf4fda1120aaf2ed1f862
+  metadata.gz: fedd2feeac99317503cdbd9e4aa6b473e21bdd069b1a71e208068db414ef697e
+  data.tar.gz: d2abd866c468188ddd703fb4f67d7172d183bc8a385748f288d70f58c96ff358
 SHA512:
-  metadata.gz: 01dfc6e9f4b84676d21c2fc71db58068f608895c3de631141b45bfdb7e6b1bd5ca8774e23400da2f84e43368f74ee214057120f0af1ac5ab7aab4a1c9fdc4672
-  data.tar.gz: cba995f38a8eef1a03c04bbc025fe3d2f963ff98e8667b31397a5840dafec681be2ea49d7d022d1d217b77fcb9085ff0f465cb766c7b476125ecbb177ffc82e4
+  metadata.gz: a43fb476a7d0c17dbe126f0828f8bbd51ecb6eeda28dcd241c747fad833b3364c67e6045a9a5c6321aef442ef3ef11a2538310916fe7262a61436740d71abe92
+  data.tar.gz: 887d916b22c6533c5d45b037668d86d8fa20dc8aacf360dd52b7f370e480860df60deadb3ac10debebd71ea793a2158d445ec92b3a210b23da75f70e7ce0f70d

data/bin/tunnelmtu

@@ -38,13 +38,14 @@ def ask_openssl_digest
   return digests.find { |d| d[:name] == selected_digest }
 end
 
-def ask_openssl_cipher
+def ask_openssl_cipher(chacha20 = false)
   ciphers = [
     { name: 'AES', iv_size: 16 },
     { name: 'ARIA', iv_size: 16 },
     { name: 'CAMELLIA', iv_size: 16 },
     { name: 'DES', iv_size: 8 }
   ]
+  ciphers << { name: 'CHACHA20', iv_size: 0 } if chacha20
   ciphers_list = ciphers.map { |v| v[:name] }
 
   selected_cipher = CLI::UI.ask('Which cipher algorithm?', options: ciphers_list)
@@ -64,7 +65,7 @@ CLI::UI::StdoutRouter.enable
 CLI::UI.frame_style = :bracket
 
 CLI::UI::Frame.open('Tunneling MTU calculator', color: :cyan) do
-  outer_mtu = CLI::UI.ask('What is the outer MTU?').to_i
+  outer_mtu = CLI::UI.ask('What is the outer MTU?', default: '1500').to_i
   mtu = outer_mtu
   explanations = []
 
@@ -80,7 +81,7 @@ CLI::UI::Frame.open('Tunneling MTU calculator', color: :cyan) do
     end
   end
 
-  CLI::UI.ask('Will PPPoE be used for connection?') do |handler|
+  CLI::UI.ask('Will PPPoE be used for connection?', default: 'No') do |handler|
     handler.option 'Yes' do
       mtu -= 8
       explanations << { bytes: 8, description: 'PPPoE' }
@@ -193,9 +194,21 @@ CLI::UI::Frame.open('Tunneling MTU calculator', color: :cyan) do
           explanations << { bytes: hmac[:size], description: hmac[:name] }
         end
       end
+
+      CLI::UI.ask('Which tunneling mode is used?') do |handler|
+        handler.option 'TUN (layer 3)' do
+          explanations << { bytes: 0, description: 'TUN' }
+        end
+        handler.option 'TAP (layer 2)' do
+          explanations << { bytes: 14, description: 'TAP' }
+        end
+      end
     end
     handler.option('Tinc') do
       CLI::UI.ask('Which Tinc transfer protocol do you use?') do |handler|
+        mtu -= 8
+        explanations << { bytes: 8, description: 'UDP' }
+
         handler.option 'SFTPS (Tinc 1.1)' do
           CLI::UI.ask('Which Tinc protocol version is used?') do |handler|
             handler.option '17.4 or later (IF IN DOUBT, SELECT THIS)' do
@@ -212,24 +225,78 @@ CLI::UI::Frame.open('Tunneling MTU calculator', color: :cyan) do
           explanations << { bytes: 21, description: 'SFTPS' }
         end
         handler.option 'Legacy protocol (Tinc 1.0)' do
-          hmac = ask_openssl_digest
-          mtu -= hmac[:size]
-          explanations << { bytes: hmac[:size], description: hmac[:name] }
-
-          cipher = ask_openssl_cipher
-          mtu -= cipher[:iv_size]
-          explanations << { bytes: cipher[:iv_size], description: cipher[:name] }
+          CLI::UI.ask('Is a non-default MAC length being used?', default: 'No') do |handler|
+            handler.option 'Yes' do
+              mac_length = CLI::UI.ask('What MAC length is used?').to_i
+              mtu -= mac_length
+              explanations << { bytes: mac_length, description: 'MAC' }
+            end
+            handler.option 'No' do
+              mtu -= 4
+              explanations << { bytes: 4, description: 'MAC' }
+            end
+          end
 
           bmtu = mtu
           mtu = get_cbc_mtu mtu, 4
           explanations << { bytes: bmtu - mtu, description: 'Padding' }
 
           explanations << { bytes: 4, description: 'Sequence number' } # subtracted in get_cbc_mtu
+
+          CLI::UI.ask('Which Tinc mode is being used?') do |handler|
+            handler.option 'Router (layer 3)' do
+              explanations << { bytes: 0, description: 'Router mode' }
+            end
+            handler.option 'Switch (layer 2)' do
+              mtu -= 14
+              explanations << { bytes: 14, description: 'Switch mode' }
+            end
+            handler.option 'Hub (layer 2)' do
+              mtu -= 14
+              explanations << { bytes: 14, description: 'Hub mode' }
+            end
+          end
+        end
+      end
+    end
+    handler.option('GRE') do
+      mtu -= 4
+      explanations << { bytes: 4, description: 'GRE' }
+
+      CLI::UI.ask('Which GRE is used?') do |handler|
+        handler.option 'GRE (layer 3)' do
+        end
+        handler.option 'GRETAP (layer 2)' do
+          mtu -= 14
+          explanations << { bytes: 14, description: 'TAP' }
+        end
+      end
+    end
+    handler.option('SIT') do
+      mtu -= 0
+      explanations << { bytes: 0, description: 'SIT' }
+    end
+    handler.option('VXLAN') do
+      mtu -= 8
+      explanations << { bytes: 8, description: 'UDP' }
+      mtu -= 8
+      explanations << { bytes: 8, description: 'VXLAN' }
+    end
+    handler.option('GENEVE') do
+      mtu -= 8
+      explanations << { bytes: 8, description: 'UDP' }
+      mtu -= 8
+      explanations << { bytes: 8, description: 'GENEVE' }
+
+      CLI::UI.ask('Which layer is tunneled via GENEVE?', default: 'Ethernet (layer 2)') do |handler|
+        handler.option 'IP (layer 3)' do
+        end
+        handler.option 'Ethernet (layer 2)' do
+          mtu -= 14
+          explanations << { bytes: 14, description: 'Ethernet' }
         end
       end
     end
-    # handler.option('GRE') { |selection| selection }
-    # handler.option('GRETAP') { |selection| selection }
   end
 
   CLI::UI::Frame.open('Overhead Breakdown', color: :blue) do
@@ -243,7 +310,7 @@ CLI::UI::Frame.open('Tunneling MTU calculator', color: :cyan) do
               else
                 exp[:bytes] > 15 ? 'yellow' : 'green'
               end
-      puts CLI::UI.fmt "  {{v}} {{bold:#{exp[:description]}:}} {{#{color}:-#{exp[:bytes]}}} Bytes"
+      puts CLI::UI.fmt "  {{bold:#{exp[:description]}:}} {{#{color}:-#{exp[:bytes]}}} Bytes"
     end
   end
 
@@ -259,3 +326,4 @@ CLI::UI::Frame.open('Tunneling MTU calculator', color: :cyan) do
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tunnelmtu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Marek Küthe