Fix CLIUtil overlap

Author: gpotter2

scapy/utils.py

@@ -19,6 +19,7 @@
 import collections
 import decimal
 import difflib
+import enum
 import gzip
 import inspect
 import locale
@@ -3566,7 +3567,38 @@ def whois(ip_address):
 ####################
 
 
-class CLIUtil:
+class _CLIUtilMetaclass(type):
+    class TYPE(enum.Enum):
+        COMMAND = 0
+        OUTPUT = 1
+        COMPLETE = 2
+
+    def __new__(cls: Type['CLIUtil'],
+                name,  # type: str
+                bases,  # type: Tuple[type, ...]
+                dct  # type: Dict[str, Any]
+                ):
+        # type: (...) -> Type[CLIUtil]
+        dct["commands"] = {
+            x.__name__: x
+            for x in dct.values()
+            if getattr(x, "cliutil_type", None) == _CLIUtilMetaclass.TYPE.COMMAND
+        }
+        dct["commands_output"] = {
+            x.cliutil_ref.__name__: x
+            for x in dct.values()
+            if getattr(x, "cliutil_type", None) == _CLIUtilMetaclass.TYPE.OUTPUT
+        }
+        dct["commands_complete"] = {
+            x.cliutil_ref.__name__: x
+            for x in dct.values()
+            if getattr(x, "cliutil_type", None) == _CLIUtilMetaclass.TYPE.COMPLETE
+        }
+        newcls = cast(Type['CLIUtil'], type.__new__(cls, name, bases, dct))
+        return newcls
+
+
+class CLIUtil(metaclass=_CLIUtilMetaclass):
     """
     Provides a Util class to easily create simple CLI tools in Scapy,
     that can still be used as an API.
@@ -3655,7 +3687,7 @@ def addcommand(
         Decorator to register a command
         """
         def func(cmd: DecoratorCallable) -> DecoratorCallable:
-            cls.commands[cmd.__name__] = cmd
+            cmd.cliutil_type = _CLIUtilMetaclass.TYPE.COMMAND  # type: ignore
             cmd._spaces = spaces  # type: ignore
             cmd._globsupport = globsupport  # type: ignore
             cls._inspectkwargs(cmd)
@@ -3670,7 +3702,8 @@ def addoutput(cls, cmd: DecoratorCallable) -> Callable[[DecoratorCallable], Deco
         Decorator to register a command output processor
         """
         def func(processor: DecoratorCallable) -> DecoratorCallable:
-            cls.commands_output[cmd.__name__] = processor
+            processor.cliutil_type = _CLIUtilMetaclass.TYPE.OUTPUT  # type: ignore
+            processor.cliutil_ref = cmd  # type: ignore
             cls._inspectkwargs(processor)
             return processor
         return func
@@ -3681,7 +3714,8 @@ def addcomplete(cls, cmd: DecoratorCallable) -> Callable[[DecoratorCallable], De
         Decorator to register a command completor
         """
         def func(processor: DecoratorCallable) -> DecoratorCallable:
-            cls.commands_complete[cmd.__name__] = processor
+            processor.cliutil_type = _CLIUtilMetaclass.TYPE.COMPLETE  # type: ignore
+            processor.cliutil_ref = cmd  # type: ignore
             return processor
         return func