new IPProtocolSelector implementation.

and do not use pvetextfield/deleteEmpty, because that is no longer
necessary with recent firewall API changes.

diff --git a/www/manager/Makefile b/www/manager/Makefile
index 4874939676ac4709375fdd0c3739c8566c19f928..068400bf4db086fd03beeb3da6c07ea3a5b47a9f 100644 (file)
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -45,6 +45,7 @@ JSSRC=                                                        \
        form/BridgeSelector.js                          \
        form/SecurityGroupSelector.js                   \
        form/IPSetSelector.js                           \
+       form/IPProtocolSelector.js                      \
        form/CPUModelSelector.js                        \
        form/VNCKeyboardSelector.js                     \
        form/LanguageSelector.js                        \

diff --git a/www/manager/form/IPProtocolSelector.js b/www/manager/form/IPProtocolSelector.js
new file mode 100644 (file)
index 0000000..55a95d9
--- /dev/null
+++ b/www/manager/form/IPProtocolSelector.js
@@ -0,0 +1,98 @@
+Ext.define('PVE.form.IPProtocolSelector', {
+    extend: 'PVE.form.ComboGrid',
+    alias: ['widget.pveIPProtocolSelector'],
+
+    initComponent: function() {
+       var me = this;
+       
+       var store = Ext.create('Ext.data.Store', {
+           fields: [ 'p', 'd', 'n'],
+           data: [
+               { p: 'tcp', n: 6, d: 'Transmission Control Protocol' },
+               { p: 'udp', n: 17, d: 'User Datagram Protocol' },
+               { p: 'icmp', n: 1, d: 'Internet Control Message Protocol' },
+               { p: 'igmp', n: 2,  d: 'Internet Group Management' },
+               { p: 'ggp', n: 3, d: 'gateway-gateway protocol' },
+               { p: 'ipencap', n: 4, d: 'IP encapsulated in IP' },
+               { p: 'st', n: 5, d: 'ST datagram mode' },
+               { p: 'egp', n: 8, d: 'exterior gateway protocol' },
+               { p: 'igp', n: 9, d: 'any private interior gateway (Cisco)' },
+               { p: 'pup', n: 12, d: 'PARC universal packet protocol' },
+               { p: 'hmp', n: 20, d: 'host monitoring protocol' },
+               { p: 'xns-idp', n: 22, d: 'Xerox NS IDP' },
+               { p: 'rdp', n: 27, d: '"reliable datagram" protocol' },
+               { p: 'iso-tp4', n: 29, d: 'ISO Transport Protocol class 4 [RFC905]' },
+               { p: 'dccp', n: 33, d: 'Datagram Congestion Control Prot. [RFC4340]' },
+               { p: 'xtp', n: 36, d: 'Xpress Transfer Protocol' },
+               { p: 'ddp', n: 37, d: 'Datagram Delivery Protocol' },
+               { p: 'idpr-cmtp', n: 38, d: 'IDPR Control Message Transport' },
+               { p: 'ipv6', n: 41, d: 'Internet Protocol, version 6' },
+               { p: 'ipv6-route', n: 43, d: 'Routing Header for IPv6' },
+               { p: 'ipv6-frag', n: 44, d: 'Fragment Header for IPv6' },
+               { p: 'idrp', n: 45, d: 'Inter-Domain Routing Protocol' },
+               { p: 'rsvp', n: 46, d: 'Reservation Protocol' },
+               { p: 'gre', n: 47, d: 'General Routing Encapsulation' },
+               { p: 'esp', n: 50, d: 'Encap Security Payload [RFC2406]' },
+               { p: 'ah', n: 51, d: 'Authentication Header [RFC2402]' },
+               { p: 'skip', n: 57, d: 'SKIP' },
+               { p: 'ipv6-icmp', n: 58, d: 'ICMP for IPv6' },
+               { p: 'ipv6-nonxt', n: 59, d: 'No Next Header for IPv6' },
+               { p: 'ipv6-opts', n: 60, d: 'Destination Options for IPv6' },
+               { p: 'vmtp', n: 81, d: 'Versatile Message Transport' },
+               { p: 'eigrp', n: 88, d: 'Enhanced Interior Routing Protocol (Cisco)' },
+               { p: 'ospf', n: 89, d: 'Open Shortest Path First IGP' },
+               { p: 'ax.25', n: 93, d: 'AX.25 frames' },
+               { p: 'ipip', n: 94, d: 'IP-within-IP Encapsulation Protocol' },
+               { p: 'etherip', n: 97, d: 'Ethernet-within-IP Encapsulation [RFC3378]' },
+               { p: 'encap', n: 98, d: 'Yet Another IP encapsulation [RFC1241]' },
+               { p: 'pim', n: 103, d: 'Protocol Independent Multicast' },
+               { p: 'ipcomp', n: 108, d: 'IP Payload Compression Protocol' },
+               { p: 'vrrp', n: 112, d: 'Virtual Router Redundancy Protocol [RFC5798]' },
+               { p: 'l2tp', n: 115, d: 'Layer Two Tunneling Protocol [RFC2661]' },
+               { p: 'isis', n: 124, d: 'IS-IS over IPv4' },
+               { p: 'sctp', n: 132, d: 'Stream Control Transmission Protocol' },
+               { p: 'fc', n: 133, d: 'Fibre Channel' },
+               { p: 'mobility-header', n: 135, d: 'Mobility Support for IPv6 [RFC3775]' },
+               { p: 'udplite', n: 136, d: 'UDP-Lite [RFC3828]' },
+               { p: 'mpls-in-ip', n: 137, d: 'MPLS-in-IP [RFC4023]' },
+               { p: 'hip', n: 139, d: 'Host Identity Protocol' },
+               { p: 'shim6', n: 140, d: 'Shim6 Protocol [RFC5533]' },
+               { p: 'wesp', n: 141, d: 'Wrapped Encapsulating Security Payload' },
+               { p: 'rohc', n: 142, d: 'Robust Header Compression' }
+           ]
+       });
+
+       Ext.apply(me, {
+           store: store,
+           valueField: 'p',
+           displayField: 'p',
+            listConfig: {
+               columns: [
+                   {
+                       header: gettext('Protocol'),
+                       dataIndex: 'p',
+                       hideable: false,
+                       sortable: false,
+                       width: 100
+                   },
+                   {
+                       header: gettext('Number'),
+                       dataIndex: 'n',
+                       hideable: false,
+                       sortable: false,
+                       width: 50
+                   },
+                   {
+                       header: gettext('Description'),
+                       dataIndex: 'd',
+                       hideable: false,
+                       sortable: false,
+                       flex: 1
+                   }
+               ]
+           }
+       });
+
+        me.callParent();
+    }
+});

