Merge pull request #2047 from sever-sever/T5256

T5256: T5195: Fix QoS match protocol and add vyos.utils.network

3 files changed, 52 insertions, 1 deletions

diff --git a/python/vyos/qos/base.py b/python/vyos/qos/base.py
index bd1676107..353eb91b3 100644
--- a/python/vyos/qos/base.py
+++ b/python/vyos/qos/base.py
@@ -20,6 +20,9 @@ from vyos.util import cmd
 from vyos.util import dict_search
 from vyos.util import read_file
 
+from vyos.utils.network import get_protocol_by_name
+
+
 class QoSBase:
     _debug = False
     _direction = ['egress']
@@ -197,7 +200,9 @@ class QoSBase:
                                 if tmp: filter_cmd += f' match {tc_af} dport {tmp} 0xffff'
 
                                 tmp = dict_search(f'{af}.protocol', match_config)
-                                if tmp: filter_cmd += f' match {tc_af} protocol {tmp} 0xff'
+                                if tmp:
+                                    tmp = get_protocol_by_name(tmp)
+                                    filter_cmd += f' match {tc_af} protocol {tmp} 0xff'
 
                                 # Will match against total length of an IPv4 packet and
                                 # payload length of an IPv6 packet.
diff --git a/python/vyos/utils/__init__.py b/python/vyos/utils/__init__.py
index e69de29bb..0d3998053 100644
--- a/python/vyos/utils/__init__.py
+++ b/python/vyos/utils/__init__.py
@@ -0,0 +1,16 @@
+# Copyright 2023 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+from vyos.utils import network
diff --git a/python/vyos/utils/network.py b/python/vyos/utils/network.py
new file mode 100644
index 000000000..72b7ca6da
--- /dev/null
+++ b/python/vyos/utils/network.py
@@ -0,0 +1,30 @@
+# Copyright 2023 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+
+def get_protocol_by_name(protocol_name):
+    """Get protocol number by protocol name
+
+       % get_protocol_by_name('tcp')
+       % 6
+    """
+    import socket
+    try:
+        protocol_number = socket.getprotobyname(protocol_name)
+        return protocol_number
+    except socket.error:
+        return protocol_name