rename '--class' into '--dscp-class' and '--set-class' into '--set-dscp-class'

in order not to waste the namespace

diff --git a/extensions/libipt_DSCP.c b/extensions/libipt_DSCP.c
index 13246633efd34ddd89c28b259ed8df6b03f9e165..f3bf07915b59ea79b56adadc2c11d6635a9874ab 100644 (file)
--- a/extensions/libipt_DSCP.c
+++ b/extensions/libipt_DSCP.c
@@ -33,8 +33,8 @@ static void help(void)
 "  --set-dscp value            Set DSCP field in packet header to value\n"
 "                              This value can be in decimal (ex: 32)\n"
 "                              or in hex (ex: 0x20)\n"
-"  --set-class class           Set the DSCP field in packet header to the value\n"
-"                              represented by the DiffServ class value.\n"
+"  --set-dscp-class class      Set the DSCP field in packet header to the\n"
+"                              value represented by the DiffServ class value.\n"
 "                              This class may be EF,BE or any of the CSxx "
 "                              or AFxx classes.\n"
 "\n"
@@ -44,7 +44,7 @@ static void help(void)
 
 static struct option opts[] = {
        { "set-dscp", 1, 0, 'F' },
-       { "set-class", 1, 0, 'G' },
+       { "set-dscp-class", 1, 0, 'G' },
        { 0 }
 };
 
@@ -95,7 +95,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        case 'G':
                if (*flags)
                        exit_error(PARAMETER_PROBLEM,
-                                  "DSCP target: Only use --set-class ONCE!");
+                                  "DSCP target: Only use --set-dscp-class ONCE!");
                parse_class(optarg, dinfo);
                *flags = 1;
                break;

diff --git a/extensions/libipt_dscp.c b/extensions/libipt_dscp.c
index 7718112c17033a32be48b619659ceef5a48b599f..1d61da89ea238f6470a65e3e76d6379ba439c6c8 100644 (file)
--- a/extensions/libipt_dscp.c
+++ b/extensions/libipt_dscp.c
@@ -36,7 +36,7 @@ static void help(void)
 "[!] --dscp value              Match DSCP codepoint with numerical value\n"
 "                              This value can be in decimal (ex: 32)\n"
 "                              or in hex (ex: 0x20)\n"
-"[!] --class name              Match the DiffServ class. This value may\n"
+"[!] --dscp-class name         Match the DiffServ class. This value may\n"
 "                              be any of the BE,EF, AFxx or CSx classes\n"
 "\n"
 "                              These two options are mutually exclusive !\n"
@@ -46,7 +46,7 @@ static void help(void)
 
 static struct option opts[] = {
        { "dscp", 1, 0, 'F' },
-       { "class", 1, 0, 'G' },
+       { "dscp-class", 1, 0, 'G' },
        { 0 }
 };
 
@@ -102,7 +102,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        case 'G':
                if (*flags)
                        exit_error(PARAMETER_PROBLEM,
-                                       "DSCP match: Only use --class ONCE!");
+                                       "DSCP match: Only use --dscp-class ONCE!");
                check_inverse(optarg, &invert, &optind, 0);
                parse_class(argv[optind - 1], dinfo);
                if (invert)