diff --git a/www/manager/grid/FirewallRules.js b/www/manager/grid/FirewallRules.js
index 15fdd8a3313714668207d97a823e9dfe9dad1f81..e50058559f5c2e93384eac6508cf05da6131c0c2 100644 (file)
--- a/www/manager/grid/FirewallRules.js
+++ b/www/manager/grid/FirewallRules.js
@@ -130,7 +130,6 @@ Ext.define('PVE.FirewallRulePanel', {
                xtype: 'pveFWMacroSelector',
                name: 'macro',
                value: '',
-               deleteEmpty: !me.create,
                fieldLabel: gettext('Macro'),
                allowBlank: true,
                listeners: {
@@ -148,13 +147,10 @@ Ext.define('PVE.FirewallRulePanel', {
                 }
            },
            {
-               xtype: 'pveKVComboBox',
+               xtype: 'pveIPProtocolSelector',
                name: 'proto',
                value: '',
-               deleteEmpty: !me.create,
                emptyText: 'any',
-               editable: true,
-               data: [['tcp', 'TCP'], ['udp', 'UDP'], ['icmp', 'ICMP'], ['igmp', 'IGMP']],
                fieldLabel: gettext('Protocol'),
                allowBlank: true
            },
@@ -165,17 +161,15 @@ Ext.define('PVE.FirewallRulePanel', {
                value: ''
            },
            {
-               xtype: 'pvetextfield',
+               xtype: 'textfield',
                name: 'sport',
-               deleteEmpty: !me.create,
                value: '',
                fieldLabel: gettext('Source port')
            },
            {
-               xtype: 'pvetextfield',
+               xtype: 'textfield',
                name: 'dport',
                height: 22, // hack: set same height as text fields
-               deleteEmpty: !me.create,
                value: '',
                fieldLabel: gettext('Dest. port')
            }
@@ -390,36 +384,7 @@ Ext.define('PVE.FirewallRules', {
        });
     },
 
-    createRule: function(editor, rule) {
-        var me = this;
-
-       if (!me.base_url) {
-           return;
-       }
-
-       rule.pos = 0;
-
-       rule.enable = rule.enable ? 1 : 0;
-
-       PVE.Utils.API2Request({
-           url: me.base_url,
-           method: 'POST',
-           params: rule,
-           waitMsgTarget: me,
-           failure: function(response, options) {
-               if (editor) {
-                   editor.form.markInvalid(response.result.errors);
-               } else {
-                   Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-               }
-           },
-           callback: function() {
-               me.store.load();
-           }
-       });
-    },
-
-    updateRule: function(editor, rule) {
+    updateRule: function(rule) {
         var me = this;
 
        if (!me.base_url) { 
@@ -598,7 +563,7 @@ Ext.define('PVE.FirewallRules', {
                        if (!me.allow_iface || !data.iface) {
                            delete data.iface;
                        }
-                       me.updateRule(undefined, data);
+                       me.updateRule(data);
                    }
                },
                width: 50